298977887/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-07-22 07:27:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up text encode nodes with just a single clip.encode_from_tokens_scheduled call

Browse Source
This commit is contained in:
Jedrzej Kosinski 2024-11-27 21:35:41 -06:00
parent 3911241f5d
commit a54e734ea7
5 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
comfy_extras/nodes_clip_sdxl.py
View File

@ -17,10 +17,7 @@ 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}), )
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)
return ([[cond, clip.add_hooks_to_dict({"pooled_output": pooled, "aesthetic_score": ascore, "width": width,"height": height})]], )
class CLIPTextEncodeSDXL: class CLIPTextEncodeSDXL:
@classmethod @classmethod
@ -49,10 +46,7 @@ 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}), )
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)
return ([[cond, clip.add_hooks_to_dict({"pooled_output": pooled, "width": width, "height": height, "crop_w": crop_w, "crop_h": crop_h, "target_width": target_width, "target_height": target_height})]], )
NODE_CLASS_MAPPINGS = { NODE_CLASS_MAPPINGS = {
"CLIPTextEncodeSDXLRefiner": CLIPTextEncodeSDXLRefiner, "CLIPTextEncodeSDXLRefiner": CLIPTextEncodeSDXLRefiner,

7
comfy_extras/nodes_flux.py
View File

@ -18,12 +18,7 @@ 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}), )
return (clip.encode_from_tokens_scheduled(tokens, add_dict={"guidance": guidance}), )
output = clip.encode_from_tokens(tokens, return_pooled=True, return_dict=True)
cond = output.pop("cond")
output["guidance"] = guidance
return ([[cond, output]], )
class FluxGuidance: class FluxGuidance:
@classmethod @classmethod

6
comfy_extras/nodes_hunyuan.py
View File

@ -15,11 +15,7 @@ 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), )
return (clip.encode_from_tokens_scheduled(tokens), )
output = clip.encode_from_tokens(tokens, return_pooled=True, return_dict=True)
cond = output.pop("cond")
return ([[cond, output]], )
NODE_CLASS_MAPPINGS = { NODE_CLASS_MAPPINGS = {

5
comfy_extras/nodes_sd3.py
View File

@ -82,10 +82,7 @@ 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), )
return (clip.encode_from_tokens_scheduled(tokens), )
cond, pooled = clip.encode_from_tokens(tokens, return_pooled=True)
return ([[cond, clip.add_hooks_to_dict({"pooled_output": pooled})]], )
class ControlNetApplySD3(nodes.ControlNetApplyAdvanced): class ControlNetApplySD3(nodes.ControlNetApplyAdvanced):

6
nodes.py
View File

@ -62,11 +62,7 @@ class CLIPTextEncode:
def encode(self, clip, text): def encode(self, clip, text):
tokens = clip.tokenize(text) tokens = clip.tokenize(text)
if clip.use_clip_schedule: return (clip.encode_from_tokens_scheduled(tokens), )
return (clip.encode_from_tokens_scheduled(tokens), )
output = clip.encode_from_tokens(tokens, return_pooled=True, return_dict=True)
cond = output.pop("cond")
return ([[cond, output]], )
class ConditioningCombine: class ConditioningCombine: