The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Lower memory usage and .comfy_attention support for lumina family models. (#16515)
comfyanonymous1568e6cfd045
diff --git a/comfy/ldm/lumina/model.py b/comfy/ldm/lumina/model.pyindex bc9528875..46ce86f5f 100644--- a/comfy/ldm/lumina/model.py+++ b/comfy/ldm/lumina/model.py@@ -11,7 +11,7 @@ import comfy.opsimport comfy.quant_opsfrom comfy.ldm.modules.diffusionmodules.mmdit import TimestepEmbedder-from comfy.ldm.modules.attention import optimized_attention_masked+from comfy.ldm.modules.attention import AttentionTensorContainer, ComfyAttention, optimized_attention_maskedfrom comfy.ldm.flux.layers import EmbedNDfrom comfy.ldm.flux.math import apply_ropeimport comfy.patcher_extension@@ -95,6 +95,7 @@ class JointAttention(nn.Module):"""super().__init__()+ self.comfy_attention = ComfyAttention()self.n_kv_heads = n_heads if n_kv_heads is None else n_kv_headsself.n_local_heads = n_headsself.n_local_kv_heads = self.n_kv_heads@@ -175,7 +176,10 @@ class JointAttention(nn.Module):if n_rep >= 1:xk = xk.unsqueeze(3).repeat(1, 1, 1, n_rep, 1).flatten(2, 3)xv = xv.unsqueeze(3).repeat(1, 1, 1, n_rep, 1).flatten(2, 3)- output = optimized_attention_masked(xq.movedim(1, 2), xk.movedim(1, 2), xv.movedim(1, 2), self.n_local_heads, x_mask, skip_reshape=True, transformer_options=transformer_options)+ xq = AttentionTensorContainer(xq.movedim(1, 2))+ xk = AttentionTensorContainer(xk.movedim(1, 2))+ xv = AttentionTensorContainer(xv.movedim(1, 2))+ output = optimized_attention_masked(xq, xk, xv, self.n_local_heads, x_mask, skip_reshape=True, transformer_options=transformer_options, preferred_attention=self.comfy_attention)return self.out(output)