Skip to content

[df-if II] add additional input checks to ensure the input is divisible by 8 #7844

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

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

[df-if II] add additional input checks to ensure the input is divisible by 8 #7844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ffaa08f
#7842 add additional input checks to ensure the input is divisible by 8
May 2, 2024
ea22092
add a superresolution pipeline regression test for odd input sizes
May 2, 2024
95bba60
Merge branch 'main' into issue/7842
bghira May 3, 2024
2c1cc63
Merge branch 'main' into issue/7842
bghira May 3, 2024
96290b6
Merge branch 'main' into issue/7842
bghira May 3, 2024
84ae72a
Merge branch 'main' into issue/7842
bghira May 7, 2024
69b5d38
Update src/diffusers/pipelines/deepfloyd_if/pipeline_if_superresoluti…
bghira May 8, 2024
a98ee37
Merge branch 'main' into issue/7842
bghira May 8, 2024
7fd4782
Merge branch 'main' into issue/7842
bghira May 11, 2024
b7973d6
make style
May 11, 2024
fe48c23
Merge branch 'main' into issue/7842
bghira May 12, 2024
dbca973
Merge branch 'main' into issue/7842
a-r-r-o-w Nov 25, 2024
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
15 changes: 15 additions & 0 deletions src/diffusers/pipelines/deepfloyd_if/pipeline_if_superresolution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,12 +543,27 @@ def check_inputs(

if isinstance(image, list):
image_batch_size = len(image)
# Check that each image is the same size:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is better to do this in a separate code block:
So we keep this section as it is to check image_batch_size

and then

if isinstance(image, list):
    check_image_size = image[0]
else:
    check_image_size = image

if isinstance(check_image_size, PIL.Image.Image):
    image_size = check_image_size.size
elif isinstance(check_image_size, torch.Tensor):
   image_size = check_image_size.shape[2:]
elif isinstanc(..., np.ndarray):
    image_size = check_image.shape[:1]

if image_size ....:
    raise ValueError(...)

The current code does not work for list of array or tensors

if not all(i.size == image[0].size for i in image):
raise ValueError("All images must be the same size")
# Check that the size is divisible by 8:
if image[0].size[0] % 8 != 0 or image[0].size[1] % 8 != 0:
raise ValueError("Image size must be divisible by 8")
elif isinstance(image, torch.Tensor):
image_batch_size = image.shape[0]
# Check that the size is divisible by 8:
if image.shape[2] % 8 != 0 or image.shape[3] % 8 != 0:
raise ValueError("Image size must be divisible by 8")
elif isinstance(image, PIL.Image.Image):
image_batch_size = 1
# Check that the size is divisible by 8:
if image.size[0] % 8 != 0 or image.size[1] % 8 != 0:
raise ValueError("Image size must be divisible by 8")
elif isinstance(image, np.ndarray):
image_batch_size = image.shape[0]
# Check that the size is divisible by 8:
if image.shape[1] % 8 != 0 or image.shape[2] % 8 != 0:
raise ValueError("Image size must be divisible by 8")
else:
assert False

Expand Down
9 changes: 9 additions & 0 deletions tests/pipelines/deepfloyd_if/test_if_superresolution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,15 @@ def get_dummy_inputs(self, device, seed=0):

return inputs

def test_incorrect_input_size(self):
# Put an image non-divisible by 8 into the pipeline and check that it throws an Exception.
image = floats_tensor((1, 3, 31, 31), rng=random.Random(0)).to(torch_device)
generator = torch.Generator(device="cpu").manual_seed(0)
with self.assertRaises(ValueError):
self.pipeline(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we make sure this test works?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i can't run the test suite locally, i was waiting for it to run on the workflow here

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh so these are the tests that failed https://github.com/huggingface/diffusers/actions/runs/9044175339/job/24855064736#step:7:15620
I can trigger them again now but I think the results would be the same

prompt="elegant destruction", image=image, generator=generator, num_inference_steps=2, output_type="np"
)

@unittest.skipIf(
torch_device != "cuda" or not is_xformers_available(),
reason="XFormers attention is only available with CUDA and `xformers` installed",
Expand Down