The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Use rope functions from comfy kitchen. (#11674)
comfyanonymousc3c3e93c5bb3
diff --git a/comfy/ldm/flux/math.py b/comfy/ldm/flux/math.pyindex 6a22df8bc..f9597de5b 100644--- a/comfy/ldm/flux/math.py+++ b/comfy/ldm/flux/math.py@@ -4,6 +4,7 @@ from torch import Tensorfrom comfy.ldm.modules.attention import optimized_attentionimport comfy.model_management+import loggingdef attention(q: Tensor, k: Tensor, v: Tensor, pe: Tensor, mask=None, transformer_options={}) -> Tensor:@@ -13,7 +14,6 @@ def attention(q: Tensor, k: Tensor, v: Tensor, pe: Tensor, mask=None, transformex = optimized_attention(q, k, v, heads, skip_reshape=True, mask=mask, transformer_options=transformer_options)return x-def rope(pos: Tensor, dim: int, theta: int) -> Tensor:assert dim % 2 == 0if comfy.model_management.is_device_mps(pos.device) or comfy.model_management.is_intel_xpu() or comfy.model_management.is_directml_enabled():@@ -28,13 +28,20 @@ def rope(pos: Tensor, dim: int, theta: int) -> Tensor:out = rearrange(out, "b n d (i j) -> b n d i j", i=2, j=2)return out.to(dtype=torch.float32, device=pos.device)-def apply_rope1(x: Tensor, freqs_cis: Tensor):- x_ = x.to(dtype=freqs_cis.dtype).reshape(*x.shape[:-1], -1, 1, 2)- x_out = freqs_cis[..., 0] * x_[..., 0]- x_out.addcmul_(freqs_cis[..., 1], x_[..., 1])+try:+ import comfy.quant_ops+ apply_rope = comfy.quant_ops.ck.apply_rope+ apply_rope1 = comfy.quant_ops.ck.apply_rope1+except:+ logging.warning("No comfy kitchen, using old apply_rope functions.")+ def apply_rope1(x: Tensor, freqs_cis: Tensor):+ x_ = x.to(dtype=freqs_cis.dtype).reshape(*x.shape[:-1], -1, 1, 2)++ x_out = freqs_cis[..., 0] * x_[..., 0]+ x_out.addcmul_(freqs_cis[..., 1], x_[..., 1])- return x_out.reshape(*x.shape).type_as(x)+ return x_out.reshape(*x.shape).type_as(x)-def apply_rope(xq: Tensor, xk: Tensor, freqs_cis: Tensor):- return apply_rope1(xq, freqs_cis), apply_rope1(xk, freqs_cis)+ def apply_rope(xq: Tensor, xk: Tensor, freqs_cis: Tensor):+ return apply_rope1(xq, freqs_cis), apply_rope1(xk, freqs_cis)diff --git a/requirements.txt b/requirements.txtindex 22cb50e2d..7798cb179 100644--- a/requirements.txt+++ b/requirements.txt@@ -21,7 +21,7 @@ psutilalembicSQLAlchemyav>=14.2.0-comfy-kitchen>=0.2.1+comfy-kitchen>=0.2.2#non essential dependencies:kornia>=0.7.1