Don't do 2-pass generation if the difference between resolutions is tiny

Author: Acly

ai_diffusion/resolution.py

@@ -194,8 +194,8 @@ def prepare_diffusion_input(
         desired, arch, style, inpaint
     )
 
-    if downscale and max_scale < 1 and any(x > max_size for x in desired):
-        # Desired resolution is larger than the maximum size. Do 2 passes:
+    if downscale and max_scale < 0.9 and any(x > max_size for x in desired):
+        # Desired resolution is significantly larger than the maximum size. Do 2 passes:
         # first pass at checkpoint resolution, then upscale to desired resolution and refine.
         input = initial = (desired * max_scale).multiple_of(mult)
         desired = desired.multiple_of(mult)

tests/test_resolution.py

@@ -126,7 +126,7 @@ def test_inpaint_context(area, expected_extent, expected_crop: tuple[int, int] |
     "input,expected_initial,expected_desired",
     [
         (Extent(1536, 600), Extent(1008, 392), Extent(1536, 600)),
-        (Extent(400, 1024), Extent(392, 1008), Extent(400, 1024)),
+        (Extent(400, 1024), Extent(400, 1024), Extent(400, 1024)),
         (Extent(777, 999), Extent(560, 712), Extent(784, 1000)),
     ],
 )