Skip to content

Fix wrong variable in multi-ControlNet check_inputs #14156

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

Open
sridhar-3009 wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −16
Open

Fix wrong variable in multi-ControlNet check_inputs #14156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 10 additions & 8 deletions src/diffusers/pipelines/controlnet/pipeline_controlnet_img2img.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,7 @@ def check_inputs(
control_guidance_start=0.0,
control_guidance_end=1.0,
callback_on_step_end_tensor_inputs=None,
control_image=None,
):
if callback_steps is not None and (not isinstance(callback_steps, int) or callback_steps <= 0):
raise ValueError(
Expand Down Expand Up @@ -649,19 +650,19 @@ def check_inputs(
or is_compiled
and isinstance(self.controlnet._orig_mod, MultiControlNetModel)
):
if not isinstance(image, list):
raise TypeError("For multiple controlnets: `image` must be type `list`")
if not isinstance(control_image, list):
raise TypeError("For multiple controlnets: `control_image` must be type `list`")

# When `image` is a nested list:
# When `control_image` is a nested list:
# (e.g. [[canny_image_1, pose_image_1], [canny_image_2, pose_image_2]])
elif any(isinstance(i, list) for i in image):
elif any(isinstance(i, list) for i in control_image):
raise ValueError("A single batch of multiple conditionings are supported at the moment.")
elif len(image) != len(self.controlnet.nets):
elif len(control_image) != len(self.controlnet.nets):
raise ValueError(
f"For multiple controlnets: `image` must have the same length as the number of controlnets, but got {len(image)} images and {len(self.controlnet.nets)} ControlNets."
f"For multiple controlnets: `control_image` must have the same length as the number of controlnets, but got {len(control_image)} images and {len(self.controlnet.nets)} ControlNets."
)

for image_ in image:
for image_ in control_image:
self.check_image(image_, prompt, prompt_embeds)
else:
assert False
Expand Down Expand Up @@ -1074,7 +1075,7 @@ def __call__(
# 1. Check inputs. Raise error if not correct
self.check_inputs(
prompt,
control_image,
image,
callback_steps,
negative_prompt,
prompt_embeds,
Expand All @@ -1085,6 +1086,7 @@ def __call__(
control_guidance_start,
control_guidance_end,
callback_on_step_end_tensor_inputs,
control_image,
)

self._guidance_scale = guidance_scale
Expand Down
18 changes: 10 additions & 8 deletions src/diffusers/pipelines/controlnet/pipeline_controlnet_inpaint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,7 @@ def check_inputs(
control_guidance_end=1.0,
callback_on_step_end_tensor_inputs=None,
padding_mask_crop=None,
control_image=None,
):
if height is not None and height % 8 != 0 or width is not None and width % 8 != 0:
raise ValueError(f"`height` and `width` have to be divisible by 8 but are {height} and {width}.")
Expand Down Expand Up @@ -688,19 +689,19 @@ def check_inputs(
or is_compiled
and isinstance(self.controlnet._orig_mod, MultiControlNetModel)
):
if not isinstance(image, list):
raise TypeError("For multiple controlnets: `image` must be type `list`")
if not isinstance(control_image, list):
raise TypeError("For multiple controlnets: `control_image` must be type `list`")

# When `image` is a nested list:
# When `control_image` is a nested list:
# (e.g. [[canny_image_1, pose_image_1], [canny_image_2, pose_image_2]])
elif any(isinstance(i, list) for i in image):
elif any(isinstance(i, list) for i in control_image):
raise ValueError("A single batch of multiple conditionings are supported at the moment.")
elif len(image) != len(self.controlnet.nets):
elif len(control_image) != len(self.controlnet.nets):
raise ValueError(
f"For multiple controlnets: `image` must have the same length as the number of controlnets, but got {len(image)} images and {len(self.controlnet.nets)} ControlNets."
f"For multiple controlnets: `control_image` must have the same length as the number of controlnets, but got {len(control_image)} images and {len(self.controlnet.nets)} ControlNets."
)

for image_ in image:
for image_ in control_image:
self.check_image(image_, prompt, prompt_embeds)
else:
assert False
Expand Down Expand Up @@ -1183,7 +1184,7 @@ def __call__(
# 1. Check inputs. Raise error if not correct
self.check_inputs(
prompt,
control_image,
image,
mask_image,
height,
width,
Expand All @@ -1199,6 +1200,7 @@ def __call__(
control_guidance_end,
callback_on_step_end_tensor_inputs,
padding_mask_crop,
control_image,
)

self._guidance_scale = guidance_scale
Expand Down
Loading