Update utils.py

utils.py

@@ -8,7 +8,7 @@ def RGB2gray(rgb):
     gray = 0.2989 * r + 0.5870 * g + 0.1140 * b
     return gray
 
-def img_to_patches(img: PIL.Image.Image) -> tuple:
+def img_to_patches(img: PIL.Image.Image):
     patch_size = 16
     img = img.convert("RGB")
 
@@ -43,7 +43,7 @@ def get_pixel_var_degree_for_patch(patch: np.array) -> int:
     l1 = get_l1(patch)
     l2 = get_l2(patch)
     l3l4 = get_l3l4(patch)
-    return l1 + l2 + l3l4
+    return int(l1 + l2 + l3l4)
 
 def get_rich_poor_patches(img: PIL.Image.Image, coloured=True):
     gray_scale_patches, color_patches, coordinates, img_size = img_to_patches(img)
@@ -81,17 +81,14 @@ def azimuthalAverage(image, center=None):
 def azimuthal_integral(img, epsilon=1e-8, N=50):
     if len(img.shape) == 3 and img.shape[2] == 3:
         img = RGB2gray(img)
-
     f = np.fft.fft2(img)
     fshift = np.fft.fftshift(f)
     fshift += epsilon
     magnitude_spectrum = 20 * np.log(np.abs(fshift))
     psd1D = azimuthalAverage(magnitude_spectrum)
-
     points = np.linspace(0, N, num=psd1D.size)
     xi = np.linspace(0, N, num=N)
     interpolated = griddata(points, psd1D, xi, method="cubic")
-
     interpolated = (interpolated - np.min(interpolated)) / (np.max(interpolated) - np.min(interpolated) + 1e-8)
     return interpolated.astype(np.float32)
 
@@ -100,18 +97,15 @@ def positional_emb(coor, im_size, N):
     center_y, center_x = coor
     normalized_y = center_y / img_height
     normalized_x = center_x / img_width
-
     pos_emb = np.zeros(N, dtype=np.float32)
     indices = np.arange(N)
     div_term = 10000 ** (2 * (indices // 2) / N)
-
     pos_emb[0::2] = np.sin(normalized_y / div_term[0::2]) + np.sin(normalized_x / div_term[0::2])
     pos_emb[1::2] = np.cos(normalized_y / div_term[1::2]) + np.cos(normalized_x / div_term[1::2])
     return pos_emb
 
 def azi_diff(img: PIL.Image.Image, patch_num, N):
     r, p, im_size = get_rich_poor_patches(img)
-
     r_len = len(r)
     p_len = len(p)
 
@@ -140,8 +134,8 @@ def azi_diff(img: PIL.Image.Image, patch_num, N):
             coor_p.append(tmp_coor2)
 
     output = {
-        "total_emb": [patch_emb_r + positional_emb_r / 5.0, patch_emb_p + positional_emb_p / 5.0],
-        "positional_emb": [positional_emb_r / 5.0, positional_emb_p / 5.0],
+        "total_emb": [patch_emb_r + positional_emb_r / 5, patch_emb_p + positional_emb_p / 5],
+        "positional_emb": [positional_emb_r / 5, positional_emb_p / 5],
         "coor": [coor_r, coor_p],
         "image_size": im_size,
     }