Skip to content

Commit b75b204

Browse files
puhukpuhuk
authored
Fix max_shift value in flux and related functions to 1.15 (issue #10675) (#10807)
This PR updates the max_shift value in flux to 1.15 for consistency across the codebase. In addition to modifying max_shift in flux, all related functions that copy and use this logic, such as calculate_shift in `src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3_img2img.py`, have also been updated to ensure uniform behavior.
1 parent c14057c commit b75b204

20 files changed

+37
-37
lines changed

‎examples/community/pipeline_flux_differential_img2img.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def calculate_shift(
8787
base_seq_len: int = 256,
8888
max_seq_len: int = 4096,
8989
base_shift: float = 0.5,
90-
max_shift: float = 1.16,
90+
max_shift: float = 1.15,
9191
):
9292
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
9393
b = base_shift - m * base_seq_len
@@ -878,7 +878,7 @@ def __call__(
878878
self.scheduler.config.get("base_image_seq_len", 256),
879879
self.scheduler.config.get("max_image_seq_len", 4096),
880880
self.scheduler.config.get("base_shift", 0.5),
881-
self.scheduler.config.get("max_shift", 1.16),
881+
self.scheduler.config.get("max_shift", 1.15),
882882
)
883883
timesteps, num_inference_steps = retrieve_timesteps(
884884
self.scheduler,

‎examples/community/pipeline_flux_rf_inversion.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def calculate_shift(
9494
base_seq_len: int = 256,
9595
max_seq_len: int = 4096,
9696
base_shift: float = 0.5,
97-
max_shift: float = 1.16,
97+
max_shift: float = 1.15,
9898
):
9999
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
100100
b = base_shift - m * base_seq_len
@@ -823,7 +823,7 @@ def __call__(
823823
self.scheduler.config.get("base_image_seq_len", 256),
824824
self.scheduler.config.get("max_image_seq_len", 4096),
825825
self.scheduler.config.get("base_shift", 0.5),
826-
self.scheduler.config.get("max_shift", 1.16),
826+
self.scheduler.config.get("max_shift", 1.15),
827827
)
828828
timesteps, num_inference_steps = retrieve_timesteps(
829829
self.scheduler,
@@ -993,7 +993,7 @@ def invert(
993993
self.scheduler.config.get("base_image_seq_len", 256),
994994
self.scheduler.config.get("max_image_seq_len", 4096),
995995
self.scheduler.config.get("base_shift", 0.5),
996-
self.scheduler.config.get("max_shift", 1.16),
996+
self.scheduler.config.get("max_shift", 1.15),
997997
)
998998
timesteps, num_inversion_steps = retrieve_timesteps(
999999
self.scheduler,

‎examples/community/pipeline_flux_semantic_guidance.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def calculate_shift(
9191
base_seq_len: int = 256,
9292
max_seq_len: int = 4096,
9393
base_shift: float = 0.5,
94-
max_shift: float = 1.16,
94+
max_shift: float = 1.15,
9595
):
9696
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
9797
b = base_shift - m * base_seq_len
@@ -1041,7 +1041,7 @@ def __call__(
10411041
self.scheduler.config.get("base_image_seq_len", 256),
10421042
self.scheduler.config.get("max_image_seq_len", 4096),
10431043
self.scheduler.config.get("base_shift", 0.5),
1044-
self.scheduler.config.get("max_shift", 1.16),
1044+
self.scheduler.config.get("max_shift", 1.15),
10451045
)
10461046
timesteps, num_inference_steps = retrieve_timesteps(
10471047
self.scheduler,

‎examples/community/pipeline_flux_with_cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def calculate_shift(
7070
base_seq_len: int = 256,
7171
max_seq_len: int = 4096,
7272
base_shift: float = 0.5,
73-
max_shift: float = 1.16,
73+
max_shift: float = 1.15,
7474
):
7575
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
7676
b = base_shift - m * base_seq_len
@@ -759,7 +759,7 @@ def __call__(
759759
self.scheduler.config.get("base_image_seq_len", 256),
760760
self.scheduler.config.get("max_image_seq_len", 4096),
761761
self.scheduler.config.get("base_shift", 0.5),
762-
self.scheduler.config.get("max_shift", 1.16),
762+
self.scheduler.config.get("max_shift", 1.15),
763763
)
764764
timesteps, num_inference_steps = retrieve_timesteps(
765765
self.scheduler,

‎src/diffusers/pipelines/flux/pipeline_flux.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def calculate_shift(
7575
base_seq_len: int = 256,
7676
max_seq_len: int = 4096,
7777
base_shift: float = 0.5,
78-
max_shift: float = 1.16,
78+
max_shift: float = 1.15,
7979
):
8080
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
8181
b = base_shift - m * base_seq_len
@@ -849,7 +849,7 @@ def __call__(
849849
self.scheduler.config.get("base_image_seq_len", 256),
850850
self.scheduler.config.get("max_image_seq_len", 4096),
851851
self.scheduler.config.get("base_shift", 0.5),
852-
self.scheduler.config.get("max_shift", 1.16),
852+
self.scheduler.config.get("max_shift", 1.15),
853853
)
854854
timesteps, num_inference_steps = retrieve_timesteps(
855855
self.scheduler,

‎src/diffusers/pipelines/flux/pipeline_flux_control.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def calculate_shift(
8888
base_seq_len: int = 256,
8989
max_seq_len: int = 4096,
9090
base_shift: float = 0.5,
91-
max_shift: float = 1.16,
91+
max_shift: float = 1.15,
9292
):
9393
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
9494
b = base_shift - m * base_seq_len
@@ -802,7 +802,7 @@ def __call__(
802802
self.scheduler.config.get("base_image_seq_len", 256),
803803
self.scheduler.config.get("max_image_seq_len", 4096),
804804
self.scheduler.config.get("base_shift", 0.5),
805-
self.scheduler.config.get("max_shift", 1.16),
805+
self.scheduler.config.get("max_shift", 1.15),
806806
)
807807
timesteps, num_inference_steps = retrieve_timesteps(
808808
self.scheduler,

‎src/diffusers/pipelines/flux/pipeline_flux_control_img2img.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def calculate_shift(
9393
base_seq_len: int = 256,
9494
max_seq_len: int = 4096,
9595
base_shift: float = 0.5,
96-
max_shift: float = 1.16,
96+
max_shift: float = 1.15,
9797
):
9898
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
9999
b = base_shift - m * base_seq_len
@@ -810,7 +810,7 @@ def __call__(
810810
self.scheduler.config.get("base_image_seq_len", 256),
811811
self.scheduler.config.get("max_image_seq_len", 4096),
812812
self.scheduler.config.get("base_shift", 0.5),
813-
self.scheduler.config.get("max_shift", 1.16),
813+
self.scheduler.config.get("max_shift", 1.15),
814814
)
815815
timesteps, num_inference_steps = retrieve_timesteps(
816816
self.scheduler,

‎src/diffusers/pipelines/flux/pipeline_flux_control_inpaint.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def calculate_shift(
119119
base_seq_len: int = 256,
120120
max_seq_len: int = 4096,
121121
base_shift: float = 0.5,
122-
max_shift: float = 1.16,
122+
max_shift: float = 1.15,
123123
):
124124
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
125125
b = base_shift - m * base_seq_len
@@ -987,7 +987,7 @@ def __call__(
987987
self.scheduler.config.get("base_image_seq_len", 256),
988988
self.scheduler.config.get("max_image_seq_len", 4096),
989989
self.scheduler.config.get("base_shift", 0.5),
990-
self.scheduler.config.get("max_shift", 1.16),
990+
self.scheduler.config.get("max_shift", 1.15),
991991
)
992992
timesteps, num_inference_steps = retrieve_timesteps(
993993
self.scheduler,

‎src/diffusers/pipelines/flux/pipeline_flux_controlnet.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def calculate_shift(
8989
base_seq_len: int = 256,
9090
max_seq_len: int = 4096,
9191
base_shift: float = 0.5,
92-
max_shift: float = 1.16,
92+
max_shift: float = 1.15,
9393
):
9494
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
9595
b = base_shift - m * base_seq_len
@@ -877,7 +877,7 @@ def __call__(
877877
self.scheduler.config.get("base_image_seq_len", 256),
878878
self.scheduler.config.get("max_image_seq_len", 4096),
879879
self.scheduler.config.get("base_shift", 0.5),
880-
self.scheduler.config.get("max_shift", 1.16),
880+
self.scheduler.config.get("max_shift", 1.15),
881881
)
882882
timesteps, num_inference_steps = retrieve_timesteps(
883883
self.scheduler,

‎src/diffusers/pipelines/flux/pipeline_flux_controlnet_image_to_image.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def calculate_shift(
8787
base_seq_len: int = 256,
8888
max_seq_len: int = 4096,
8989
base_shift: float = 0.5,
90-
max_shift: float = 1.16,
90+
max_shift: float = 1.15,
9191
):
9292
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
9393
b = base_shift - m * base_seq_len
@@ -865,7 +865,7 @@ def __call__(
865865
self.scheduler.config.get("base_image_seq_len", 256),
866866
self.scheduler.config.get("max_image_seq_len", 4096),
867867
self.scheduler.config.get("base_shift", 0.5),
868-
self.scheduler.config.get("max_shift", 1.16),
868+
self.scheduler.config.get("max_shift", 1.15),
869869
)
870870
timesteps, num_inference_steps = retrieve_timesteps(
871871
self.scheduler,

‎src/diffusers/pipelines/flux/pipeline_flux_controlnet_inpainting.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def calculate_shift(
8989
base_seq_len: int = 256,
9090
max_seq_len: int = 4096,
9191
base_shift: float = 0.5,
92-
max_shift: float = 1.16,
92+
max_shift: float = 1.15,
9393
):
9494
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
9595
b = base_shift - m * base_seq_len
@@ -1019,7 +1019,7 @@ def __call__(
10191019
self.scheduler.config.get("base_image_seq_len", 256),
10201020
self.scheduler.config.get("max_image_seq_len", 4096),
10211021
self.scheduler.config.get("base_shift", 0.5),
1022-
self.scheduler.config.get("max_shift", 1.16),
1022+
self.scheduler.config.get("max_shift", 1.15),
10231023
)
10241024
timesteps, num_inference_steps = retrieve_timesteps(
10251025
self.scheduler,

‎src/diffusers/pipelines/flux/pipeline_flux_fill.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def calculate_shift(
8282
base_seq_len: int = 256,
8383
max_seq_len: int = 4096,
8484
base_shift: float = 0.5,
85-
max_shift: float = 1.16,
85+
max_shift: float = 1.15,
8686
):
8787
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
8888
b = base_shift - m * base_seq_len
@@ -884,7 +884,7 @@ def __call__(
884884
self.scheduler.config.get("base_image_seq_len", 256),
885885
self.scheduler.config.get("max_image_seq_len", 4096),
886886
self.scheduler.config.get("base_shift", 0.5),
887-
self.scheduler.config.get("max_shift", 1.16),
887+
self.scheduler.config.get("max_shift", 1.15),
888888
)
889889
timesteps, num_inference_steps = retrieve_timesteps(
890890
self.scheduler,

‎src/diffusers/pipelines/flux/pipeline_flux_img2img.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def calculate_shift(
7777
base_seq_len: int = 256,
7878
max_seq_len: int = 4096,
7979
base_shift: float = 0.5,
80-
max_shift: float = 1.16,
80+
max_shift: float = 1.15,
8181
):
8282
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
8383
b = base_shift - m * base_seq_len
@@ -747,7 +747,7 @@ def __call__(
747747
self.scheduler.config.get("base_image_seq_len", 256),
748748
self.scheduler.config.get("max_image_seq_len", 4096),
749749
self.scheduler.config.get("base_shift", 0.5),
750-
self.scheduler.config.get("max_shift", 1.16),
750+
self.scheduler.config.get("max_shift", 1.15),
751751
)
752752
timesteps, num_inference_steps = retrieve_timesteps(
753753
self.scheduler,

‎src/diffusers/pipelines/flux/pipeline_flux_inpaint.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def calculate_shift(
7474
base_seq_len: int = 256,
7575
max_seq_len: int = 4096,
7676
base_shift: float = 0.5,
77-
max_shift: float = 1.16,
77+
max_shift: float = 1.15,
7878
):
7979
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
8080
b = base_shift - m * base_seq_len
@@ -879,7 +879,7 @@ def __call__(
879879
self.scheduler.config.get("base_image_seq_len", 256),
880880
self.scheduler.config.get("max_image_seq_len", 4096),
881881
self.scheduler.config.get("base_shift", 0.5),
882-
self.scheduler.config.get("max_shift", 1.16),
882+
self.scheduler.config.get("max_shift", 1.15),
883883
)
884884
timesteps, num_inference_steps = retrieve_timesteps(
885885
self.scheduler,

‎src/diffusers/pipelines/ltx/pipeline_ltx.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def calculate_shift(
7272
base_seq_len: int = 256,
7373
max_seq_len: int = 4096,
7474
base_shift: float = 0.5,
75-
max_shift: float = 1.16,
75+
max_shift: float = 1.15,
7676
):
7777
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
7878
b = base_shift - m * base_seq_len
@@ -680,7 +680,7 @@ def __call__(
680680
self.scheduler.config.get("base_image_seq_len", 256),
681681
self.scheduler.config.get("max_image_seq_len", 4096),
682682
self.scheduler.config.get("base_shift", 0.5),
683-
self.scheduler.config.get("max_shift", 1.16),
683+
self.scheduler.config.get("max_shift", 1.15),
684684
)
685685
timesteps, num_inference_steps = retrieve_timesteps(
686686
self.scheduler,

‎src/diffusers/pipelines/ltx/pipeline_ltx_image2video.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def calculate_shift(
7777
base_seq_len: int = 256,
7878
max_seq_len: int = 4096,
7979
base_shift: float = 0.5,
80-
max_shift: float = 1.16,
80+
max_shift: float = 1.15,
8181
):
8282
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
8383
b = base_shift - m * base_seq_len
@@ -750,7 +750,7 @@ def __call__(
750750
self.scheduler.config.get("base_image_seq_len", 256),
751751
self.scheduler.config.get("max_image_seq_len", 4096),
752752
self.scheduler.config.get("base_shift", 0.5),
753-
self.scheduler.config.get("max_shift", 1.16),
753+
self.scheduler.config.get("max_shift", 1.15),
754754
)
755755
timesteps, num_inference_steps = retrieve_timesteps(
756756
self.scheduler,

‎src/diffusers/pipelines/lumina2/pipeline_lumina2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def calculate_shift(
6464
base_seq_len: int = 256,
6565
max_seq_len: int = 4096,
6666
base_shift: float = 0.5,
67-
max_shift: float = 1.16,
67+
max_shift: float = 1.15,
6868
):
6969
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
7070
b = base_shift - m * base_seq_len

‎src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def calculate_shift(
7676
base_seq_len: int = 256,
7777
max_seq_len: int = 4096,
7878
base_shift: float = 0.5,
79-
max_shift: float = 1.16,
79+
max_shift: float = 1.15,
8080
):
8181
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
8282
b = base_shift - m * base_seq_len

‎src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3_img2img.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def calculate_shift(
8383
base_seq_len: int = 256,
8484
max_seq_len: int = 4096,
8585
base_shift: float = 0.5,
86-
max_shift: float = 1.16,
86+
max_shift: float = 1.15,
8787
):
8888
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
8989
b = base_shift - m * base_seq_len

‎src/diffusers/pipelines/stable_diffusion_3/pipeline_stable_diffusion_3_inpaint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def calculate_shift(
8282
base_seq_len: int = 256,
8383
max_seq_len: int = 4096,
8484
base_shift: float = 0.5,
85-
max_shift: float = 1.16,
85+
max_shift: float = 1.15,
8686
):
8787
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
8888
b = base_shift - m * base_seq_len

0 commit comments

Comments
 (0)