298977887/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-01-11 02:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

LoraLoader node now caches the lora file between executions.

Browse Source
This commit is contained in:
comfyanonymous 2023-06-29 23:40:02 -04:00
parent 6e9f28401f
commit 5a9ddf94eb
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
comfy/sd.py
View File

@ -89,8 +89,7 @@ LORA_UNET_MAP_RESNET = {
"skip_connection": "resnets_{}_conv_shortcut" "skip_connection": "resnets_{}_conv_shortcut"
} }
def load_lora(path, to_load): def load_lora(lora, to_load):
lora = utils.load_torch_file(path, safe_load=True)
patch_dict = {} patch_dict = {}
loaded_keys = set() loaded_keys = set()
for x in to_load: for x in to_load:
@ -501,10 +500,10 @@ class ModelPatcher:
self.backup = {} self.backup = {}
def load_lora_for_models(model, clip, lora_path, strength_model, strength_clip): def load_lora_for_models(model, clip, lora, strength_model, strength_clip):
key_map = model_lora_keys(model.model) key_map = model_lora_keys(model.model)
key_map = model_lora_keys(clip.cond_stage_model, key_map) key_map = model_lora_keys(clip.cond_stage_model, key_map)
loaded = load_lora(lora_path, key_map) loaded = load_lora(lora, key_map)
new_modelpatcher = model.clone() new_modelpatcher = model.clone()
k = new_modelpatcher.add_patches(loaded, strength_model) k = new_modelpatcher.add_patches(loaded, strength_model)
new_clip = clip.clone() new_clip = clip.clone()

16
nodes.py
View File

@ -434,6 +434,9 @@ class CLIPSetLastLayer:
return (clip,) return (clip,)
class LoraLoader: class LoraLoader:
def __init__(self):
self.loaded_lora = None
@classmethod @classmethod
def INPUT_TYPES(s): def INPUT_TYPES(s):
return {"required": { "model": ("MODEL",), return {"required": { "model": ("MODEL",),
@ -452,7 +455,18 @@ class LoraLoader:
return (model, clip) return (model, clip)
lora_path = folder_paths.get_full_path("loras", lora_name) lora_path = folder_paths.get_full_path("loras", lora_name)
model_lora, clip_lora = comfy.sd.load_lora_for_models(model, clip, lora_path, strength_model, strength_clip) lora = None
if self.loaded_lora is not None:
if self.loaded_lora[0] == lora_path:
lora = self.loaded_lora[1]
else:
del self.loaded_lora
if lora is None:
lora = comfy.utils.load_torch_file(lora_path, safe_load=True)
self.loaded_lora = (lora_path, lora)
model_lora, clip_lora = comfy.sd.load_lora_for_models(model, clip, lora, strength_model, strength_clip)
return (model_lora, clip_lora) return (model_lora, clip_lora)
class VAELoader: class VAELoader: