-
Notifications
You must be signed in to change notification settings - Fork 31.7k
Add Swin2SR ImageProcessorFast #37169
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.
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
Merged
yonigozlan
merged 6 commits into
huggingface:main
from
thisisiron:add-swin2sr-imageprocessorfast
May 7, 2025
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
3c50682
Add fast image processor support for Swin2SR
thisisiron 65c088f
Add Swin2SR tests of fast image processing
thisisiron 6e6ec2e
Update docs and remove unnecessary test func
thisisiron 664fb0c
Fix docstring formatting
thisisiron 860dc2c
Skip fast vs slow processing test
thisisiron 42fab51
Merge branch 'main' into add-swin2sr-imageprocessorfast
yonigozlan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
138 changes: 138 additions & 0 deletions
138
src/transformers/models/swin2sr/image_processing_swin2sr_fast.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| # coding=utf-8 | ||
| # Copyright 2025 The HuggingFace Inc. team. All rights reserved. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| """Fast Image processor class for Swin2SR.""" | ||
|
|
||
| from typing import List, Optional, Union | ||
|
|
||
| from ...image_processing_utils import ( | ||
| BatchFeature, | ||
| ChannelDimension, | ||
| get_image_size, | ||
| ) | ||
| from ...image_processing_utils_fast import ( | ||
| BASE_IMAGE_PROCESSOR_FAST_DOCSTRING, | ||
| BASE_IMAGE_PROCESSOR_FAST_DOCSTRING_PREPROCESS, | ||
| BaseImageProcessorFast, | ||
| DefaultFastImageProcessorKwargs, | ||
| group_images_by_shape, | ||
| reorder_images, | ||
| ) | ||
| from ...image_utils import ImageInput | ||
| from ...processing_utils import Unpack | ||
| from ...utils import ( | ||
| TensorType, | ||
| add_start_docstrings, | ||
| is_torch_available, | ||
| is_torchvision_available, | ||
| is_torchvision_v2_available, | ||
| ) | ||
|
|
||
|
|
||
| if is_torch_available(): | ||
| import torch | ||
|
|
||
| if is_torchvision_available(): | ||
| if is_torchvision_v2_available(): | ||
| from torchvision.transforms.v2 import functional as F | ||
| else: | ||
| from torchvision.transforms import functional as F | ||
|
|
||
|
|
||
| class Swin2SRFastImageProcessorKwargs(DefaultFastImageProcessorKwargs): | ||
| do_pad: Optional[bool] | ||
| pad_size: Optional[int] | ||
|
|
||
|
|
||
| @add_start_docstrings( | ||
| "Constructs a fast Swin2SR image processor.", | ||
| BASE_IMAGE_PROCESSOR_FAST_DOCSTRING, | ||
| """ | ||
| do_pad (`bool`, *optional*, defaults to `True`): | ||
| Whether to pad the image to make the height and width divisible by `window_size`. | ||
| pad_size (`int`, *optional*, defaults to `8`): | ||
| The size of the sliding window for the local attention. | ||
| """, | ||
| ) | ||
| class Swin2SRImageProcessorFast(BaseImageProcessorFast): | ||
| do_rescale = True | ||
| rescale_factor = 1 / 255 | ||
| do_pad = True | ||
| pad_size = 8 | ||
| valid_kwargs = Swin2SRFastImageProcessorKwargs | ||
|
|
||
| def __init__(self, **kwargs: Unpack[Swin2SRFastImageProcessorKwargs]): | ||
| super().__init__(**kwargs) | ||
|
|
||
| @add_start_docstrings( | ||
| BASE_IMAGE_PROCESSOR_FAST_DOCSTRING_PREPROCESS, | ||
| """ | ||
| do_pad (`bool`, *optional*, defaults to `True`): | ||
| Whether to pad the image to make the height and width divisible by `window_size`. | ||
| pad_size (`int`, *optional*, defaults to `8`): | ||
| The size of the sliding window for the local attention. | ||
| """, | ||
| ) | ||
| def preprocess(self, images: ImageInput, **kwargs: Unpack[Swin2SRFastImageProcessorKwargs]) -> BatchFeature: | ||
| return super().preprocess(images, **kwargs) | ||
|
|
||
| def pad(self, images: "torch.Tensor", size: int) -> "torch.Tensor": | ||
| """ | ||
| Pad an image to make the height and width divisible by `size`. | ||
|
|
||
| Args: | ||
| images (`torch.Tensor`): | ||
| Images to pad. | ||
| size (`int`): | ||
| The size to make the height and width divisible by. | ||
|
|
||
| Returns: | ||
| `torch.Tensor`: The padded images. | ||
| """ | ||
| height, width = get_image_size(images, ChannelDimension.FIRST) | ||
| pad_height = (height // size + 1) * size - height | ||
| pad_width = (width // size + 1) * size - width | ||
|
|
||
| return F.pad( | ||
| images, | ||
| (0, 0, pad_width, pad_height), | ||
| padding_mode="symmetric", | ||
| ) | ||
|
|
||
| def _preprocess( | ||
| self, | ||
| images: List["torch.Tensor"], | ||
| do_rescale: bool, | ||
| rescale_factor: float, | ||
| do_pad: bool, | ||
| pad_size: int, | ||
| return_tensors: Optional[Union[str, TensorType]], | ||
| interpolation: Optional["F.InterpolationMode"], | ||
| **kwargs, | ||
| ) -> BatchFeature: | ||
| grouped_images, grouped_images_index = group_images_by_shape(images) | ||
| processed_image_grouped = {} | ||
| for shape, stacked_images in grouped_images.items(): | ||
| if do_rescale: | ||
| stacked_images = self.rescale(stacked_images, scale=rescale_factor) | ||
| if do_pad: | ||
| stacked_images = self.pad(stacked_images, size=pad_size) | ||
| processed_image_grouped[shape] = stacked_images | ||
| processed_images = reorder_images(processed_image_grouped, grouped_images_index) | ||
| processed_images = torch.stack(processed_images, dim=0) if return_tensors else processed_images | ||
|
|
||
| return BatchFeature(data={"pixel_values": processed_images}, tensor_type=return_tensors) | ||
|
|
||
|
|
||
| __all__ = ["Swin2SRImageProcessorFast"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be done for all tests
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I ran the following command:
RUN_SLOW=1 python -m pytest tests/models/swin2sr/test_image_processing_swin2sr.pyThe log below shows the result of executing the above command.