Skip to content

Remove deprecated max_size parameter from ConditionalDetr image processors #40299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Rishirandhawa wants to merge 6 commits into from
Closed

Remove deprecated max_size parameter from ConditionalDetr image processors #40299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4d66cd3
Remove deprecated max_size parameter from ConditionalDetr image proce…
Rishirandhawa Aug 19, 2025
1394e06
Remove deprecated max_size parameter from DETR and ConditionalDETR im…
Rishirandhawa Aug 19, 2025
b436e1e
Also remove deprecated max_size parameter from DetrImageProcessorFast
Rishirandhawa Aug 19, 2025
7a091d0
Fix DeformableDETR max_size parameter to maintain copy consistency
Rishirandhawa Aug 19, 2025
40537f4
Fix all DETR-family processors to maintain copy consistency
Rishirandhawa Aug 19, 2025
4ac2f90
Clean unused imports in DETR-family image processors
Rishirandhawa Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 3 additions & 30 deletions src/transformers/models/conditional_detr/image_processing_conditional_detr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,17 +879,8 @@ def __init__(
if "pad_and_return_pixel_mask" in kwargs:
do_pad = kwargs.pop("pad_and_return_pixel_mask")

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 if size is None else 1333

size = size if size is not None else {"shortest_edge": 800, "longest_edge": 1333}
size = get_size_dict(size, max_size=max_size, default_to_square=False)
size = get_size_dict(size, default_to_square=False)

# Backwards compatibility
if do_convert_annotations is None:
Expand Down Expand Up @@ -935,12 +926,9 @@ def __init__(
def from_dict(cls, image_processor_dict: dict[str, Any], **kwargs):
"""
Overrides the `from_dict` method from the base class to make sure parameters are updated if image processor is
created using from_dict and kwargs e.g. `ConditionalDetrImageProcessor.from_pretrained(checkpoint, size=600,
max_size=800)`
created using from_dict and kwargs e.g. `ConditionalDetrImageProcessor.from_pretrained(checkpoint, size=600)`
"""
image_processor_dict = image_processor_dict.copy()
if "max_size" in kwargs:
image_processor_dict["max_size"] = kwargs.pop("max_size")
if "pad_and_return_pixel_mask" in kwargs:
image_processor_dict["pad_and_return_pixel_mask"] = kwargs.pop("pad_and_return_pixel_mask")
return super().from_dict(image_processor_dict, **kwargs)
Expand Down Expand Up @@ -1013,15 +1001,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
Expand Down Expand Up @@ -1367,13 +1347,6 @@ def preprocess(
)
do_pad = kwargs.pop("pad_and_return_pixel_mask")

if "max_size" in kwargs:
logger.warning_once(
"The `max_size` argument is deprecated and will be removed in a future version, use"
" `size['longest_edge']` instead."
)
size = kwargs.pop("max_size")

do_resize = self.do_resize if do_resize is None else do_resize
size = self.size if size is None else size
size = get_size_dict(size=size, default_to_square=False)
Expand Down
22 changes: 2 additions & 20 deletions src/transformers/models/conditional_detr/image_processing_conditional_detr_fast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,17 +315,9 @@ def __init__(self, **kwargs: Unpack[ConditionalDetrFastImageProcessorKwargs]) ->
kwargs["do_pad"] = kwargs.pop("pad_and_return_pixel_mask")

size = kwargs.pop("size", None)
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 if size is None else 1333

size = size if size is not None else {"shortest_edge": 800, "longest_edge": 1333}
self.size = get_size_dict(size, max_size=max_size, default_to_square=False)
self.size = get_size_dict(size, default_to_square=False)

# Backwards compatibility
do_convert_annotations = kwargs.get("do_convert_annotations")
Expand All @@ -339,12 +331,9 @@ def __init__(self, **kwargs: Unpack[ConditionalDetrFastImageProcessorKwargs]) ->
def from_dict(cls, image_processor_dict: dict[str, Any], **kwargs):
"""
Overrides the `from_dict` method from the base class to make sure parameters are updated if image processor is
created using from_dict and kwargs e.g. `ConditionalDetrImageProcessorFast.from_pretrained(checkpoint, size=600,
max_size=800)`
created using from_dict and kwargs e.g. `ConditionalDetrImageProcessorFast.from_pretrained(checkpoint, size=600)`
"""
image_processor_dict = image_processor_dict.copy()
if "max_size" in kwargs:
image_processor_dict["max_size"] = kwargs.pop("max_size")
if "pad_and_return_pixel_mask" in kwargs:
image_processor_dict["pad_and_return_pixel_mask"] = kwargs.pop("pad_and_return_pixel_mask")
return super().from_dict(image_processor_dict, **kwargs)
Expand Down Expand Up @@ -604,13 +593,6 @@ def preprocess(
"use `do_pad` instead."
)

if "max_size" in kwargs:
logger.warning_once(
"The `max_size` argument is deprecated and will be removed in a future version, use"
" `size['longest_edge']` instead."
)
kwargs["size"] = kwargs.pop("max_size")

return super().preprocess(images, annotations, masks_path, **kwargs)

def _preprocess(
Expand Down
33 changes: 3 additions & 30 deletions src/transformers/models/deformable_detr/image_processing_deformable_detr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,17 +877,8 @@ def __init__(
if "pad_and_return_pixel_mask" in kwargs:
do_pad = kwargs.pop("pad_and_return_pixel_mask")

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 if size is None else 1333

size = size if size is not None else {"shortest_edge": 800, "longest_edge": 1333}
size = get_size_dict(size, max_size=max_size, default_to_square=False)
size = get_size_dict(size, default_to_square=False)

# Backwards compatibility
if do_convert_annotations is None:
Expand Down Expand Up @@ -933,12 +924,9 @@ def __init__(
def from_dict(cls, image_processor_dict: dict[str, Any], **kwargs):
"""
Overrides the `from_dict` method from the base class to make sure parameters are updated if image processor is
created using from_dict and kwargs e.g. `DeformableDetrImageProcessor.from_pretrained(checkpoint, size=600,
max_size=800)`
created using from_dict and kwargs e.g. `DeformableDetrImageProcessor.from_pretrained(checkpoint, size=600)`
"""
image_processor_dict = image_processor_dict.copy()
if "max_size" in kwargs:
image_processor_dict["max_size"] = kwargs.pop("max_size")
if "pad_and_return_pixel_mask" in kwargs:
image_processor_dict["pad_and_return_pixel_mask"] = kwargs.pop("pad_and_return_pixel_mask")
return super().from_dict(image_processor_dict, **kwargs)
Expand Down Expand Up @@ -1011,15 +999,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
Expand Down Expand Up @@ -1365,13 +1345,6 @@ def preprocess(
)
do_pad = kwargs.pop("pad_and_return_pixel_mask")

if "max_size" in kwargs:
logger.warning_once(
"The `max_size` argument is deprecated and will be removed in a future version, use"
" `size['longest_edge']` instead."
)
size = kwargs.pop("max_size")

do_resize = self.do_resize if do_resize is None else do_resize
size = self.size if size is None else size
size = get_size_dict(size=size, default_to_square=False)
Expand Down
17 changes: 1 addition & 16 deletions src/transformers/models/deformable_detr/image_processing_deformable_detr_fast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,17 +306,9 @@ def __init__(self, **kwargs: Unpack[DeformableDetrFastImageProcessorKwargs]) ->
kwargs["do_pad"] = kwargs.pop("pad_and_return_pixel_mask")

size = kwargs.pop("size", None)
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 if size is None else 1333

size = size if size is not None else {"shortest_edge": 800, "longest_edge": 1333}
self.size = get_size_dict(size, max_size=max_size, default_to_square=False)
self.size = get_size_dict(size, default_to_square=False)

# Backwards compatibility
do_convert_annotations = kwargs.get("do_convert_annotations")
Expand Down Expand Up @@ -595,13 +587,6 @@ def preprocess(
"use `do_pad` instead."
)

if "max_size" in kwargs:
logger.warning_once(
"The `max_size` argument is deprecated and will be removed in a future version, use"
" `size['longest_edge']` instead."
)
kwargs["size"] = kwargs.pop("max_size")

return super().preprocess(images, annotations, masks_path, **kwargs)

def _preprocess(
Expand Down
33 changes: 3 additions & 30 deletions src/transformers/models/detr/image_processing_detr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,17 +861,8 @@ def __init__(
if "pad_and_return_pixel_mask" in kwargs:
do_pad = kwargs.pop("pad_and_return_pixel_mask")

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 if size is None else 1333

size = size if size is not None else {"shortest_edge": 800, "longest_edge": 1333}
size = get_size_dict(size, max_size=max_size, default_to_square=False)
size = get_size_dict(size, default_to_square=False)

# Backwards compatibility
if do_convert_annotations is None:
Expand Down Expand Up @@ -916,12 +907,9 @@ def __init__(
def from_dict(cls, image_processor_dict: dict[str, Any], **kwargs):
"""
Overrides the `from_dict` method from the base class to make sure parameters are updated if image processor is
created using from_dict and kwargs e.g. `DetrImageProcessor.from_pretrained(checkpoint, size=600,
max_size=800)`
created using from_dict and kwargs e.g. `DetrImageProcessor.from_pretrained(checkpoint, size=600)`
"""
image_processor_dict = image_processor_dict.copy()
if "max_size" in kwargs:
image_processor_dict["max_size"] = kwargs.pop("max_size")
if "pad_and_return_pixel_mask" in kwargs:
image_processor_dict["pad_and_return_pixel_mask"] = kwargs.pop("pad_and_return_pixel_mask")
return super().from_dict(image_processor_dict, **kwargs)
Expand Down Expand Up @@ -992,15 +980,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
Expand Down Expand Up @@ -1340,13 +1320,6 @@ def preprocess(
)
do_pad = kwargs.pop("pad_and_return_pixel_mask")

if "max_size" in kwargs:
logger.warning_once(
"The `max_size` argument is deprecated and will be removed in a future version, use"
" `size['longest_edge']` instead."
)
size = kwargs.pop("max_size")

do_resize = self.do_resize if do_resize is None else do_resize
size = self.size if size is None else size
size = get_size_dict(size=size, default_to_square=False)
Expand Down
22 changes: 2 additions & 20 deletions src/transformers/models/detr/image_processing_detr_fast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,17 +327,9 @@ def __init__(self, **kwargs: Unpack[DetrFastImageProcessorKwargs]) -> None:
kwargs["do_pad"] = kwargs.pop("pad_and_return_pixel_mask")

size = kwargs.pop("size", None)
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 if size is None else 1333

size = size if size is not None else {"shortest_edge": 800, "longest_edge": 1333}
self.size = get_size_dict(size, max_size=max_size, default_to_square=False)
self.size = get_size_dict(size, default_to_square=False)

# Backwards compatibility
do_convert_annotations = kwargs.get("do_convert_annotations")
Expand All @@ -351,12 +343,9 @@ def __init__(self, **kwargs: Unpack[DetrFastImageProcessorKwargs]) -> None:
def from_dict(cls, image_processor_dict: dict[str, Any], **kwargs):
"""
Overrides the `from_dict` method from the base class to make sure parameters are updated if image processor is
created using from_dict and kwargs e.g. `DetrImageProcessorFast.from_pretrained(checkpoint, size=600,
max_size=800)`
created using from_dict and kwargs e.g. `DetrImageProcessorFast.from_pretrained(checkpoint, size=600)`
"""
image_processor_dict = image_processor_dict.copy()
if "max_size" in kwargs:
image_processor_dict["max_size"] = kwargs.pop("max_size")
if "pad_and_return_pixel_mask" in kwargs:
image_processor_dict["pad_and_return_pixel_mask"] = kwargs.pop("pad_and_return_pixel_mask")
return super().from_dict(image_processor_dict, **kwargs)
Expand Down Expand Up @@ -616,13 +605,6 @@ def preprocess(
"use `do_pad` instead."
)

if "max_size" in kwargs:
logger.warning_once(
"The `max_size` argument is deprecated and will be removed in a future version, use"
" `size['longest_edge']` instead."
)
kwargs["size"] = kwargs.pop("max_size")

return super().preprocess(images, annotations, masks_path, **kwargs)

def _preprocess(
Expand Down
Loading