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

Add OUTER_SAMPLE wrapper

Browse Source
This commit is contained in:
KimbingNg 2025-09-16 16:19:47 +08:00
parent 84f1acd103
commit 9492b98b41
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
comfy_extras/nodes_hunyuan.py
View File

@ -1,9 +1,9 @@
from numpy import arccos
import nodes import nodes
import node_helpers import node_helpers
import torch import torch
import re import re
import comfy.model_management import comfy.model_management
import comfy.patcher_extension
class CLIPTextEncodeHunyuanDiT: class CLIPTextEncodeHunyuanDiT:
@ -137,10 +137,6 @@ class HunyuanMixModeAPG:
CATEGORY = "sampling/custom_sampling/hunyuan" CATEGORY = "sampling/custom_sampling/hunyuan"
@classmethod
def IS_CHANGED(cls, model):
return True
def apply_mix_mode_apg(self, model, has_quoted_text, guidance_scale, general_eta, general_norm_threshold, general_momentum, general_start_step, def apply_mix_mode_apg(self, model, has_quoted_text, guidance_scale, general_eta, general_norm_threshold, general_momentum, general_start_step,
ocr_eta, ocr_norm_threshold, ocr_momentum, ocr_start_step): ocr_eta, ocr_norm_threshold, ocr_momentum, ocr_start_step):
@ -157,7 +153,13 @@ class HunyuanMixModeAPG:
adaptive_projected_guidance_momentum=ocr_momentum adaptive_projected_guidance_momentum=ocr_momentum
) )
current_step = {"step": 0} m = model.clone()
step_tracker = {"step": 0}
def hunyuan_apg_outer_sample_wrapper(executor, *args, **kwargs):
step_tracker['step'] = 0
return executor(*args, **kwargs)
def cfg_function(args): def cfg_function(args):
sigma = args["sigma"].to(torch.float32) sigma = args["sigma"].to(torch.float32)
@ -165,8 +167,8 @@ class HunyuanMixModeAPG:
uncond = args["uncond"] uncond = args["uncond"]
cond_scale = args["cond_scale"] cond_scale = args["cond_scale"]
step = current_step["step"] step = step_tracker['step']
current_step["step"] += 1 step_tracker['step'] += 1
if not has_quoted_text: if not has_quoted_text:
if step >= general_start_step: if step >= general_start_step:
@ -187,8 +189,7 @@ class HunyuanMixModeAPG:
return cond return cond
m.add_wrapper_with_key(comfy.patcher_extension.WrappersMP.OUTER_SAMPLE, "hunyuan_apg", hunyuan_apg_outer_sample_wrapper)
m = model.clone()
m.set_model_sampler_cfg_function(cfg_function, disable_cfg1_optimization=True) m.set_model_sampler_cfg_function(cfg_function, disable_cfg1_optimization=True)
return (m,) return (m,)