Skip to content

Commit 18f7d1d

Browse files
authored
ControlNet Union controlnet_conditioning_scale for multiple control inputs (#10666)
1 parent f7f36c7 commit 18f7d1d

File tree

3 files changed

+0
-60
lines changed

3 files changed

+0
-60
lines changed

src/diffusers/pipelines/controlnet/pipeline_controlnet_union_inpaint_sd_xl.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -766,26 +766,6 @@ def check_inputs(
766766
else:
767767
assert False
768768

769-
# Check `controlnet_conditioning_scale`
770-
if (
771-
isinstance(self.controlnet, ControlNetModel)
772-
or is_compiled
773-
and isinstance(self.controlnet._orig_mod, ControlNetModel)
774-
):
775-
if not isinstance(controlnet_conditioning_scale, float):
776-
raise TypeError("For single controlnet: `controlnet_conditioning_scale` must be type `float`.")
777-
778-
elif (
779-
isinstance(self.controlnet, ControlNetUnionModel)
780-
or is_compiled
781-
and isinstance(self.controlnet._orig_mod, ControlNetUnionModel)
782-
):
783-
if not isinstance(controlnet_conditioning_scale, float):
784-
raise TypeError("For single controlnet: `controlnet_conditioning_scale` must be type `float`.")
785-
786-
else:
787-
assert False
788-
789769
if not isinstance(control_guidance_start, (tuple, list)):
790770
control_guidance_start = [control_guidance_start]
791771

src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -741,26 +741,6 @@ def check_inputs(
741741
else:
742742
assert False
743743

744-
# Check `controlnet_conditioning_scale`
745-
if (
746-
isinstance(self.controlnet, ControlNetModel)
747-
or is_compiled
748-
and isinstance(self.controlnet._orig_mod, ControlNetModel)
749-
):
750-
if not isinstance(controlnet_conditioning_scale, float):
751-
raise TypeError("For single controlnet: `controlnet_conditioning_scale` must be type `float`.")
752-
753-
elif (
754-
isinstance(self.controlnet, ControlNetUnionModel)
755-
or is_compiled
756-
and isinstance(self.controlnet._orig_mod, ControlNetUnionModel)
757-
):
758-
if not isinstance(controlnet_conditioning_scale, float):
759-
raise TypeError("For single controlnet: `controlnet_conditioning_scale` must be type `float`.")
760-
761-
else:
762-
assert False
763-
764744
if not isinstance(control_guidance_start, (tuple, list)):
765745
control_guidance_start = [control_guidance_start]
766746

src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl_img2img.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -746,26 +746,6 @@ def check_inputs(
746746
else:
747747
assert False
748748

749-
# Check `controlnet_conditioning_scale`
750-
if (
751-
isinstance(self.controlnet, ControlNetModel)
752-
or is_compiled
753-
and isinstance(self.controlnet._orig_mod, ControlNetModel)
754-
):
755-
if not isinstance(controlnet_conditioning_scale, float):
756-
raise TypeError("For single controlnet: `controlnet_conditioning_scale` must be type `float`.")
757-
758-
elif (
759-
isinstance(self.controlnet, ControlNetUnionModel)
760-
or is_compiled
761-
and isinstance(self.controlnet._orig_mod, ControlNetUnionModel)
762-
):
763-
if not isinstance(controlnet_conditioning_scale, float):
764-
raise TypeError("For single controlnet: `controlnet_conditioning_scale` must be type `float`.")
765-
766-
else:
767-
assert False
768-
769749
if not isinstance(control_guidance_start, (tuple, list)):
770750
control_guidance_start = [control_guidance_start]
771751

0 commit comments

Comments
 (0)