Skip to content

handle case when controlnet is list or tuple #5179

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

Merged
merged 6 commits into from
Oct 4, 2023
Merged

handle case when controlnet is list or tuple #5179

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a607803
handle case when controlnet is list
noskill Sep 25, 2023
d8dbfc9
Update src/diffusers/loaders.py
patrickvonplaten Sep 27, 2023
ee89dbe
Apply suggestions from code review
patrickvonplaten Sep 27, 2023
0b3328d
Update src/diffusers/loaders.py
patrickvonplaten Sep 27, 2023
019711f
typecheck comment
noskill Sep 27, 2023
9c6cb33
Merge branch 'main' into patch-2
patrickvonplaten Oct 4, 2023
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
4 changes: 2 additions & 2 deletions src/diffusers/loaders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2433,8 +2433,8 @@ def from_single_file(cls, pretrained_model_link_or_path, **kwargs):
from .models.controlnet import ControlNetModel
from .pipelines.controlnet.multicontrolnet import MultiControlNetModel

# Model type will be inferred from the checkpoint.
if not isinstance(controlnet, (ControlNetModel, MultiControlNetModel)):
# list/tuple or a single instance of ControlNetModel or MultiControlNetModel
if not (isinstance(controlnet, (ControlNetModel, MultiControlNetModel)) or isinstance(controlnet, (list, tuple)) and isinstance(controlnet[0], ControlNetModel)):
raise ValueError("ControlNet needs to be passed if loading from ControlNet pipeline.")
elif "StableDiffusion" in pipeline_name:
# Model type will be inferred from the checkpoint.
Expand Down