Review comments

huggingface · Jun 24, 2024 · 90c9584 · 90c9584
1 parent e9568bb
commit 90c9584
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 12 deletions.
diff --git a/tests/models/bridgetower/test_image_processing_bridgetower.py b/tests/models/bridgetower/test_image_processing_bridgetower.py
@@ -87,7 +87,7 @@ def get_expected_values(self, image_inputs, batched=False):
             if isinstance(image, Image.Image):
                 w, h = image.size
             elif isinstance(image, np.ndarray):
-                h, w = image.shape[:2]
+                h, w = image.shape[0], image.shape[1]
             else:
                 h, w = image.shape[1], image.shape[2]
             scale = size / min(w, h)

diff --git a/tests/models/conditional_detr/test_image_processing_conditional_detr.py b/tests/models/conditional_detr/test_image_processing_conditional_detr.py
@@ -90,7 +90,7 @@ def get_expected_values(self, image_inputs, batched=False):
             if isinstance(image, Image.Image):
                 w, h = image.size
             elif isinstance(image, np.ndarray):
-                h, w = image.shape[:2]
+                h, w = image.shape[0], image.shape[1]
             else:
                 h, w = image.shape[1], image.shape[2]
             if w < h:

diff --git a/tests/models/deformable_detr/test_image_processing_deformable_detr.py b/tests/models/deformable_detr/test_image_processing_deformable_detr.py
@@ -90,7 +90,7 @@ def get_expected_values(self, image_inputs, batched=False):
             if isinstance(image, Image.Image):
                 w, h = image.size
             elif isinstance(image, np.ndarray):
-                h, w = image.shape[:2]
+                h, w = image.shape[0], image.shape[1]
             else:
                 h, w = image.shape[1], image.shape[2]
             if w < h:

diff --git a/tests/models/detr/test_image_processing_detr.py b/tests/models/detr/test_image_processing_detr.py
@@ -89,7 +89,7 @@ def get_expected_values(self, image_inputs, batched=False):
             if isinstance(image, Image.Image):
                 w, h = image.size
             elif isinstance(image, np.ndarray):
-                h, w = image.shape[:2]
+                h, w = image.shape[0], image.shape[1]
             else:
                 h, w = image.shape[1], image.shape[2]
             if w < h:

diff --git a/tests/models/grounding_dino/test_image_processing_grounding_dino.py b/tests/models/grounding_dino/test_image_processing_grounding_dino.py
@@ -96,7 +96,7 @@ def get_expected_values(self, image_inputs, batched=False):
             if isinstance(image, Image.Image):
                 w, h = image.size
             elif isinstance(image, np.ndarray):
-                h, w = image.shape[:2]
+                h, w = image.shape[0], image.shape[1]
             else:
                 h, w = image.shape[1], image.shape[2]
             if w < h:

diff --git a/tests/models/idefics/test_image_processing_idefics.py b/tests/models/idefics/test_image_processing_idefics.py
@@ -78,7 +78,7 @@ def get_expected_values(self, image_inputs, batched=False):
             if isinstance(image, Image.Image):
                 w, h = image.size
             elif isinstance(image, np.ndarray):
-                h, w = image.shape[:2]
+                h, w = image.shape[0], image.shape[1]
             else:
                 h, w = image.shape[1], image.shape[2]
             scale = size / min(w, h)

diff --git a/tests/models/maskformer/test_image_processing_maskformer.py b/tests/models/maskformer/test_image_processing_maskformer.py
@@ -99,7 +99,7 @@ def get_expected_values(self, image_inputs, batched=False):
             if isinstance(image, Image.Image):
                 w, h = image.size
             elif isinstance(image, np.ndarray):
-                h, w = image.shape[:2]
+                h, w = image.shape[0], image.shape[1]
             else:
                 h, w = image.shape[1], image.shape[2]
             if w < h:

diff --git a/tests/models/oneformer/test_image_processing_oneformer.py b/tests/models/oneformer/test_image_processing_oneformer.py
@@ -107,7 +107,7 @@ def get_expected_values(self, image_inputs, batched=False):
             if isinstance(image, Image.Image):
                 w, h = image.size
             elif isinstance(image, np.ndarray):
-                h, w = image.shape[:2]
+                h, w = image.shape[0], image.shape[1]
             else:
                 h, w = image.shape[1], image.shape[2]
             if w < h:

diff --git a/tests/models/oneformer/test_processor_oneformer.py b/tests/models/oneformer/test_processor_oneformer.py
@@ -144,7 +144,7 @@ def get_expected_values(self, image_inputs, batched=False):
             if isinstance(image, Image.Image):
                 w, h = image.size
             elif isinstance(image, np.ndarray):
-                h, w = image.shape[:2]
+                h, w = image.shape[0], image.shape[1]
             else:
                 h, w = image.shape[1], image.shape[2]
             if w < h:

diff --git a/tests/models/vilt/test_image_processing_vilt.py b/tests/models/vilt/test_image_processing_vilt.py
@@ -81,7 +81,7 @@ def get_expected_values(self, image_inputs, batched=False):
             if isinstance(image, Image.Image):
                 w, h = image.size
             elif isinstance(image, np.ndarray):
-                h, w = image.shape[:2]
+                h, w = image.shape[0], image.shape[1]
             else:
                 h, w = image.shape[1], image.shape[2]
             scale = size / min(w, h)

diff --git a/tests/test_image_processing_common.py b/tests/test_image_processing_common.py
@@ -189,13 +189,12 @@ def measure_time(image_processor, image):
             return time.time() - start
 
         dummy_images = torch.randint(0, 255, (4, 3, 224, 224), dtype=torch.uint8)
-        image_processor_slow = self.image_processing_class()
+        image_processor_slow = self.image_processing_class(**self.image_processor_dict)
         image_processor_fast = self.fast_image_processing_class()
 
         fast_time = measure_time(image_processor_fast, dummy_images)
         slow_time = measure_time(image_processor_slow, dummy_images)
 
-        # We take an average
         self.assertLessEqual(fast_time, slow_time)
 
     def test_image_processor_to_json_string(self):