From 665a4942e47a2d2f7a72c6a4c318b609b8461523 Mon Sep 17 00:00:00 2001 From: Kevin R Date: Tue, 7 Jan 2025 03:39:45 -0800 Subject: [PATCH] Check whether rescale is requested before checking is_scaled_image (#35439) --- .../modular-transformers/image_processing_new_imgproc_model.py | 2 +- src/transformers/models/beit/image_processing_beit.py | 2 +- src/transformers/models/bit/image_processing_bit.py | 2 +- src/transformers/models/blip/image_processing_blip.py | 2 +- .../models/bridgetower/image_processing_bridgetower.py | 2 +- src/transformers/models/chameleon/image_processing_chameleon.py | 2 +- .../models/chinese_clip/image_processing_chinese_clip.py | 2 +- src/transformers/models/clip/image_processing_clip.py | 2 +- .../conditional_detr/image_processing_conditional_detr.py | 2 +- src/transformers/models/convnext/image_processing_convnext.py | 2 +- .../models/deformable_detr/image_processing_deformable_detr.py | 2 +- src/transformers/models/deit/image_processing_deit.py | 2 +- .../models/deprecated/deta/image_processing_deta.py | 2 +- .../efficientformer/image_processing_efficientformer.py | 2 +- .../models/deprecated/tvlt/image_processing_tvlt.py | 2 +- .../models/deprecated/vit_hybrid/image_processing_vit_hybrid.py | 2 +- src/transformers/models/detr/image_processing_detr.py | 2 +- src/transformers/models/donut/image_processing_donut.py | 2 +- src/transformers/models/dpt/image_processing_dpt.py | 2 +- .../models/efficientnet/image_processing_efficientnet.py | 2 +- src/transformers/models/flava/image_processing_flava.py | 2 +- src/transformers/models/fuyu/image_processing_fuyu.py | 2 +- src/transformers/models/glpn/image_processing_glpn.py | 2 +- .../models/grounding_dino/image_processing_grounding_dino.py | 2 +- src/transformers/models/idefics2/image_processing_idefics2.py | 2 +- src/transformers/models/idefics3/image_processing_idefics3.py | 2 +- src/transformers/models/imagegpt/image_processing_imagegpt.py | 2 +- .../instructblipvideo/image_processing_instructblipvideo.py | 2 +- .../models/layoutlmv3/image_processing_layoutlmv3.py | 2 +- src/transformers/models/levit/image_processing_levit.py | 2 +- .../models/llava_next/image_processing_llava_next.py | 2 +- .../llava_next_video/image_processing_llava_next_video.py | 2 +- .../models/llava_onevision/image_processing_llava_onevision.py | 2 +- .../models/llava_onevision/video_processing_llava_onevision.py | 2 +- .../models/mask2former/image_processing_mask2former.py | 2 +- .../models/maskformer/image_processing_maskformer.py | 2 +- .../models/mobilenet_v1/image_processing_mobilenet_v1.py | 2 +- .../models/mobilenet_v2/image_processing_mobilenet_v2.py | 2 +- src/transformers/models/mobilevit/image_processing_mobilevit.py | 2 +- src/transformers/models/nougat/image_processing_nougat.py | 2 +- src/transformers/models/oneformer/image_processing_oneformer.py | 2 +- src/transformers/models/owlv2/image_processing_owlv2.py | 2 +- src/transformers/models/owlvit/image_processing_owlvit.py | 2 +- src/transformers/models/perceiver/image_processing_perceiver.py | 2 +- src/transformers/models/pixtral/image_processing_pixtral.py | 2 +- .../models/poolformer/image_processing_poolformer.py | 2 +- src/transformers/models/pvt/image_processing_pvt.py | 2 +- src/transformers/models/qwen2_vl/image_processing_qwen2_vl.py | 2 +- src/transformers/models/rt_detr/image_processing_rt_detr.py | 2 +- src/transformers/models/sam/image_processing_sam.py | 2 +- src/transformers/models/segformer/image_processing_segformer.py | 2 +- src/transformers/models/seggpt/image_processing_seggpt.py | 2 +- src/transformers/models/siglip/image_processing_siglip.py | 2 +- .../models/superpoint/image_processing_superpoint.py | 2 +- src/transformers/models/swin2sr/image_processing_swin2sr.py | 2 +- .../models/video_llava/image_processing_video_llava.py | 2 +- src/transformers/models/videomae/image_processing_videomae.py | 2 +- src/transformers/models/vilt/image_processing_vilt.py | 2 +- src/transformers/models/vit/image_processing_vit.py | 2 +- src/transformers/models/vitmatte/image_processing_vitmatte.py | 2 +- src/transformers/models/vivit/image_processing_vivit.py | 2 +- src/transformers/models/yolos/image_processing_yolos.py | 2 +- src/transformers/models/zoedepth/image_processing_zoedepth.py | 2 +- 63 files changed, 63 insertions(+), 63 deletions(-) diff --git a/examples/modular-transformers/image_processing_new_imgproc_model.py b/examples/modular-transformers/image_processing_new_imgproc_model.py index a64eb17861..f3ab1772ec 100644 --- a/examples/modular-transformers/image_processing_new_imgproc_model.py +++ b/examples/modular-transformers/image_processing_new_imgproc_model.py @@ -247,7 +247,7 @@ class ImgprocModelImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/beit/image_processing_beit.py b/src/transformers/models/beit/image_processing_beit.py index af76dd2e96..ce75797f5c 100644 --- a/src/transformers/models/beit/image_processing_beit.py +++ b/src/transformers/models/beit/image_processing_beit.py @@ -239,7 +239,7 @@ class BeitImageProcessor(BaseImageProcessor): """Preprocesses a single image.""" # All transformations expect numpy arrays. image = to_numpy_array(image) - if is_scaled_image(image) and do_rescale: + if do_rescale and is_scaled_image(image): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/bit/image_processing_bit.py b/src/transformers/models/bit/image_processing_bit.py index c32bb934bd..0250bc3576 100644 --- a/src/transformers/models/bit/image_processing_bit.py +++ b/src/transformers/models/bit/image_processing_bit.py @@ -284,7 +284,7 @@ class BitImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/blip/image_processing_blip.py b/src/transformers/models/blip/image_processing_blip.py index 6bb2dd2373..0f7683d08d 100644 --- a/src/transformers/models/blip/image_processing_blip.py +++ b/src/transformers/models/blip/image_processing_blip.py @@ -257,7 +257,7 @@ class BlipImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/bridgetower/image_processing_bridgetower.py b/src/transformers/models/bridgetower/image_processing_bridgetower.py index a8b94e7c97..517f9b2e4f 100644 --- a/src/transformers/models/bridgetower/image_processing_bridgetower.py +++ b/src/transformers/models/bridgetower/image_processing_bridgetower.py @@ -491,7 +491,7 @@ class BridgeTowerImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/chameleon/image_processing_chameleon.py b/src/transformers/models/chameleon/image_processing_chameleon.py index cadaeb2e09..4ef305c511 100644 --- a/src/transformers/models/chameleon/image_processing_chameleon.py +++ b/src/transformers/models/chameleon/image_processing_chameleon.py @@ -302,7 +302,7 @@ class ChameleonImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/chinese_clip/image_processing_chinese_clip.py b/src/transformers/models/chinese_clip/image_processing_chinese_clip.py index 2c338f5a71..e07c87dc34 100644 --- a/src/transformers/models/chinese_clip/image_processing_chinese_clip.py +++ b/src/transformers/models/chinese_clip/image_processing_chinese_clip.py @@ -271,7 +271,7 @@ class ChineseCLIPImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/clip/image_processing_clip.py b/src/transformers/models/clip/image_processing_clip.py index a5d12bd7ba..c81451b195 100644 --- a/src/transformers/models/clip/image_processing_clip.py +++ b/src/transformers/models/clip/image_processing_clip.py @@ -309,7 +309,7 @@ class CLIPImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/conditional_detr/image_processing_conditional_detr.py b/src/transformers/models/conditional_detr/image_processing_conditional_detr.py index effb8c3b05..cecaf4e6a3 100644 --- a/src/transformers/models/conditional_detr/image_processing_conditional_detr.py +++ b/src/transformers/models/conditional_detr/image_processing_conditional_detr.py @@ -1434,7 +1434,7 @@ class ConditionalDetrImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/convnext/image_processing_convnext.py b/src/transformers/models/convnext/image_processing_convnext.py index 90fc0bb1ff..35cbc91797 100644 --- a/src/transformers/models/convnext/image_processing_convnext.py +++ b/src/transformers/models/convnext/image_processing_convnext.py @@ -282,7 +282,7 @@ class ConvNextImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/deformable_detr/image_processing_deformable_detr.py b/src/transformers/models/deformable_detr/image_processing_deformable_detr.py index 0b6a58eb8f..5ea9268503 100644 --- a/src/transformers/models/deformable_detr/image_processing_deformable_detr.py +++ b/src/transformers/models/deformable_detr/image_processing_deformable_detr.py @@ -1432,7 +1432,7 @@ class DeformableDetrImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/deit/image_processing_deit.py b/src/transformers/models/deit/image_processing_deit.py index 7b5f981b00..770a1b2ec8 100644 --- a/src/transformers/models/deit/image_processing_deit.py +++ b/src/transformers/models/deit/image_processing_deit.py @@ -260,7 +260,7 @@ class DeiTImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/deprecated/deta/image_processing_deta.py b/src/transformers/models/deprecated/deta/image_processing_deta.py index a548590ce1..e59b7bd95b 100644 --- a/src/transformers/models/deprecated/deta/image_processing_deta.py +++ b/src/transformers/models/deprecated/deta/image_processing_deta.py @@ -1049,7 +1049,7 @@ class DetaImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/deprecated/efficientformer/image_processing_efficientformer.py b/src/transformers/models/deprecated/efficientformer/image_processing_efficientformer.py index 15fdf04051..d1503f661d 100644 --- a/src/transformers/models/deprecated/efficientformer/image_processing_efficientformer.py +++ b/src/transformers/models/deprecated/efficientformer/image_processing_efficientformer.py @@ -280,7 +280,7 @@ class EfficientFormerImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/deprecated/tvlt/image_processing_tvlt.py b/src/transformers/models/deprecated/tvlt/image_processing_tvlt.py index 009f8307d4..46c6b0c7ca 100644 --- a/src/transformers/models/deprecated/tvlt/image_processing_tvlt.py +++ b/src/transformers/models/deprecated/tvlt/image_processing_tvlt.py @@ -251,7 +251,7 @@ class TvltImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. image = to_numpy_array(image) - if is_scaled_image(image) and do_rescale: + if do_rescale and is_scaled_image(image): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/deprecated/vit_hybrid/image_processing_vit_hybrid.py b/src/transformers/models/deprecated/vit_hybrid/image_processing_vit_hybrid.py index e7c3193cea..0424fd058e 100644 --- a/src/transformers/models/deprecated/vit_hybrid/image_processing_vit_hybrid.py +++ b/src/transformers/models/deprecated/vit_hybrid/image_processing_vit_hybrid.py @@ -302,7 +302,7 @@ class ViTHybridImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/detr/image_processing_detr.py b/src/transformers/models/detr/image_processing_detr.py index 85fbe698d1..03c7540420 100644 --- a/src/transformers/models/detr/image_processing_detr.py +++ b/src/transformers/models/detr/image_processing_detr.py @@ -1407,7 +1407,7 @@ class DetrImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/donut/image_processing_donut.py b/src/transformers/models/donut/image_processing_donut.py index 0ddd0591ca..a10e2846cb 100644 --- a/src/transformers/models/donut/image_processing_donut.py +++ b/src/transformers/models/donut/image_processing_donut.py @@ -409,7 +409,7 @@ class DonutImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/dpt/image_processing_dpt.py b/src/transformers/models/dpt/image_processing_dpt.py index c4d79696f0..c49dfcfef8 100644 --- a/src/transformers/models/dpt/image_processing_dpt.py +++ b/src/transformers/models/dpt/image_processing_dpt.py @@ -380,7 +380,7 @@ class DPTImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/efficientnet/image_processing_efficientnet.py b/src/transformers/models/efficientnet/image_processing_efficientnet.py index 3e2403716c..79f92ec1ca 100644 --- a/src/transformers/models/efficientnet/image_processing_efficientnet.py +++ b/src/transformers/models/efficientnet/image_processing_efficientnet.py @@ -317,7 +317,7 @@ class EfficientNetImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/flava/image_processing_flava.py b/src/transformers/models/flava/image_processing_flava.py index 254af58c92..7ed2302ef5 100644 --- a/src/transformers/models/flava/image_processing_flava.py +++ b/src/transformers/models/flava/image_processing_flava.py @@ -421,7 +421,7 @@ class FlavaImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. image = to_numpy_array(image) - if is_scaled_image(image) and do_rescale: + if do_rescale and is_scaled_image(image): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/fuyu/image_processing_fuyu.py b/src/transformers/models/fuyu/image_processing_fuyu.py index da9319d3a9..080ff772e2 100644 --- a/src/transformers/models/fuyu/image_processing_fuyu.py +++ b/src/transformers/models/fuyu/image_processing_fuyu.py @@ -464,7 +464,7 @@ class FuyuImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. batch_images = [[to_numpy_array(image) for image in images] for images in batch_images] - if is_scaled_image(batch_images[0][0]) and do_rescale: + if do_rescale and is_scaled_image(batch_images[0][0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/glpn/image_processing_glpn.py b/src/transformers/models/glpn/image_processing_glpn.py index 0ef93c21d9..3941bc54dc 100644 --- a/src/transformers/models/glpn/image_processing_glpn.py +++ b/src/transformers/models/glpn/image_processing_glpn.py @@ -202,7 +202,7 @@ class GLPNImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(img) for img in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/grounding_dino/image_processing_grounding_dino.py b/src/transformers/models/grounding_dino/image_processing_grounding_dino.py index 23f4b71969..f3d2117ca8 100644 --- a/src/transformers/models/grounding_dino/image_processing_grounding_dino.py +++ b/src/transformers/models/grounding_dino/image_processing_grounding_dino.py @@ -1440,7 +1440,7 @@ class GroundingDinoImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/idefics2/image_processing_idefics2.py b/src/transformers/models/idefics2/image_processing_idefics2.py index 22ef9c2eac..65d5a82854 100644 --- a/src/transformers/models/idefics2/image_processing_idefics2.py +++ b/src/transformers/models/idefics2/image_processing_idefics2.py @@ -529,7 +529,7 @@ class Idefics2ImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images_list = [[to_numpy_array(image) for image in images] for images in images_list] - if is_scaled_image(images_list[0][0]) and do_rescale: + if do_rescale and is_scaled_image(images_list[0][0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/idefics3/image_processing_idefics3.py b/src/transformers/models/idefics3/image_processing_idefics3.py index 9005c38af6..df71a8bf0e 100644 --- a/src/transformers/models/idefics3/image_processing_idefics3.py +++ b/src/transformers/models/idefics3/image_processing_idefics3.py @@ -758,7 +758,7 @@ class Idefics3ImageProcessor(BaseImageProcessor): [np.expand_dims(img, axis=0) if img.ndim == 2 else img for img in images] for images in images_list ] - if is_scaled_image(images_list[0][0]) and do_rescale: + if do_rescale and is_scaled_image(images_list[0][0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/imagegpt/image_processing_imagegpt.py b/src/transformers/models/imagegpt/image_processing_imagegpt.py index cca6c8a14b..357baf70d6 100644 --- a/src/transformers/models/imagegpt/image_processing_imagegpt.py +++ b/src/transformers/models/imagegpt/image_processing_imagegpt.py @@ -258,7 +258,7 @@ class ImageGPTImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_normalize: + if do_normalize and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If you wish to do this, " "make sure to set `do_normalize` to `False` and that pixel values are between [-1, 1].", diff --git a/src/transformers/models/instructblipvideo/image_processing_instructblipvideo.py b/src/transformers/models/instructblipvideo/image_processing_instructblipvideo.py index b83df54785..75e07317b0 100644 --- a/src/transformers/models/instructblipvideo/image_processing_instructblipvideo.py +++ b/src/transformers/models/instructblipvideo/image_processing_instructblipvideo.py @@ -324,7 +324,7 @@ class InstructBlipVideoImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. image = to_numpy_array(image) - if is_scaled_image(image) and do_rescale: + if do_rescale and is_scaled_image(image): logger.warning_once( "It looks like you are trying to rescale already rescaled video frames. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/layoutlmv3/image_processing_layoutlmv3.py b/src/transformers/models/layoutlmv3/image_processing_layoutlmv3.py index 11db4ad23d..61c73d38b3 100644 --- a/src/transformers/models/layoutlmv3/image_processing_layoutlmv3.py +++ b/src/transformers/models/layoutlmv3/image_processing_layoutlmv3.py @@ -324,7 +324,7 @@ class LayoutLMv3ImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/levit/image_processing_levit.py b/src/transformers/models/levit/image_processing_levit.py index f2cb89620d..b20a08e20b 100644 --- a/src/transformers/models/levit/image_processing_levit.py +++ b/src/transformers/models/levit/image_processing_levit.py @@ -274,7 +274,7 @@ class LevitImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/llava_next/image_processing_llava_next.py b/src/transformers/models/llava_next/image_processing_llava_next.py index e43d95b80a..8e2a4f4644 100644 --- a/src/transformers/models/llava_next/image_processing_llava_next.py +++ b/src/transformers/models/llava_next/image_processing_llava_next.py @@ -697,7 +697,7 @@ class LlavaNextImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/llava_next_video/image_processing_llava_next_video.py b/src/transformers/models/llava_next_video/image_processing_llava_next_video.py index f30e2c54fe..81f55f9373 100644 --- a/src/transformers/models/llava_next_video/image_processing_llava_next_video.py +++ b/src/transformers/models/llava_next_video/image_processing_llava_next_video.py @@ -263,7 +263,7 @@ class LlavaNextVideoImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/llava_onevision/image_processing_llava_onevision.py b/src/transformers/models/llava_onevision/image_processing_llava_onevision.py index cde9a643e3..75581d25ae 100644 --- a/src/transformers/models/llava_onevision/image_processing_llava_onevision.py +++ b/src/transformers/models/llava_onevision/image_processing_llava_onevision.py @@ -657,7 +657,7 @@ class LlavaOnevisionImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/llava_onevision/video_processing_llava_onevision.py b/src/transformers/models/llava_onevision/video_processing_llava_onevision.py index 4391dd3308..a5aa42688e 100644 --- a/src/transformers/models/llava_onevision/video_processing_llava_onevision.py +++ b/src/transformers/models/llava_onevision/video_processing_llava_onevision.py @@ -181,7 +181,7 @@ class LlavaOnevisionVideoProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled videos. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/mask2former/image_processing_mask2former.py b/src/transformers/models/mask2former/image_processing_mask2former.py index 1184207744..6797fb48bc 100644 --- a/src/transformers/models/mask2former/image_processing_mask2former.py +++ b/src/transformers/models/mask2former/image_processing_mask2former.py @@ -614,7 +614,7 @@ class Mask2FormerImageProcessor(BaseImageProcessor): """Preprocesses a single image.""" # All transformations expect numpy arrays. image = to_numpy_array(image) - if is_scaled_image(image) and do_rescale: + if do_rescale and is_scaled_image(image): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/maskformer/image_processing_maskformer.py b/src/transformers/models/maskformer/image_processing_maskformer.py index 104b68cbed..87a3063a37 100644 --- a/src/transformers/models/maskformer/image_processing_maskformer.py +++ b/src/transformers/models/maskformer/image_processing_maskformer.py @@ -615,7 +615,7 @@ class MaskFormerImageProcessor(BaseImageProcessor): """Preprocesses a single image.""" # All transformations expect numpy arrays. image = to_numpy_array(image) - if is_scaled_image(image) and do_rescale: + if do_rescale and is_scaled_image(image): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/mobilenet_v1/image_processing_mobilenet_v1.py b/src/transformers/models/mobilenet_v1/image_processing_mobilenet_v1.py index de15f4fa15..f0092ca029 100644 --- a/src/transformers/models/mobilenet_v1/image_processing_mobilenet_v1.py +++ b/src/transformers/models/mobilenet_v1/image_processing_mobilenet_v1.py @@ -266,7 +266,7 @@ class MobileNetV1ImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/mobilenet_v2/image_processing_mobilenet_v2.py b/src/transformers/models/mobilenet_v2/image_processing_mobilenet_v2.py index 68299bc085..c93f95a205 100644 --- a/src/transformers/models/mobilenet_v2/image_processing_mobilenet_v2.py +++ b/src/transformers/models/mobilenet_v2/image_processing_mobilenet_v2.py @@ -269,7 +269,7 @@ class MobileNetV2ImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/mobilevit/image_processing_mobilevit.py b/src/transformers/models/mobilevit/image_processing_mobilevit.py index 2825aa647d..3a32a79b27 100644 --- a/src/transformers/models/mobilevit/image_processing_mobilevit.py +++ b/src/transformers/models/mobilevit/image_processing_mobilevit.py @@ -234,7 +234,7 @@ class MobileViTImageProcessor(BaseImageProcessor): """Preprocesses a single image.""" # All transformations expect numpy arrays. image = to_numpy_array(image) - if is_scaled_image(image) and do_rescale: + if do_rescale and is_scaled_image(image): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/nougat/image_processing_nougat.py b/src/transformers/models/nougat/image_processing_nougat.py index 00a9d069d1..2cbd6e6729 100644 --- a/src/transformers/models/nougat/image_processing_nougat.py +++ b/src/transformers/models/nougat/image_processing_nougat.py @@ -463,7 +463,7 @@ class NougatImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/oneformer/image_processing_oneformer.py b/src/transformers/models/oneformer/image_processing_oneformer.py index 0988e1feca..f931ab3109 100644 --- a/src/transformers/models/oneformer/image_processing_oneformer.py +++ b/src/transformers/models/oneformer/image_processing_oneformer.py @@ -617,7 +617,7 @@ class OneFormerImageProcessor(BaseImageProcessor): """Preprocesses a single image.""" # All transformations expect numpy arrays. image = to_numpy_array(image) - if is_scaled_image(image) and do_rescale: + if do_rescale and is_scaled_image(image): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/owlv2/image_processing_owlv2.py b/src/transformers/models/owlv2/image_processing_owlv2.py index f21c73ce9c..ac637d62dd 100644 --- a/src/transformers/models/owlv2/image_processing_owlv2.py +++ b/src/transformers/models/owlv2/image_processing_owlv2.py @@ -424,7 +424,7 @@ class Owlv2ImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/owlvit/image_processing_owlvit.py b/src/transformers/models/owlvit/image_processing_owlvit.py index 1d6fc69189..05c2fb908c 100644 --- a/src/transformers/models/owlvit/image_processing_owlvit.py +++ b/src/transformers/models/owlvit/image_processing_owlvit.py @@ -373,7 +373,7 @@ class OwlViTImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/perceiver/image_processing_perceiver.py b/src/transformers/models/perceiver/image_processing_perceiver.py index b96bea7388..dab5ed6b07 100644 --- a/src/transformers/models/perceiver/image_processing_perceiver.py +++ b/src/transformers/models/perceiver/image_processing_perceiver.py @@ -307,7 +307,7 @@ class PerceiverImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/pixtral/image_processing_pixtral.py b/src/transformers/models/pixtral/image_processing_pixtral.py index 0fcd032d2c..05299949a6 100644 --- a/src/transformers/models/pixtral/image_processing_pixtral.py +++ b/src/transformers/models/pixtral/image_processing_pixtral.py @@ -473,7 +473,7 @@ class PixtralImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images_list = [[to_numpy_array(image) for image in images] for images in images_list] - if is_scaled_image(images_list[0][0]) and do_rescale: + if do_rescale and is_scaled_image(images_list[0][0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/poolformer/image_processing_poolformer.py b/src/transformers/models/poolformer/image_processing_poolformer.py index 0dfb66acf5..624f1a6f40 100644 --- a/src/transformers/models/poolformer/image_processing_poolformer.py +++ b/src/transformers/models/poolformer/image_processing_poolformer.py @@ -314,7 +314,7 @@ class PoolFormerImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/pvt/image_processing_pvt.py b/src/transformers/models/pvt/image_processing_pvt.py index f37442a4bd..75fcba6ea1 100644 --- a/src/transformers/models/pvt/image_processing_pvt.py +++ b/src/transformers/models/pvt/image_processing_pvt.py @@ -237,7 +237,7 @@ class PvtImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/qwen2_vl/image_processing_qwen2_vl.py b/src/transformers/models/qwen2_vl/image_processing_qwen2_vl.py index cc0fd33540..407034ef18 100644 --- a/src/transformers/models/qwen2_vl/image_processing_qwen2_vl.py +++ b/src/transformers/models/qwen2_vl/image_processing_qwen2_vl.py @@ -252,7 +252,7 @@ class Qwen2VLImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/rt_detr/image_processing_rt_detr.py b/src/transformers/models/rt_detr/image_processing_rt_detr.py index d031f40848..b3e75972cc 100644 --- a/src/transformers/models/rt_detr/image_processing_rt_detr.py +++ b/src/transformers/models/rt_detr/image_processing_rt_detr.py @@ -935,7 +935,7 @@ class RTDetrImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/sam/image_processing_sam.py b/src/transformers/models/sam/image_processing_sam.py index a0d54b4afa..a1cace89fa 100644 --- a/src/transformers/models/sam/image_processing_sam.py +++ b/src/transformers/models/sam/image_processing_sam.py @@ -316,7 +316,7 @@ class SamImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. image = to_numpy_array(image) - if is_scaled_image(image) and do_rescale: + if do_rescale and is_scaled_image(image): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/segformer/image_processing_segformer.py b/src/transformers/models/segformer/image_processing_segformer.py index d6662f1f62..51b4cd27ca 100644 --- a/src/transformers/models/segformer/image_processing_segformer.py +++ b/src/transformers/models/segformer/image_processing_segformer.py @@ -233,7 +233,7 @@ class SegformerImageProcessor(BaseImageProcessor): """Preprocesses a single image.""" # All transformations expect numpy arrays. image = to_numpy_array(image) - if is_scaled_image(image) and do_rescale: + if do_rescale and is_scaled_image(image): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/seggpt/image_processing_seggpt.py b/src/transformers/models/seggpt/image_processing_seggpt.py index 4a91ee76e3..bcc1ad32ef 100644 --- a/src/transformers/models/seggpt/image_processing_seggpt.py +++ b/src/transformers/models/seggpt/image_processing_seggpt.py @@ -346,7 +346,7 @@ class SegGptImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/siglip/image_processing_siglip.py b/src/transformers/models/siglip/image_processing_siglip.py index 5b22ac5168..b87adb7492 100644 --- a/src/transformers/models/siglip/image_processing_siglip.py +++ b/src/transformers/models/siglip/image_processing_siglip.py @@ -204,7 +204,7 @@ class SiglipImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/superpoint/image_processing_superpoint.py b/src/transformers/models/superpoint/image_processing_superpoint.py index 9ae1034484..2d60b9fc04 100644 --- a/src/transformers/models/superpoint/image_processing_superpoint.py +++ b/src/transformers/models/superpoint/image_processing_superpoint.py @@ -241,7 +241,7 @@ class SuperPointImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/swin2sr/image_processing_swin2sr.py b/src/transformers/models/swin2sr/image_processing_swin2sr.py index 3ab551ebc6..2832e53160 100644 --- a/src/transformers/models/swin2sr/image_processing_swin2sr.py +++ b/src/transformers/models/swin2sr/image_processing_swin2sr.py @@ -176,7 +176,7 @@ class Swin2SRImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/video_llava/image_processing_video_llava.py b/src/transformers/models/video_llava/image_processing_video_llava.py index 4028f552c1..4e97834617 100644 --- a/src/transformers/models/video_llava/image_processing_video_llava.py +++ b/src/transformers/models/video_llava/image_processing_video_llava.py @@ -377,7 +377,7 @@ class VideoLlavaImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. image = to_numpy_array(image) - if is_scaled_image(image) and do_rescale: + if do_rescale and is_scaled_image(image): logger.warning_once( "It looks like you are trying to rescale already rescaled images/video frames. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/videomae/image_processing_videomae.py b/src/transformers/models/videomae/image_processing_videomae.py index 1322a69a64..afba947bbd 100644 --- a/src/transformers/models/videomae/image_processing_videomae.py +++ b/src/transformers/models/videomae/image_processing_videomae.py @@ -208,7 +208,7 @@ class VideoMAEImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. image = to_numpy_array(image) - if is_scaled_image(image) and do_rescale: + if do_rescale and is_scaled_image(image): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/vilt/image_processing_vilt.py b/src/transformers/models/vilt/image_processing_vilt.py index 86351eca1f..18890c0dbf 100644 --- a/src/transformers/models/vilt/image_processing_vilt.py +++ b/src/transformers/models/vilt/image_processing_vilt.py @@ -438,7 +438,7 @@ class ViltImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/vit/image_processing_vit.py b/src/transformers/models/vit/image_processing_vit.py index 8e6232ac02..afee64dc0e 100644 --- a/src/transformers/models/vit/image_processing_vit.py +++ b/src/transformers/models/vit/image_processing_vit.py @@ -247,7 +247,7 @@ class ViTImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/vitmatte/image_processing_vitmatte.py b/src/transformers/models/vitmatte/image_processing_vitmatte.py index 4c51e2a49b..4c3b06e088 100644 --- a/src/transformers/models/vitmatte/image_processing_vitmatte.py +++ b/src/transformers/models/vitmatte/image_processing_vitmatte.py @@ -223,7 +223,7 @@ class VitMatteImageProcessor(BaseImageProcessor): images = [to_numpy_array(image) for image in images] trimaps = [to_numpy_array(trimap) for trimap in trimaps] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/vivit/image_processing_vivit.py b/src/transformers/models/vivit/image_processing_vivit.py index 19a97f9c64..1343d97a91 100644 --- a/src/transformers/models/vivit/image_processing_vivit.py +++ b/src/transformers/models/vivit/image_processing_vivit.py @@ -262,7 +262,7 @@ class VivitImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. image = to_numpy_array(image) - if is_scaled_image(image) and do_rescale: + if do_rescale and is_scaled_image(image): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/yolos/image_processing_yolos.py b/src/transformers/models/yolos/image_processing_yolos.py index 38a99cbea5..3c52095002 100644 --- a/src/transformers/models/yolos/image_processing_yolos.py +++ b/src/transformers/models/yolos/image_processing_yolos.py @@ -1343,7 +1343,7 @@ class YolosImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again." diff --git a/src/transformers/models/zoedepth/image_processing_zoedepth.py b/src/transformers/models/zoedepth/image_processing_zoedepth.py index de5f6795f0..f0457d00d9 100644 --- a/src/transformers/models/zoedepth/image_processing_zoedepth.py +++ b/src/transformers/models/zoedepth/image_processing_zoedepth.py @@ -404,7 +404,7 @@ class ZoeDepthImageProcessor(BaseImageProcessor): # All transformations expect numpy arrays. images = [to_numpy_array(image) for image in images] - if is_scaled_image(images[0]) and do_rescale: + if do_rescale and is_scaled_image(images[0]): logger.warning_once( "It looks like you are trying to rescale already rescaled images. If the input" " images have pixel values between 0 and 1, set `do_rescale=False` to avoid rescaling them again."