Skip to content

Modular Diffusers Guiders #11311

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.

Sign up for GitHub

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 24 commits into from
Apr 25, 2025
Merged

Modular Diffusers Guiders #11311

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
0c4c1a8
cfg; slg; pag; sdxl without controlnet
a-r-r-o-w Apr 14, 2025
9da8a9d
support sdxl controlnet
a-r-r-o-w Apr 14, 2025
b81bd78
support controlnet union
a-r-r-o-w Apr 14, 2025
31593e2
update
a-r-r-o-w Apr 14, 2025
6255302
update
a-r-r-o-w Apr 14, 2025
2238f55
cfg zero*
a-r-r-o-w Apr 14, 2025
52b9b61
use unwrap_module for torch compiled modules
a-r-r-o-w Apr 14, 2025
d8d2ea3
remove guider kwargs
a-r-r-o-w Apr 14, 2025
b31904b
remove commented code
a-r-r-o-w Apr 14, 2025
57c7e15
remove old guider
a-r-r-o-w Apr 14, 2025
8d31c69
fix slg bug
a-r-r-o-w Apr 15, 2025
1c1d1d5
remove debug print
a-r-r-o-w Apr 15, 2025
ba579f4
autoguidance
a-r-r-o-w Apr 15, 2025
720783e
smoothed energy guidance
a-r-r-o-w Apr 15, 2025
b9bcd46
add note about seg
a-r-r-o-w Apr 15, 2025
2dc673a
tangential cfg
a-r-r-o-w Apr 16, 2025
77d8a28
cfg plus plus
a-r-r-o-w Apr 16, 2025
78fca12
support cfgpp in ddim
a-r-r-o-w Apr 16, 2025
e8768e5
apply review suggestions
a-r-r-o-w Apr 23, 2025
0d5a788
refactor
a-r-r-o-w Apr 24, 2025
5a4d2c7
rename enable/disable
a-r-r-o-w Apr 25, 2025
53ebfa1
remove cfg++ for now
a-r-r-o-w Apr 25, 2025
6bc1dd5
rename do_classifier_free_guidance->prepare_unconditional_embeds
a-r-r-o-w Apr 25, 2025
704aef4
remove unused
a-r-r-o-w Apr 25, 2025
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
29 changes: 29 additions & 0 deletions src/diffusers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

_import_structure = {
"configuration_utils": ["ConfigMixin"],
"guiders": [],
"hooks": [],
"loaders": ["FromOriginalModelMixin"],
"models": [],
Expand Down Expand Up @@ -129,12 +130,27 @@
_import_structure["utils.dummy_pt_objects"] = [name for name in dir(dummy_pt_objects) if not name.startswith("_")]

else:
_import_structure["guiders"].extend(
[
"AdaptiveProjectedGuidance",
"AutoGuidance",
"CFGPlusPlusGuidance",
"ClassifierFreeGuidance",
"ClassifierFreeZeroStarGuidance",
"SkipLayerGuidance",
"SmoothedEnergyGuidance",
"TangentialClassifierFreeGuidance",
]
)
_import_structure["hooks"].extend(
[
"FasterCacheConfig",
"HookRegistry",
"PyramidAttentionBroadcastConfig",
"LayerSkipConfig",
"SmoothedEnergyGuidanceConfig",
"apply_faster_cache",
"apply_layer_skip",
"apply_pyramid_attention_broadcast",
]
)
Expand Down Expand Up @@ -711,10 +727,23 @@
except OptionalDependencyNotAvailable:
from .utils.dummy_pt_objects import * # noqa F403
else:
from .guiders import (
AdaptiveProjectedGuidance,
AutoGuidance,
CFGPlusPlusGuidance,
ClassifierFreeGuidance,
ClassifierFreeZeroStarGuidance,
SkipLayerGuidance,
SmoothedEnergyGuidance,
TangentialClassifierFreeGuidance,
)
from .hooks import (
FasterCacheConfig,
HookRegistry,
LayerSkipConfig,
PyramidAttentionBroadcastConfig,
SmoothedEnergyGuidanceConfig,
apply_layer_skip,
apply_faster_cache,
apply_pyramid_attention_broadcast,
)
Expand Down
Loading