Skip to content

Commit 88123a3

Browse files
hlkyhlky
committed
1 parent aa1abb0 commit 88123a3

18 files changed

+150
-343
lines changed

‎examples/community/pipeline_flux_differential_img2img.py‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
from diffusers.schedulers import FlowMatchEulerDiscreteScheduler
3030
from diffusers.utils import (
3131
USE_PEFT_BACKEND,
32-
deprecate,
3332
is_torch_xla_available,
3433
logging,
3534
replace_example_docstring,
@@ -85,24 +84,11 @@
8584
# Copied from diffusers.pipelines.flux.pipeline_flux.calculate_shift
8685
def calculate_shift(
8786
image_seq_len,
88-
base_seq_len: Optional[int] = 256,
89-
max_seq_len: Optional[int] = 4096,
90-
base_shift: Optional[float] = 0.5,
91-
max_shift: Optional[float] = 1.16,
92-
scheduler: Optional[FlowMatchEulerDiscreteScheduler] = None,
87+
base_seq_len: int = 256,
88+
max_seq_len: int = 4096,
89+
base_shift: float = 0.5,
90+
max_shift: float = 1.16,
9391
):
94-
if base_seq_len or max_seq_len or base_shift or max_shift or scheduler is None:
95-
deprecation_message = "Pass `scheduler` to `calculate_shift`."
96-
deprecate(
97-
"calculate_shift scheduler",
98-
"1.0.0",
99-
deprecation_message,
100-
standard_warn=False,
101-
)
102-
base_seq_len = base_seq_len or scheduler.config.get("base_image_seq_len", 256)
103-
max_seq_len = max_seq_len or scheduler.config.get("max_image_seq_len", 4096)
104-
base_shift = base_shift or scheduler.config.get("base_shift", 0.5)
105-
max_shift = max_shift or scheduler.config.get("max_shift", 1.16)
10692
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
10793
b = base_shift - m * base_seq_len
10894
mu = image_seq_len * m + b
@@ -890,7 +876,10 @@ def __call__(
890876
image_seq_len = (int(height) // self.vae_scale_factor) * (int(width) // self.vae_scale_factor)
891877
mu = calculate_shift(
892878
image_seq_len,
893-
scheduler=self.scheduler,
879+
self.scheduler.config.get("base_image_seq_len", 256),
880+
self.scheduler.config.get("max_image_seq_len", 4096),
881+
self.scheduler.config.get("base_shift", 0.5),
882+
self.scheduler.config.get("max_shift", 1.16),
894883
)
895884
timesteps, num_inference_steps = retrieve_timesteps(
896885
self.scheduler,

‎examples/community/pipeline_flux_rf_inversion.py‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
from diffusers.schedulers import FlowMatchEulerDiscreteScheduler
3131
from diffusers.utils import (
3232
USE_PEFT_BACKEND,
33-
deprecate,
3433
is_torch_xla_available,
3534
logging,
3635
replace_example_docstring,
@@ -92,24 +91,11 @@
9291
# Copied from diffusers.pipelines.flux.pipeline_flux.calculate_shift
9392
def calculate_shift(
9493
image_seq_len,
95-
base_seq_len: Optional[int] = 256,
96-
max_seq_len: Optional[int] = 4096,
97-
base_shift: Optional[float] = 0.5,
98-
max_shift: Optional[float] = 1.16,
99-
scheduler: Optional[FlowMatchEulerDiscreteScheduler] = None,
94+
base_seq_len: int = 256,
95+
max_seq_len: int = 4096,
96+
base_shift: float = 0.5,
97+
max_shift: float = 1.16,
10098
):
101-
if base_seq_len or max_seq_len or base_shift or max_shift or scheduler is None:
102-
deprecation_message = "Pass `scheduler` to `calculate_shift`."
103-
deprecate(
104-
"calculate_shift scheduler",
105-
"1.0.0",
106-
deprecation_message,
107-
standard_warn=False,
108-
)
109-
base_seq_len = base_seq_len or scheduler.config.get("base_image_seq_len", 256)
110-
max_seq_len = max_seq_len or scheduler.config.get("max_image_seq_len", 4096)
111-
base_shift = base_shift or scheduler.config.get("base_shift", 0.5)
112-
max_shift = max_shift or scheduler.config.get("max_shift", 1.16)
11399
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
114100
b = base_shift - m * base_seq_len
115101
mu = image_seq_len * m + b
@@ -836,7 +822,10 @@ def __call__(
836822
image_seq_len = (int(height) // self.vae_scale_factor // 2) * (int(width) // self.vae_scale_factor // 2)
837823
mu = calculate_shift(
838824
image_seq_len,
839-
scheduler=self.scheduler,
825+
self.scheduler.config.get("base_image_seq_len", 256),
826+
self.scheduler.config.get("max_image_seq_len", 4096),
827+
self.scheduler.config.get("base_shift", 0.5),
828+
self.scheduler.config.get("max_shift", 1.16),
840829
)
841830
timesteps, num_inference_steps = retrieve_timesteps(
842831
self.scheduler,
@@ -1003,7 +992,10 @@ def invert(
1003992
image_seq_len = (int(height) // self.vae_scale_factor // 2) * (int(width) // self.vae_scale_factor // 2)
1004993
mu = calculate_shift(
1005994
image_seq_len,
1006-
scheduler=self.scheduler,
995+
self.scheduler.config.get("base_image_seq_len", 256),
996+
self.scheduler.config.get("max_image_seq_len", 4096),
997+
self.scheduler.config.get("base_shift", 0.5),
998+
self.scheduler.config.get("max_shift", 1.16),
1007999
)
10081000
timesteps, num_inversion_steps = retrieve_timesteps(
10091001
self.scheduler,

‎examples/community/pipeline_flux_with_cfg.py‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
from diffusers.schedulers import FlowMatchEulerDiscreteScheduler
2929
from diffusers.utils import (
3030
USE_PEFT_BACKEND,
31-
deprecate,
3231
is_torch_xla_available,
3332
logging,
3433
replace_example_docstring,
@@ -68,24 +67,11 @@
6867
# Copied from diffusers.pipelines.flux.pipeline_flux.calculate_shift
6968
def calculate_shift(
7069
image_seq_len,
71-
base_seq_len: Optional[int] = 256,
72-
max_seq_len: Optional[int] = 4096,
73-
base_shift: Optional[float] = 0.5,
74-
max_shift: Optional[float] = 1.16,
75-
scheduler: Optional[FlowMatchEulerDiscreteScheduler] = None,
70+
base_seq_len: int = 256,
71+
max_seq_len: int = 4096,
72+
base_shift: float = 0.5,
73+
max_shift: float = 1.16,
7674
):
77-
if base_seq_len or max_seq_len or base_shift or max_shift or scheduler is None:
78-
deprecation_message = "Pass `scheduler` to `calculate_shift`."
79-
deprecate(
80-
"calculate_shift scheduler",
81-
"1.0.0",
82-
deprecation_message,
83-
standard_warn=False,
84-
)
85-
base_seq_len = base_seq_len or scheduler.config.get("base_image_seq_len", 256)
86-
max_seq_len = max_seq_len or scheduler.config.get("max_image_seq_len", 4096)
87-
base_shift = base_shift or scheduler.config.get("base_shift", 0.5)
88-
max_shift = max_shift or scheduler.config.get("max_shift", 1.16)
8975
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
9076
b = base_shift - m * base_seq_len
9177
mu = image_seq_len * m + b
@@ -772,7 +758,10 @@ def __call__(
772758
image_seq_len = latents.shape[1]
773759
mu = calculate_shift(
774760
image_seq_len,
775-
scheduler=self.scheduler,
761+
self.scheduler.config.get("base_image_seq_len", 256),
762+
self.scheduler.config.get("max_image_seq_len", 4096),
763+
self.scheduler.config.get("base_shift", 0.5),
764+
self.scheduler.config.get("max_shift", 1.16),
776765
)
777766
timesteps, num_inference_steps = retrieve_timesteps(
778767
self.scheduler,

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

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
from ...schedulers import FlowMatchEulerDiscreteScheduler
3434
from ...utils import (
3535
USE_PEFT_BACKEND,
36-
deprecate,
3736
is_torch_xla_available,
3837
logging,
3938
replace_example_docstring,
@@ -74,24 +73,11 @@
7473

7574
def calculate_shift(
7675
image_seq_len,
77-
base_seq_len: Optional[int] = 256,
78-
max_seq_len: Optional[int] = 4096,
79-
base_shift: Optional[float] = 0.5,
80-
max_shift: Optional[float] = 1.16,
81-
scheduler: Optional[FlowMatchEulerDiscreteScheduler] = None,
76+
base_seq_len: int = 256,
77+
max_seq_len: int = 4096,
78+
base_shift: float = 0.5,
79+
max_shift: float = 1.16,
8280
):
83-
if base_seq_len or max_seq_len or base_shift or max_shift or scheduler is None:
84-
deprecation_message = "Pass `scheduler` to `calculate_shift`."
85-
deprecate(
86-
"calculate_shift scheduler",
87-
"1.0.0",
88-
deprecation_message,
89-
standard_warn=False,
90-
)
91-
base_seq_len = base_seq_len or scheduler.config.get("base_image_seq_len", 256)
92-
max_seq_len = max_seq_len or scheduler.config.get("max_image_seq_len", 4096)
93-
base_shift = base_shift or scheduler.config.get("base_shift", 0.5)
94-
max_shift = max_shift or scheduler.config.get("max_shift", 1.16)
9581
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
9682
b = base_shift - m * base_seq_len
9783
mu = image_seq_len * m + b
@@ -838,7 +824,10 @@ def __call__(
838824
image_seq_len = latents.shape[1]
839825
mu = calculate_shift(
840826
image_seq_len,
841-
scheduler=self.scheduler,
827+
self.scheduler.config.get("base_image_seq_len", 256),
828+
self.scheduler.config.get("max_image_seq_len", 4096),
829+
self.scheduler.config.get("base_shift", 0.5),
830+
self.scheduler.config.get("max_shift", 1.16),
842831
)
843832
timesteps, num_inference_steps = retrieve_timesteps(
844833
self.scheduler,

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

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
from ...schedulers import FlowMatchEulerDiscreteScheduler
2727
from ...utils import (
2828
USE_PEFT_BACKEND,
29-
deprecate,
3029
is_torch_xla_available,
3130
logging,
3231
replace_example_docstring,
@@ -86,24 +85,11 @@
8685
# Copied from diffusers.pipelines.flux.pipeline_flux.calculate_shift
8786
def calculate_shift(
8887
image_seq_len,
89-
base_seq_len: Optional[int] = 256,
90-
max_seq_len: Optional[int] = 4096,
91-
base_shift: Optional[float] = 0.5,
92-
max_shift: Optional[float] = 1.16,
93-
scheduler: Optional[FlowMatchEulerDiscreteScheduler] = None,
88+
base_seq_len: int = 256,
89+
max_seq_len: int = 4096,
90+
base_shift: float = 0.5,
91+
max_shift: float = 1.16,
9492
):
95-
if base_seq_len or max_seq_len or base_shift or max_shift or scheduler is None:
96-
deprecation_message = "Pass `scheduler` to `calculate_shift`."
97-
deprecate(
98-
"calculate_shift scheduler",
99-
"1.0.0",
100-
deprecation_message,
101-
standard_warn=False,
102-
)
103-
base_seq_len = base_seq_len or scheduler.config.get("base_image_seq_len", 256)
104-
max_seq_len = max_seq_len or scheduler.config.get("max_image_seq_len", 4096)
105-
base_shift = base_shift or scheduler.config.get("base_shift", 0.5)
106-
max_shift = max_shift or scheduler.config.get("max_shift", 1.16)
10793
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
10894
b = base_shift - m * base_seq_len
10995
mu = image_seq_len * m + b
@@ -817,7 +803,10 @@ def __call__(
817803
image_seq_len = latents.shape[1]
818804
mu = calculate_shift(
819805
image_seq_len,
820-
scheduler=self.scheduler,
806+
self.scheduler.config.get("base_image_seq_len", 256),
807+
self.scheduler.config.get("max_image_seq_len", 4096),
808+
self.scheduler.config.get("base_shift", 0.5),
809+
self.scheduler.config.get("max_shift", 1.16),
821810
)
822811
timesteps, num_inference_steps = retrieve_timesteps(
823812
self.scheduler,

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

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
from ...schedulers import FlowMatchEulerDiscreteScheduler
2727
from ...utils import (
2828
USE_PEFT_BACKEND,
29-
deprecate,
3029
is_torch_xla_available,
3130
logging,
3231
replace_example_docstring,
@@ -91,24 +90,11 @@
9190
# Copied from diffusers.pipelines.flux.pipeline_flux.calculate_shift
9291
def calculate_shift(
9392
image_seq_len,
94-
base_seq_len: Optional[int] = 256,
95-
max_seq_len: Optional[int] = 4096,
96-
base_shift: Optional[float] = 0.5,
97-
max_shift: Optional[float] = 1.16,
98-
scheduler: Optional[FlowMatchEulerDiscreteScheduler] = None,
93+
base_seq_len: int = 256,
94+
max_seq_len: int = 4096,
95+
base_shift: float = 0.5,
96+
max_shift: float = 1.16,
9997
):
100-
if base_seq_len or max_seq_len or base_shift or max_shift or scheduler is None:
101-
deprecation_message = "Pass `scheduler` to `calculate_shift`."
102-
deprecate(
103-
"calculate_shift scheduler",
104-
"1.0.0",
105-
deprecation_message,
106-
standard_warn=False,
107-
)
108-
base_seq_len = base_seq_len or scheduler.config.get("base_image_seq_len", 256)
109-
max_seq_len = max_seq_len or scheduler.config.get("max_image_seq_len", 4096)
110-
base_shift = base_shift or scheduler.config.get("base_shift", 0.5)
111-
max_shift = max_shift or scheduler.config.get("max_shift", 1.16)
11298
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
11399
b = base_shift - m * base_seq_len
114100
mu = image_seq_len * m + b
@@ -823,7 +809,10 @@ def __call__(
823809
image_seq_len = (int(height) // self.vae_scale_factor // 2) * (int(width) // self.vae_scale_factor // 2)
824810
mu = calculate_shift(
825811
image_seq_len,
826-
scheduler=self.scheduler,
812+
self.scheduler.config.get("base_image_seq_len", 256),
813+
self.scheduler.config.get("max_image_seq_len", 4096),
814+
self.scheduler.config.get("base_shift", 0.5),
815+
self.scheduler.config.get("max_shift", 1.16),
827816
)
828817
timesteps, num_inference_steps = retrieve_timesteps(
829818
self.scheduler,

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

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
from ...schedulers import FlowMatchEulerDiscreteScheduler
3636
from ...utils import (
3737
USE_PEFT_BACKEND,
38-
deprecate,
3938
is_torch_xla_available,
4039
logging,
4140
replace_example_docstring,
@@ -117,24 +116,11 @@
117116
# Copied from diffusers.pipelines.flux.pipeline_flux.calculate_shift
118117
def calculate_shift(
119118
image_seq_len,
120-
base_seq_len: Optional[int] = 256,
121-
max_seq_len: Optional[int] = 4096,
122-
base_shift: Optional[float] = 0.5,
123-
max_shift: Optional[float] = 1.16,
124-
scheduler: Optional[FlowMatchEulerDiscreteScheduler] = None,
119+
base_seq_len: int = 256,
120+
max_seq_len: int = 4096,
121+
base_shift: float = 0.5,
122+
max_shift: float = 1.16,
125123
):
126-
if base_seq_len or max_seq_len or base_shift or max_shift or scheduler is None:
127-
deprecation_message = "Pass `scheduler` to `calculate_shift`."
128-
deprecate(
129-
"calculate_shift scheduler",
130-
"1.0.0",
131-
deprecation_message,
132-
standard_warn=False,
133-
)
134-
base_seq_len = base_seq_len or scheduler.config.get("base_image_seq_len", 256)
135-
max_seq_len = max_seq_len or scheduler.config.get("max_image_seq_len", 4096)
136-
base_shift = base_shift or scheduler.config.get("base_shift", 0.5)
137-
max_shift = max_shift or scheduler.config.get("max_shift", 1.16)
138124
m = (max_shift - base_shift) / (max_seq_len - base_seq_len)
139125
b = base_shift - m * base_seq_len
140126
mu = image_seq_len * m + b
@@ -999,7 +985,10 @@ def __call__(
999985
image_seq_len = (int(height) // self.vae_scale_factor // 2) * (int(width) // self.vae_scale_factor // 2)
1000986
mu = calculate_shift(
1001987
image_seq_len,
1002-
scheduler=self.scheduler,
988+
self.scheduler.config.get("base_image_seq_len", 256),
989+
self.scheduler.config.get("max_image_seq_len", 4096),
990+
self.scheduler.config.get("base_shift", 0.5),
991+
self.scheduler.config.get("max_shift", 1.16),
1003992
)
1004993
timesteps, num_inference_steps = retrieve_timesteps(
1005994
self.scheduler,

0 commit comments

Comments
 (0)