Skip to content

Commit 750bd79

Browse files
authored
[Single File] Fix configuring scheduler via legacy kwargs (#9229)
update
1 parent 214372a commit 750bd79

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

src/diffusers/loaders/single_file.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from ..utils import deprecate, is_transformers_available, logging
2424
from .single_file_utils import (
2525
SingleFileComponentError,
26+
_is_legacy_scheduler_kwargs,
2627
_is_model_weights_in_cached_folder,
2728
_legacy_load_clip_tokenizer,
2829
_legacy_load_safety_checker,
@@ -42,7 +43,6 @@
4243
# Legacy behaviour. `from_single_file` does not load the safety checker unless explicitly provided
4344
SINGLE_FILE_OPTIONAL_COMPONENTS = ["safety_checker"]
4445

45-
4646
if is_transformers_available():
4747
import transformers
4848
from transformers import PreTrainedModel, PreTrainedTokenizer
@@ -135,7 +135,7 @@ def load_single_file_sub_model(
135135
class_obj, checkpoint=checkpoint, config=cached_model_config_path, local_files_only=local_files_only
136136
)
137137

138-
elif is_diffusers_scheduler and is_legacy_loading:
138+
elif is_diffusers_scheduler and (is_legacy_loading or _is_legacy_scheduler_kwargs(kwargs)):
139139
loaded_sub_model = _legacy_load_scheduler(
140140
class_obj, checkpoint=checkpoint, component_name=name, original_config=original_config, **kwargs
141141
)

src/diffusers/loaders/single_file_utils.py

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@
269269
]
270270
OPEN_CLIP_PREFIX = "conditioner.embedders.0.model."
271271
LDM_OPEN_CLIP_TEXT_PROJECTION_DIM = 1024
272+
SCHEDULER_LEGACY_KWARGS = ["prediction_type", "scheduler_type"]
272273

273274
VALID_URL_PREFIXES = ["https://huggingface.co/", "huggingface.co/", "hf.co/", "https://hf.co/"]
274275

@@ -318,6 +319,10 @@ def _is_model_weights_in_cached_folder(cached_folder, name):
318319
return weights_exist
319320

320321

322+
def _is_legacy_scheduler_kwargs(kwargs):
323+
return any(k in SCHEDULER_LEGACY_KWARGS for k in kwargs.keys())
324+
325+
321326
def load_single_file_checkpoint(
322327
pretrained_model_link_or_path,
323328
force_download=False,
@@ -1479,14 +1484,22 @@ def _legacy_load_scheduler(
14791484

14801485
if scheduler_type is not None:
14811486
deprecation_message = (
1482-
"Please pass an instance of a Scheduler object directly to the `scheduler` argument in `from_single_file`."
1487+
"Please pass an instance of a Scheduler object directly to the `scheduler` argument in `from_single_file`\n\n"
1488+
"Example:\n\n"
1489+
"from diffusers import StableDiffusionPipeline, DDIMScheduler\n\n"
1490+
"scheduler = DDIMScheduler()\n"
1491+
"pipe = StableDiffusionPipeline.from_single_file(<checkpoint path>, scheduler=scheduler)\n"
14831492
)
14841493
deprecate("scheduler_type", "1.0.0", deprecation_message)
14851494

14861495
if prediction_type is not None:
14871496
deprecation_message = (
1488-
"Please configure an instance of a Scheduler with the appropriate `prediction_type` "
1489-
"and pass the object directly to the `scheduler` argument in `from_single_file`."
1497+
"Please configure an instance of a Scheduler with the appropriate `prediction_type` and "
1498+
"pass the object directly to the `scheduler` argument in `from_single_file`.\n\n"
1499+
"Example:\n\n"
1500+
"from diffusers import StableDiffusionPipeline, DDIMScheduler\n\n"
1501+
'scheduler = DDIMScheduler(prediction_type="v_prediction")\n'
1502+
"pipe = StableDiffusionPipeline.from_single_file(<checkpoint path>, scheduler=scheduler)\n"
14901503
)
14911504
deprecate("prediction_type", "1.0.0", deprecation_message)
14921505

0 commit comments

Comments
 (0)