Test use int as argument for size

Add a test to ensure test can pass successfully and backward compatibility
HichTala · Nov 28, 2024 · 1925ee3 · 1925ee3
1 parent d8e7e6f
commit 1925ee3
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/src/transformers/models/conditional_detr/image_processing_conditional_detr.py b/src/transformers/models/conditional_detr/image_processing_conditional_detr.py
@@ -877,6 +877,7 @@ def __init__(
             do_pad = kwargs.pop("pad_and_return_pixel_mask")
 
         size = size if size is not None else {"shortest_edge": 800, "longest_edge": 1333}
+        size = {'shortest_edge': size, 'longest_edge': 1333} if isinstance(size, int) else size # Backwards compatibility
         size = get_size_dict(size, default_to_square=False)
 
         # Backwards compatibility

diff --git a/src/transformers/models/deformable_detr/image_processing_deformable_detr.py b/src/transformers/models/deformable_detr/image_processing_deformable_detr.py
@@ -875,6 +875,7 @@ def __init__(
             do_pad = kwargs.pop("pad_and_return_pixel_mask")
 
         size = size if size is not None else {"shortest_edge": 800, "longest_edge": 1333}
+        size = {'shortest_edge': size, 'longest_edge': 1333} if isinstance(size, int) else size # Backwards compatibility
         size = get_size_dict(size, default_to_square=False)
 
         # Backwards compatibility

diff --git a/src/transformers/models/deformable_detr/image_processing_deformable_detr_fast.py b/src/transformers/models/deformable_detr/image_processing_deformable_detr_fast.py
@@ -353,6 +353,7 @@ def __init__(
             do_pad = kwargs.pop("pad_and_return_pixel_mask")
 
         size = size if size is not None else {"shortest_edge": 800, "longest_edge": 1333}
+        size = {'shortest_edge': size, 'longest_edge': 1333} if isinstance(size, int) else size # Backwards compatibility
         size = get_size_dict(size, default_to_square=False)
 
         # Backwards compatibility

diff --git a/src/transformers/models/detr/image_processing_detr.py b/src/transformers/models/detr/image_processing_detr.py
@@ -859,6 +859,7 @@ def __init__(
             do_pad = kwargs.pop("pad_and_return_pixel_mask")
 
         size = size if size is not None else {"shortest_edge": 800, "longest_edge": 1333}
+        size = {'shortest_edge': size, 'longest_edge': 1333} if isinstance(size, int) else size # Backwards compatibility
         size = get_size_dict(size, default_to_square=False)
 
         # Backwards compatibility

diff --git a/src/transformers/models/detr/image_processing_detr_fast.py b/src/transformers/models/detr/image_processing_detr_fast.py
@@ -362,6 +362,7 @@ def __init__(
             do_pad = kwargs.pop("pad_and_return_pixel_mask")
 
         size = size if size is not None else {"shortest_edge": 800, "longest_edge": 1333}
+        size = {'shortest_edge': size, 'longest_edge': 1333} if isinstance(size, int) else size # Backwards compatibility
         size = get_size_dict(size, default_to_square=False)
 
         # Backwards compatibility

diff --git a/src/transformers/models/grounding_dino/image_processing_grounding_dino.py b/src/transformers/models/grounding_dino/image_processing_grounding_dino.py
@@ -883,6 +883,7 @@ def __init__(
             do_pad = kwargs.pop("pad_and_return_pixel_mask")
 
         size = size if size is not None else {"shortest_edge": 800, "longest_edge": 1333}
+        size = {'shortest_edge': size, 'longest_edge': 1333} if isinstance(size, int) else size # Backwards compatibility
         size = get_size_dict(size, default_to_square=False)
 
         # Backwards compatibility

diff --git a/src/transformers/models/rt_detr/image_processing_rt_detr.py b/src/transformers/models/rt_detr/image_processing_rt_detr.py
@@ -453,6 +453,7 @@ def __init__(
         **kwargs,
     ) -> None:
         size = size if size is not None else {"height": 640, "width": 640}
+        size = {'shortest_edge': size, 'longest_edge': 1333} if isinstance(size, int) else size # Backwards compatibility
         size = get_size_dict(size, default_to_square=False)
 
         if do_convert_annotations is None:
@@ -530,15 +531,7 @@ def resize(
             input_data_format (`ChannelDimension` or `str`, *optional*):
                 The channel dimension format of the input image. If not provided, it will be inferred.
         """
-        if "max_size" in kwargs:
-            logger.warning_once(
-                "The `max_size` parameter is deprecated and will be removed in v4.26. "
-                "Please specify in `size['longest_edge'] instead`.",
-            )
-            max_size = kwargs.pop("max_size")
-        else:
-            max_size = None
-        size = get_size_dict(size, max_size=max_size, default_to_square=False)
+        size = get_size_dict(size, default_to_square=False)
         if "shortest_edge" in size and "longest_edge" in size:
             new_size = get_resize_output_image_size(
                 image, size["shortest_edge"], size["longest_edge"], input_data_format=input_data_format

diff --git a/src/transformers/models/yolos/image_processing_yolos.py b/src/transformers/models/yolos/image_processing_yolos.py
@@ -791,6 +791,7 @@ def __init__(
             do_pad = kwargs.pop("pad_and_return_pixel_mask")
 
         size = size if size is not None else {"shortest_edge": 800, "longest_edge": 1333}
+        size = {'shortest_edge': size, 'longest_edge': 1333} if isinstance(size, int) else size # Backwards compatibility
         size = get_size_dict(size, default_to_square=False)
 
         # Backwards compatibility