The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Don't expand mask when not necessary.
comfyanonymous19ee5d9d8bc3
diff --git a/comfy/ldm/modules/attention.py b/comfy/ldm/modules/attention.pyindex 54b42a4b9..e60d1ab25 100644--- a/comfy/ldm/modules/attention.py+++ b/comfy/ldm/modules/attention.py@@ -423,8 +423,6 @@ def attention_pytorch(q, k, v, heads, mask=None, attn_precision=None, skip_resha# add a heads dimension if there isn't already oneif mask.ndim == 3:mask = mask.unsqueeze(1)- mask = mask.expand(b, heads, -1, -1)-if SDP_BATCH_LIMIT >= b:out = torch.nn.functional.scaled_dot_product_attention(q, k, v, attn_mask=mask, dropout_p=0.0, is_causal=False)@@ -434,11 +432,16 @@ def attention_pytorch(q, k, v, heads, mask=None, attn_precision=None, skip_reshaelse:out = torch.empty((b, q.shape[2], heads * dim_head), dtype=q.dtype, layout=q.layout, device=q.device)for i in range(0, b, SDP_BATCH_LIMIT):+ m = mask+ if mask is not None:+ if mask.shape[0] > 1:+ m = mask[i : i + SDP_BATCH_LIMIT]+out[i : i + SDP_BATCH_LIMIT] = torch.nn.functional.scaled_dot_product_attention(q[i : i + SDP_BATCH_LIMIT],k[i : i + SDP_BATCH_LIMIT],v[i : i + SDP_BATCH_LIMIT],- attn_mask=None if mask is None else mask[i : i + SDP_BATCH_LIMIT],+ attn_mask=m,dropout_p=0.0, is_causal=False).transpose(1, 2).reshape(-1, q.shape[2], heads * dim_head)return out