Skip to content

Add support for Multi-ControlNet to StableDiffusionControlNetPipeline #2627

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.

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 25 commits into from
Mar 13, 2023
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
52b7c69
support for List[ControlNetModel] on init()
takuma104 Mar 8, 2023
95e4a12
Add to support for multiple ControlNetCondition
takuma104 Mar 8, 2023
3c2fd98
rename conditioning_scale to scale
takuma104 Mar 8, 2023
aae2fc1
scaling bugfix
takuma104 Mar 8, 2023
b14b304
Manually merge `MultiControlNet` #2621
takuma104 Mar 9, 2023
6b38c3a
Merge branch 'huggingface:main' into multi-controlnet-ext
takuma104 Mar 9, 2023
dd96189
Update src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffu…
takuma104 Mar 10, 2023
6eb98e0
Update src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffu…
takuma104 Mar 10, 2023
9ca4aaa
Update src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffu…
takuma104 Mar 10, 2023
32c8873
Update src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffu…
takuma104 Mar 10, 2023
987567d
Update src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffu…
takuma104 Mar 10, 2023
91affab
Update src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffu…
takuma104 Mar 10, 2023
d1acef4
cleanups
takuma104 Mar 10, 2023
9f04578
make style error correct
takuma104 Mar 10, 2023
fb39868
remove ControlNetCondition to reduce code diff
takuma104 Mar 10, 2023
9ff7978
refactoring image/cond_scale
takuma104 Mar 10, 2023
dca3b5e
add explain for `images`
takuma104 Mar 10, 2023
22c8661
Merge branch 'huggingface:main' into multi-controlnet-ext
takuma104 Mar 11, 2023
52171e3
Add docstrings
takuma104 Mar 12, 2023
fa2010e
all fast-test passed
takuma104 Mar 12, 2023
4297328
Add a slow test
takuma104 Mar 12, 2023
2528494
nit
takuma104 Mar 12, 2023
a2140aa
Apply suggestions from code review
patrickvonplaten Mar 13, 2023
039db1b
small precision fix
patrickvonplaten Mar 13, 2023
a257ed5
nits
williamberman Mar 13, 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
1 change: 1 addition & 0 deletions src/diffusers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
from .pipelines import (
AltDiffusionImg2ImgPipeline,
AltDiffusionPipeline,
ControlNetCondition,
CycleDiffusionPipeline,
LDMTextToImagePipeline,
PaintByExamplePipeline,
Expand Down
1 change: 1 addition & 0 deletions src/diffusers/pipelines/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
from .paint_by_example import PaintByExamplePipeline
from .semantic_stable_diffusion import SemanticStableDiffusionPipeline
from .stable_diffusion import (
ControlNetCondition,
CycleDiffusionPipeline,
StableDiffusionAttendAndExcitePipeline,
StableDiffusionControlNetPipeline,
Expand Down
2 changes: 1 addition & 1 deletion src/diffusers/pipelines/stable_diffusion/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class StableDiffusionPipelineOutput(BaseOutput):
from .pipeline_cycle_diffusion import CycleDiffusionPipeline
from .pipeline_stable_diffusion import StableDiffusionPipeline
from .pipeline_stable_diffusion_attend_and_excite import StableDiffusionAttendAndExcitePipeline
from .pipeline_stable_diffusion_controlnet import StableDiffusionControlNetPipeline
from .pipeline_stable_diffusion_controlnet import ControlNetCondition, StableDiffusionControlNetPipeline
from .pipeline_stable_diffusion_img2img import StableDiffusionImg2ImgPipeline
from .pipeline_stable_diffusion_inpaint import StableDiffusionInpaintPipeline
from .pipeline_stable_diffusion_inpaint_legacy import StableDiffusionInpaintPipelineLegacy
Expand Down
Loading