Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
renzhc
diffusers_dcu
Commits
18f7d1d9
Unverified
Commit
18f7d1d9
authored
Jan 27, 2025
by
hlky
Committed by
GitHub
Jan 27, 2025
Browse files
ControlNet Union controlnet_conditioning_scale for multiple control inputs (#10666)
parent
f7f36c7d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
60 deletions
+0
-60
src/diffusers/pipelines/controlnet/pipeline_controlnet_union_inpaint_sd_xl.py
...nes/controlnet/pipeline_controlnet_union_inpaint_sd_xl.py
+0
-20
src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl.py
...s/pipelines/controlnet/pipeline_controlnet_union_sd_xl.py
+0
-20
src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl_img2img.py
...nes/controlnet/pipeline_controlnet_union_sd_xl_img2img.py
+0
-20
No files found.
src/diffusers/pipelines/controlnet/pipeline_controlnet_union_inpaint_sd_xl.py
View file @
18f7d1d9
...
@@ -766,26 +766,6 @@ class StableDiffusionXLControlNetUnionInpaintPipeline(
...
@@ -766,26 +766,6 @@ class StableDiffusionXLControlNetUnionInpaintPipeline(
else
:
else
:
assert
False
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
)):
if
not
isinstance
(
control_guidance_start
,
(
tuple
,
list
)):
control_guidance_start
=
[
control_guidance_start
]
control_guidance_start
=
[
control_guidance_start
]
...
...
src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl.py
View file @
18f7d1d9
...
@@ -741,26 +741,6 @@ class StableDiffusionXLControlNetUnionPipeline(
...
@@ -741,26 +741,6 @@ class StableDiffusionXLControlNetUnionPipeline(
else
:
else
:
assert
False
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
)):
if
not
isinstance
(
control_guidance_start
,
(
tuple
,
list
)):
control_guidance_start
=
[
control_guidance_start
]
control_guidance_start
=
[
control_guidance_start
]
...
...
src/diffusers/pipelines/controlnet/pipeline_controlnet_union_sd_xl_img2img.py
View file @
18f7d1d9
...
@@ -746,26 +746,6 @@ class StableDiffusionXLControlNetUnionImg2ImgPipeline(
...
@@ -746,26 +746,6 @@ class StableDiffusionXLControlNetUnionImg2ImgPipeline(
else
:
else
:
assert
False
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
)):
if
not
isinstance
(
control_guidance_start
,
(
tuple
,
list
)):
control_guidance_start
=
[
control_guidance_start
]
control_guidance_start
=
[
control_guidance_start
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment