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

Fix after loading a shuffle type ControlNet, other ControlNets stop working

Browse Source 
Fix after loading a shuffle type ControlNet, other ControlNets stop working because global_average_pooling stays set to True until ComfyUI is restarted.
This commit is contained in:
JaQuan 2025-04-20 20:04:03 +08:00
parent f3b09b9f2d
commit cac969c324
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
comfy/controlnet.py
View File

@ -736,11 +736,12 @@ def load_controlnet_state_dict(state_dict, model=None, model_options={}):
return control return control
def load_controlnet(ckpt_path, model=None, model_options={}): def load_controlnet(ckpt_path, model=None, model_options={}):
if "global_average_pooling" not in model_options:
filename = os.path.splitext(ckpt_path)[0]
if filename.endswith("_shuffle") or filename.endswith("_shuffle_fp16"): #TODO: smarter way of enabling global_average_pooling
model_options["global_average_pooling"] = True
filename = os.path.splitext(ckpt_path)[0]
if filename.endswith("_shuffle") or filename.endswith("_shuffle_fp16"): #TODO: smarter way of enabling global_average_pooling
model_options["global_average_pooling"] = True
else:
model_options["global_average_pooling"] = False
cnet = load_controlnet_state_dict(comfy.utils.load_torch_file(ckpt_path, safe_load=True), model=model, model_options=model_options) cnet = load_controlnet_state_dict(comfy.utils.load_torch_file(ckpt_path, safe_load=True), model=model, model_options=model_options)
if cnet is None: if cnet is None:
logging.error("error checkpoint does not contain controlnet or t2i adapter data {}".format(ckpt_path)) logging.error("error checkpoint does not contain controlnet or t2i adapter data {}".format(ckpt_path))