From a81b0087d4e2d4fb12c964b16d65d968f312722e Mon Sep 17 00:00:00 2001 From: david Date: Thu, 23 May 2024 16:04:09 +0800 Subject: [PATCH] add cache of load checkpoints --- comfy/node_cache.py | 72 +++++++++++++++++++++++++++++++++++++++++++++ comfy/utils.py | 2 ++ 2 files changed, 74 insertions(+) create mode 100644 comfy/node_cache.py diff --git a/comfy/node_cache.py b/comfy/node_cache.py new file mode 100644 index 000000000..e50ea6c3b --- /dev/null +++ b/comfy/node_cache.py @@ -0,0 +1,72 @@ +from collections import OrderedDict, namedtuple +from functools import wraps +import os + +import torch + +MAX_CHECKPOINT_CACHE = int(os.environ.get("MAX_CHECKPOINT_CACHE", 1)) +MAX_CONTROLNET_CACHE = int(os.environ.get("MAX_CONTROLNET_CACHE", 1)) +MAX_VAE_CACHE = int(os.environ.get("MAX_VAE_CACHE", 1)) + + +class Cache: + def __init__(self, max_cache_size=0): + self._max_size = max_cache_size + self._cache = OrderedDict() + + @property + def cache(self): + return self._cache + + @property + def size(self): + return self._max_size + + def clear_cache(self): + while len(self._cache) > self.size: + k, _ = self._cache.popitem(last=False) + print(f"[==Cache==] Removed {k} from cache.") + + def add_cache(self, k, item): + """模型patch会修改key的名字,缓存之前保留一份key的数据和值的引用""" + keys = list(item.keys()) + values = list(item.values()) + self._cache[k] = (keys, values) + self._cache.move_to_end(k) + + def get_cache(self, k): + data = self._cache.get(k) + if data: + keys, values = data + return dict(zip(keys, values)) + return None + + +caches_mapping = { + "checkpoints": Cache(max_cache_size=MAX_CHECKPOINT_CACHE), + "controlnet": Cache(max_cache_size=MAX_CONTROLNET_CACHE), + "vae": Cache(max_cache_size=MAX_VAE_CACHE), +} + + +def checkpoint_cache_decorator(func): + @wraps(func) + def wrapper(ckpt, *args, device=None, **kwargs): + model_dir, model_name = os.path.split(ckpt) + dir_name = os.path.basename(model_dir) + # get matched ckpt, vae, controlnet queue + cache_mapper = caches_mapping.get(dir_name, None) + + if cache_mapper is not None and device in (None, torch.device("cpu"), {}): + if cache_mapper.get_cache(ckpt) is not None: + return cache_mapper.get_cache(ckpt) + + sd = func(ckpt, *args, device=device, **kwargs) + + if cache_mapper is not None and device in (None, torch.device("cpu"), {}): + cache_mapper.add_cache(ckpt, sd) + print(f"[==Cache==] Add {dir_name} {model_name} to cache") + cache_mapper.clear_cache() + return sd + + return wrapper diff --git a/comfy/utils.py b/comfy/utils.py index ab47b8f28..1aa18b993 100644 --- a/comfy/utils.py +++ b/comfy/utils.py @@ -2,11 +2,13 @@ import torch import math import struct import comfy.checkpoint_pickle +from comfy.node_cache import checkpoint_cache_decorator import safetensors.torch import numpy as np from PIL import Image import logging +@checkpoint_cache_decorator def load_torch_file(ckpt, safe_load=False, device=None): if device is None: device = torch.device("cpu")