Skip to content

[refactor] create modeling blocks specific to AnimateDiff #8979

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
DN6 merged 19 commits into from
Aug 3, 2024
Merged

[refactor] create modeling blocks specific to AnimateDiff #8979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ba504ad
animatediff specific transformer model
a-r-r-o-w Jul 25, 2024
d214117
make style
a-r-r-o-w Jul 25, 2024
11746dc
make fix-copies
a-r-r-o-w Jul 25, 2024
2091967
move blocks to unet motion model
a-r-r-o-w Jul 26, 2024
fd83a54
make style
a-r-r-o-w Jul 26, 2024
e93f3e6
Merge branch 'main' into animatediff/refactor-modeling
a-r-r-o-w Jul 26, 2024
60e21a0
remove dummy object
a-r-r-o-w Jul 26, 2024
a175bdb
fix incorrectly passed param causing test failures
a-r-r-o-w Jul 26, 2024
2689f3b
Merge branch 'main' into animatediff/refactor-modeling
a-r-r-o-w Jul 28, 2024
097e9c1
rename model and output class
a-r-r-o-w Jul 29, 2024
b4ff62d
fix sparsectrl imports
a-r-r-o-w Jul 29, 2024
606afa6
remove todo comments
a-r-r-o-w Jul 29, 2024
b37d466
remove temporal double self attn param from controlnet sparsectrl
a-r-r-o-w Jul 29, 2024
5bf1eda
resolve merge conflicts
a-r-r-o-w Jul 30, 2024
f048c0a
Merge branch 'main' into animatediff/refactor-modeling
a-r-r-o-w Aug 2, 2024
087a340
add deprecated versions of blocks
a-r-r-o-w Aug 2, 2024
60ba713
apply suggestions from review
a-r-r-o-w Aug 2, 2024
0da4446
update
DN6 Aug 3, 2024
954c663
Merge branch 'main' into animatediff/refactor-modeling
DN6 Aug 3, 2024
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
7 changes: 1 addition & 6 deletions src/diffusers/models/controlnet_sparsectrl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@
from .modeling_utils import ModelMixin
from .unets.unet_2d_blocks import UNetMidBlock2DCrossAttn
from .unets.unet_2d_condition import UNet2DConditionModel
from .unets.unet_3d_blocks import (
CrossAttnDownBlockMotion,
DownBlockMotion,
)
from .unets.unet_motion_model import CrossAttnDownBlockMotion, DownBlockMotion


logger = logging.get_logger(__name__) # pylint: disable=invalid-name
Expand Down Expand Up @@ -317,7 +314,6 @@ def __init__(
temporal_num_attention_heads=motion_num_attention_heads[i],
temporal_max_seq_length=motion_max_seq_length,
temporal_transformer_layers_per_block=temporal_transformer_layers_per_block[i],
temporal_double_self_attention=False,
)
elif down_block_type == "DownBlockMotion":
down_block = DownBlockMotion(
Expand All @@ -334,7 +330,6 @@ def __init__(
add_downsample=not is_final_block,
temporal_num_attention_heads=motion_num_attention_heads[i],
temporal_max_seq_length=motion_max_seq_length,
temporal_double_self_attention=False,
temporal_transformer_layers_per_block=temporal_transformer_layers_per_block[i],
)
else:
Expand Down
Loading