Skip to content

Commit f4169eb

Browse files
authored
Merge branch 'main' into deprecate-jax
2 parents 85378eb + 673d435 commit f4169eb

File tree

16 files changed

+1510
-509
lines changed

16 files changed

+1510
-509
lines changed

docs/source/en/_toctree.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
- local: tutorials/autopipeline
1818
title: AutoPipeline
1919
- local: using-diffusers/custom_pipeline_overview
20-
title: Load community pipelines and components
20+
title: Community pipelines and components
2121
- local: using-diffusers/callback
2222
title: Pipeline callbacks
2323
- local: using-diffusers/reusing_seeds

docs/source/en/api/pipelines/overview.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,17 @@ The table below lists all the pipelines currently available in 🤗 Diffusers an
113113
## PushToHubMixin
114114

115115
[[autodoc]] utils.PushToHubMixin
116+
117+
## Callbacks
118+
119+
[[autodoc]] callbacks.PipelineCallback
120+
121+
[[autodoc]] callbacks.SDCFGCutoffCallback
122+
123+
[[autodoc]] callbacks.SDXLCFGCutoffCallback
124+
125+
[[autodoc]] callbacks.SDXLControlnetCFGCutoffCallback
126+
127+
[[autodoc]] callbacks.IPAdapterScaleCutoffCallback
128+
129+
[[autodoc]] callbacks.SD3CFGCutoffCallback

docs/source/en/api/pipelines/qwenimage.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,10 @@ The `guidance_scale` parameter in the pipeline is there to support future guidan
120120
- all
121121
- __call__
122122

123+
## QwenImaggeControlNetPipeline
124+
- all
125+
- __call__
126+
123127
## QwenImagePipelineOutput
124128

125129
[[autodoc]] pipelines.qwenimage.pipeline_output.QwenImagePipelineOutput

docs/source/en/using-diffusers/callback.md

Lines changed: 30 additions & 213 deletions
Large diffs are not rendered by default.

docs/source/en/using-diffusers/custom_pipeline_overview.md

Lines changed: 79 additions & 292 deletions
Large diffs are not rendered by default.

src/diffusers/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,8 @@
218218
"OmniGenTransformer2DModel",
219219
"PixArtTransformer2DModel",
220220
"PriorTransformer",
221+
"QwenImageControlNetModel",
222+
"QwenImageMultiControlNetModel",
221223
"QwenImageTransformer2DModel",
222224
"SanaControlNetModel",
223225
"SanaTransformer2DModel",
@@ -491,6 +493,7 @@
491493
"PixArtAlphaPipeline",
492494
"PixArtSigmaPAGPipeline",
493495
"PixArtSigmaPipeline",
496+
"QwenImageControlNetPipeline",
494497
"QwenImageEditPipeline",
495498
"QwenImageImg2ImgPipeline",
496499
"QwenImageInpaintPipeline",
@@ -885,6 +888,8 @@
885888
OmniGenTransformer2DModel,
886889
PixArtTransformer2DModel,
887890
PriorTransformer,
891+
QwenImageControlNetModel,
892+
QwenImageMultiControlNetModel,
888893
QwenImageTransformer2DModel,
889894
SanaControlNetModel,
890895
SanaTransformer2DModel,
@@ -1128,6 +1133,7 @@
11281133
PixArtAlphaPipeline,
11291134
PixArtSigmaPAGPipeline,
11301135
PixArtSigmaPipeline,
1136+
QwenImageControlNetPipeline,
11311137
QwenImageEditPipeline,
11321138
QwenImageImg2ImgPipeline,
11331139
QwenImageInpaintPipeline,

src/diffusers/models/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@
5252
"HunyuanDiT2DControlNetModel",
5353
"HunyuanDiT2DMultiControlNetModel",
5454
]
55+
_import_structure["controlnets.controlnet_qwenimage"] = [
56+
"QwenImageControlNetModel",
57+
"QwenImageMultiControlNetModel",
58+
]
5559
_import_structure["controlnets.controlnet_sana"] = ["SanaControlNetModel"]
5660
_import_structure["controlnets.controlnet_sd3"] = ["SD3ControlNetModel", "SD3MultiControlNetModel"]
5761
_import_structure["controlnets.controlnet_sparsectrl"] = ["SparseControlNetModel"]
@@ -148,6 +152,8 @@
148152
HunyuanDiT2DMultiControlNetModel,
149153
MultiControlNetModel,
150154
MultiControlNetUnionModel,
155+
QwenImageControlNetModel,
156+
QwenImageMultiControlNetModel,
151157
SanaControlNetModel,
152158
SD3ControlNetModel,
153159
SD3MultiControlNetModel,

src/diffusers/models/controlnets/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
HunyuanDiT2DControlNetModel,
1010
HunyuanDiT2DMultiControlNetModel,
1111
)
12+
from .controlnet_qwenimage import QwenImageControlNetModel, QwenImageMultiControlNetModel
1213
from .controlnet_sana import SanaControlNetModel
1314
from .controlnet_sd3 import SD3ControlNetModel, SD3ControlNetOutput, SD3MultiControlNetModel
1415
from .controlnet_sparsectrl import (

0 commit comments

Comments
 (0)