Skip to content

Commit

Permalink
ControlNet Union controlnet_conditioning_scale for multiple control i…
Browse files Browse the repository at this point in the history
…nputs (#10666)
  • Loading branch information
hlky authored Jan 27, 2025
1 parent f7f36c7 commit 18f7d1d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 60 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -766,26 +766,6 @@ def check_inputs(
else:
assert False

# Check `controlnet_conditioning_scale`
if (
isinstance(self.controlnet, ControlNetModel)
or is_compiled
and isinstance(self.controlnet._orig_mod, ControlNetModel)
):
if not isinstance(controlnet_conditioning_scale, float):
raise TypeError("For single controlnet: `controlnet_conditioning_scale` must be type `float`.")

elif (
isinstance(self.controlnet, ControlNetUnionModel)
or is_compiled
and isinstance(self.controlnet._orig_mod, ControlNetUnionModel)
):
if not isinstance(controlnet_conditioning_scale, float):
raise TypeError("For single controlnet: `controlnet_conditioning_scale` must be type `float`.")

else:
assert False

if not isinstance(control_guidance_start, (tuple, list)):
control_guidance_start = [control_guidance_start]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -741,26 +741,6 @@ def check_inputs(
else:
assert False

# Check `controlnet_conditioning_scale`
if (
isinstance(self.controlnet, ControlNetModel)
or is_compiled
and isinstance(self.controlnet._orig_mod, ControlNetModel)
):
if not isinstance(controlnet_conditioning_scale, float):
raise TypeError("For single controlnet: `controlnet_conditioning_scale` must be type `float`.")

elif (
isinstance(self.controlnet, ControlNetUnionModel)
or is_compiled
and isinstance(self.controlnet._orig_mod, ControlNetUnionModel)
):
if not isinstance(controlnet_conditioning_scale, float):
raise TypeError("For single controlnet: `controlnet_conditioning_scale` must be type `float`.")

else:
assert False

if not isinstance(control_guidance_start, (tuple, list)):
control_guidance_start = [control_guidance_start]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -746,26 +746,6 @@ def check_inputs(
else:
assert False

# Check `controlnet_conditioning_scale`
if (
isinstance(self.controlnet, ControlNetModel)
or is_compiled
and isinstance(self.controlnet._orig_mod, ControlNetModel)
):
if not isinstance(controlnet_conditioning_scale, float):
raise TypeError("For single controlnet: `controlnet_conditioning_scale` must be type `float`.")

elif (
isinstance(self.controlnet, ControlNetUnionModel)
or is_compiled
and isinstance(self.controlnet._orig_mod, ControlNetUnionModel)
):
if not isinstance(controlnet_conditioning_scale, float):
raise TypeError("For single controlnet: `controlnet_conditioning_scale` must be type `float`.")

else:
assert False

if not isinstance(control_guidance_start, (tuple, list)):
control_guidance_start = [control_guidance_start]

Expand Down

0 comments on commit 18f7d1d

Please sign in to comment.