xinyun/ComfyUI
1
0
Fork 0
mirror of https://git.datalinker.icu/comfyanonymous/ComfyUI synced 2026-10-22 00:27:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make encode_from_tokens_scheduled call cleaner, rollback change in model_patcher.py for hook_patches_backup dict

Browse Source
This commit is contained in:
Jedrzej Kosinski 2024-11-01 02:01:45 -05:00
parent 489846905e
commit 16735c98e0
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
comfy/model_patcher.py
View File

@ -971,7 +971,8 @@ class ModelPatcher:
if hook.hook_ref not in self.hook_patches: if hook.hook_ref not in self.hook_patches:
weight_hooks_to_register.append(hook) weight_hooks_to_register.append(hook)
if len(weight_hooks_to_register) > 0: if len(weight_hooks_to_register) > 0:
self.hook_patches_backup = create_hook_patches_clone(self.hook_patches_backup) # clone hook_patches to become backup so that any non-dynamic hooks will return to their original state
self.hook_patches_backup = create_hook_patches_clone(self.hook_patches)
for hook in weight_hooks_to_register: for hook in weight_hooks_to_register:
hook.add_hook_patches(self, target, registered_hooks) hook.add_hook_patches(self, target, registered_hooks)
for callback in self.get_all_callbacks(CallbacksMP.ON_REGISTER_ALL_HOOK_PATCHES): for callback in self.get_all_callbacks(CallbacksMP.ON_REGISTER_ALL_HOOK_PATCHES):

11
nodes.py
View File

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