From 9edc20e8107b86cd18c9da70fdce842ca19f209d Mon Sep 17 00:00:00 2001 From: yolain Date: Thu, 26 Dec 2024 00:51:12 +0800 Subject: [PATCH] Fix some controlnet bug --- py/kolors/loader.py | 2 +- py/libs/controlnet.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/py/kolors/loader.py b/py/kolors/loader.py index 908455f..9902286 100644 --- a/py/kolors/loader.py +++ b/py/kolors/loader.py @@ -296,7 +296,7 @@ class applyKolorsUnet: def is_kolors_model(model): - unet_config = model.model.model_config.unet_config + unet_config = model.model.model_config.unet_config if hasattr(model, 'model') else None if unet_config and "adm_in_channels" in unet_config and unet_config["adm_in_channels"] == 5632: return True else: diff --git a/py/libs/controlnet.py b/py/libs/controlnet.py index d4bacd8..c31de2c 100644 --- a/py/libs/controlnet.py +++ b/py/libs/controlnet.py @@ -23,7 +23,11 @@ class easyControlnet: control_net = patch_controlnet(model, control_net) else: if control_net is None: - control_net = easyCache.load_controlnet(control_net_name, scale_soft_weights, use_cache) + if easyCache is not None: + control_net = easyCache.load_controlnet(control_net_name, scale_soft_weights, use_cache) + else: + controlnet_path = folder_paths.get_full_path("controlnet", control_net_name) + control_net = comfy.controlnet.load_controlnet(controlnet_path) # union controlnet if union_type is not None: