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

Fixed MaxSpeed and default conds implementations

Browse Source
This commit is contained in:
kosinkadink1@gmail.com 2024-09-15 21:00:45 +09:00
parent 5a9aa5817c
commit f5c899f42a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
comfy/model_patcher.py
View File

@ -711,6 +711,7 @@ class ModelPatcher:
def unpatch_hooks(self) -> None: def unpatch_hooks(self) -> None:
if len(self.hook_backup) == 0: if len(self.hook_backup) == 0:
self.current_hooks = None
return return
keys = list(self.hook_backup.keys()) keys = list(self.hook_backup.keys())
if self.weight_inplace_update: if self.weight_inplace_update:
@ -722,9 +723,9 @@ class ModelPatcher:
else: else:
for k in keys: for k in keys:
if self.hook_mode == comfy.hooks.EnumHookMode.MaxSpeed: if self.hook_mode == comfy.hooks.EnumHookMode.MaxSpeed:
comfy.utils.copy_to_param(self.model, k, self.hook_backup[k][0]) comfy.utils.set_attr_param(self.model, k, self.hook_backup[k][0])
else: else:
comfy.utils.copy_to_param(self.model, k, self.hook_backup[k][0].to(device=self.hook_backup[k][1])) comfy.utils.set_attr_param(self.model, k, self.hook_backup[k][0].to(device=self.hook_backup[k][1]))
self.hook_backup.clear() self.hook_backup.clear()
self.current_hooks = None self.current_hooks = None

5
comfy/samplers.py
View File

@ -152,7 +152,10 @@ def finalize_default_conds(hooked_to_run: Dict[comfy.hooks.HookGroup,List[Tuple[
if len(default_conds[i]) == 0: if len(default_conds[i]) == 0:
continue continue
area: list[int] = cond_obj.area area: list[int] = cond_obj.area
default_mults[i][:,:,area[2]:area[0] + area[2],area[3]:area[1] + area[3]] -= cond_obj.mult if area is not None:
default_mults[i][:,:,area[2]:area[0] + area[2],area[3]:area[1] + area[3]] -= cond_obj.mult
else:
default_mults[i] -= cond_obj.mult
# for each default_mult, ReLU to make negatives=0, and then check for any nonzeros # for each default_mult, ReLU to make negatives=0, and then check for any nonzeros
for i, mult in enumerate(default_mults): for i, mult in enumerate(default_mults):
# if no default_cond for cond type, do nothing # if no default_cond for cond type, do nothing