Merge remote-tracking branch 'origin/master' into multigpu_support

2025-01-28 06:11:07 -06:00
parent eda866bf51 255edf2246
commit 0b3233b4e2
22 changed files with 412 additions and 163 deletions
--- a/comfy/sampler_helpers.py
+++ b/comfy/sampler_helpers.py
@@ -60,7 +60,6 @@ def convert_cond(cond):
        temp = c[1].copy()
        model_conds = temp.get("model_conds", {})
        if c[0] is not None:
-            model_conds["c_crossattn"] = comfy.conds.CONDCrossAttn(c[0]) #TODO: remove
            temp["cross_attn"] = c[0]
        temp["model_conds"] = model_conds
        temp["uuid"] = uuid.uuid4()