Skip to content

Support pass kwargs to sd3 custom attention processor #9818

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 7 commits into from
Dec 18, 2024
Merged

Support pass kwargs to sd3 custom attention processor #9818

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e3bed52
Support pass kwargs to sd3 custom attention processor
Matrix53 Nov 1, 2024
c9531bb
Merge branch 'main' into support-pass-kwargs-to-sd3-custom-attn-proce…
Matrix53 Dec 9, 2024
9521b74
fix: set joint_attention_kwargs default as empty dict
Matrix53 Dec 9, 2024
7208eff
set default joint_attention_kwargs in transformer_sd3
hlky Dec 9, 2024
6192551
joint_attention_kwargs or {} attention.py
hlky Dec 9, 2024
c771d7e
joint_attention_kwargs or {} transformer_sd3.py
hlky Dec 9, 2024
7ede8f2
Update src/diffusers/models/transformers/transformer_sd3.py
hlky Dec 11, 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
12 changes: 9 additions & 3 deletions src/diffusers/models/attention.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,11 @@ def set_chunk_feed_forward(self, chunk_size: Optional[int], dim: int = 0):
self._chunk_dim = dim

def forward(
self, hidden_states: torch.FloatTensor, encoder_hidden_states: torch.FloatTensor, temb: torch.FloatTensor
self,
hidden_states: torch.FloatTensor,
encoder_hidden_states: torch.FloatTensor,
temb: torch.FloatTensor,
joint_attention_kwargs: Dict[str, Any] = None,
):
if self.use_dual_attention:
norm_hidden_states, gate_msa, shift_mlp, scale_mlp, gate_mlp, norm_hidden_states2, gate_msa2 = self.norm1(
Expand All @@ -206,15 +210,17 @@ def forward(

# Attention.
attn_output, context_attn_output = self.attn(
hidden_states=norm_hidden_states, encoder_hidden_states=norm_encoder_hidden_states
hidden_states=norm_hidden_states,
encoder_hidden_states=norm_encoder_hidden_states,
**joint_attention_kwargs,
)

# Process attention outputs for the `hidden_states`.
attn_output = gate_msa.unsqueeze(1) * attn_output
hidden_states = hidden_states + attn_output

if self.use_dual_attention:
attn_output2 = self.attn2(hidden_states=norm_hidden_states2)
attn_output2 = self.attn2(hidden_states=norm_hidden_states2, **joint_attention_kwargs)
attn_output2 = gate_msa2.unsqueeze(1) * attn_output2
hidden_states = hidden_states + attn_output2

Expand Down
6 changes: 5 additions & 1 deletion src/diffusers/models/transformers/transformer_sd3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,11 +411,15 @@ def custom_forward(*inputs):
hidden_states,
encoder_hidden_states,
temb,
joint_attention_kwargs,
**ckpt_kwargs,
)
elif not is_skip:
encoder_hidden_states, hidden_states = block(
hidden_states=hidden_states, encoder_hidden_states=encoder_hidden_states, temb=temb
hidden_states=hidden_states,
encoder_hidden_states=encoder_hidden_states,
temb=temb,
joint_attention_kwargs=joint_attention_kwargs,
)

# controlnet residual
Expand Down
Loading