mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-06-15 04:19:43 +08:00
Remove old useless no comfy kitchen fallback. (#14245)
* Remove old fallback used when no comfy kitchen. * Remove unused logging import
This commit is contained in:
parent
dc10c0133e
commit
d4c7ebff9c
@ -4,7 +4,7 @@ from torch import Tensor
|
|||||||
|
|
||||||
from comfy.ldm.modules.attention import optimized_attention
|
from comfy.ldm.modules.attention import optimized_attention
|
||||||
import comfy.model_management
|
import comfy.model_management
|
||||||
import logging
|
import comfy.quant_ops
|
||||||
|
|
||||||
|
|
||||||
def attention(q: Tensor, k: Tensor, v: Tensor, pe: Tensor, mask=None, transformer_options={}) -> Tensor:
|
def attention(q: Tensor, k: Tensor, v: Tensor, pe: Tensor, mask=None, transformer_options={}) -> Tensor:
|
||||||
@ -44,21 +44,15 @@ def _apply_rope(xq: Tensor, xk: Tensor, freqs_cis: Tensor):
|
|||||||
return apply_rope1(xq, freqs_cis), apply_rope1(xk, freqs_cis)
|
return apply_rope1(xq, freqs_cis), apply_rope1(xk, freqs_cis)
|
||||||
|
|
||||||
|
|
||||||
try:
|
def apply_rope(xq, xk, freqs_cis):
|
||||||
import comfy.quant_ops
|
|
||||||
q_apply_rope = comfy.quant_ops.ck.apply_rope
|
|
||||||
q_apply_rope1 = comfy.quant_ops.ck.apply_rope1
|
|
||||||
def apply_rope(xq, xk, freqs_cis):
|
|
||||||
if comfy.model_management.in_training:
|
if comfy.model_management.in_training:
|
||||||
return _apply_rope(xq, xk, freqs_cis)
|
return _apply_rope(xq, xk, freqs_cis)
|
||||||
else:
|
else:
|
||||||
return apply_rope1(xq, freqs_cis), apply_rope1(xk, freqs_cis)
|
return comfy.quant_ops.ck.apply_rope(xq, xk, freqs_cis)
|
||||||
def apply_rope1(x, freqs_cis):
|
|
||||||
|
|
||||||
|
def apply_rope1(x, freqs_cis):
|
||||||
if comfy.model_management.in_training:
|
if comfy.model_management.in_training:
|
||||||
return _apply_rope1(x, freqs_cis)
|
return _apply_rope1(x, freqs_cis)
|
||||||
else:
|
else:
|
||||||
return q_apply_rope1(x, freqs_cis)
|
return comfy.quant_ops.ck.apply_rope1(x, freqs_cis)
|
||||||
except:
|
|
||||||
logging.warning("No comfy kitchen, using old apply_rope functions.")
|
|
||||||
apply_rope = _apply_rope
|
|
||||||
apply_rope1 = _apply_rope1
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user