xinyun/ComfyUI
1
0
Fork 0
mirror of https://git.datalinker.icu/comfyanonymous/ComfyUI synced 2026-09-13 12:07:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added clip scheduling support to all other native ComfyUI text encoding nodes (sdxl, flux, hunyuan, sd3)

Browse Source
This commit is contained in:
Jedrzej Kosinski 2024-11-12 10:55:19 -06:00
parent 5909b06b2e
commit 1470719db6
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
comfy_extras/nodes_clip_sdxl.py
View File

@ -17,6 +17,8 @@ class CLIPTextEncodeSDXLRefiner:
def encode(self, clip, ascore, width, height, text): def encode(self, clip, ascore, width, height, text):
tokens = clip.tokenize(text) tokens = clip.tokenize(text)
if clip.use_clip_schedule:
return (clip.encode_from_tokens_scheduled(tokens, add_dict={"aesthetic_score": ascore, "width": width, "height": height}), )
cond, pooled = clip.encode_from_tokens(tokens, return_pooled=True) cond, pooled = clip.encode_from_tokens(tokens, return_pooled=True)
return ([[cond, {"pooled_output": pooled, "aesthetic_score": ascore, "width": width,"height": height}]], ) return ([[cond, {"pooled_output": pooled, "aesthetic_score": ascore, "width": width,"height": height}]], )
@ -47,6 +49,8 @@ class CLIPTextEncodeSDXL:
tokens["l"] += empty["l"] tokens["l"] += empty["l"]
while len(tokens["l"]) > len(tokens["g"]): while len(tokens["l"]) > len(tokens["g"]):
tokens["g"] += empty["g"] tokens["g"] += empty["g"]
if clip.use_clip_schedule:
return (clip.encode_from_tokens_scheduled(tokens, add_dict={"width": width, "height": height, "crop_w": crop_w, "crop_h": crop_h, "target_width": target_width, "target_height": target_height}), )
cond, pooled = clip.encode_from_tokens(tokens, return_pooled=True) cond, pooled = clip.encode_from_tokens(tokens, return_pooled=True)
return ([[cond, {"pooled_output": pooled, "width": width, "height": height, "crop_w": crop_w, "crop_h": crop_h, "target_width": target_width, "target_height": target_height}]], ) return ([[cond, {"pooled_output": pooled, "width": width, "height": height, "crop_w": crop_w, "crop_h": crop_h, "target_width": target_width, "target_height": target_height}]], )

2
comfy_extras/nodes_flux.py
View File

@ -18,6 +18,8 @@ class CLIPTextEncodeFlux:
tokens = clip.tokenize(clip_l) tokens = clip.tokenize(clip_l)
tokens["t5xxl"] = clip.tokenize(t5xxl)["t5xxl"] tokens["t5xxl"] = clip.tokenize(t5xxl)["t5xxl"]
if clip.use_clip_schedule:
return (clip.encode_from_tokens_scheduled(tokens, add_dict={"guidance": guidance}), )
output = clip.encode_from_tokens(tokens, return_pooled=True, return_dict=True) output = clip.encode_from_tokens(tokens, return_pooled=True, return_dict=True)
cond = output.pop("cond") cond = output.pop("cond")
output["guidance"] = guidance output["guidance"] = guidance

2
comfy_extras/nodes_hunyuan.py
View File

@ -15,6 +15,8 @@ class CLIPTextEncodeHunyuanDiT:
tokens = clip.tokenize(bert) tokens = clip.tokenize(bert)
tokens["mt5xl"] = clip.tokenize(mt5xl)["mt5xl"] tokens["mt5xl"] = clip.tokenize(mt5xl)["mt5xl"]
if clip.use_clip_schedule:
return (clip.encode_from_tokens_scheduled(tokens), )
output = clip.encode_from_tokens(tokens, return_pooled=True, return_dict=True) output = clip.encode_from_tokens(tokens, return_pooled=True, return_dict=True)
cond = output.pop("cond") cond = output.pop("cond")
return ([[cond, output]], ) return ([[cond, output]], )

2
comfy_extras/nodes_sd3.py
View File

@ -78,6 +78,8 @@ class CLIPTextEncodeSD3:
tokens["l"] += empty["l"] tokens["l"] += empty["l"]
while len(tokens["l"]) > len(tokens["g"]): while len(tokens["l"]) > len(tokens["g"]):
tokens["g"] += empty["g"] tokens["g"] += empty["g"]
if clip.use_clip_schedule:
return (clip.encode_from_tokens_scheduled(tokens), )
cond, pooled = clip.encode_from_tokens(tokens, return_pooled=True) cond, pooled = clip.encode_from_tokens(tokens, return_pooled=True)
return ([[cond, {"pooled_output": pooled}]], ) return ([[cond, {"pooled_output": pooled}]], )