wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-02-06 11:32:31 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

Fix issue with subcache's cache

Browse Source
This commit is contained in:
Deluxe233 2026-01-30 13:21:02 -05:00
parent 3770dc0ec4
commit c6b6128b2b
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
comfy_execution/caching.py
View File

@ -235,9 +235,14 @@ class BasicCache:
self.cache = {} self.cache = {}
self.subcaches = {} self.subcaches = {}
self.node_sig_cache = {}
self.ancestry_cache = {}
async def set_prompt(self, dynprompt, node_ids, is_changed): async def set_prompt(self, dynprompt, node_ids, is_changed):
self.dynprompt = dynprompt self.dynprompt = dynprompt
self.cache_key_set = self.key_class(dynprompt, node_ids, is_changed) self.cache_key_set = self.key_class(dynprompt, node_ids, is_changed)
self.cache_key_set.node_sig_cache = self.node_sig_cache
self.cache_key_set.ancestry_cache = self.ancestry_cache
await self.cache_key_set.add_keys(node_ids) await self.cache_key_set.add_keys(node_ids)
self.is_changed = is_changed self.is_changed = is_changed
self.initialized = True self.initialized = True
@ -270,6 +275,8 @@ class BasicCache:
def clean_unused(self): def clean_unused(self):
assert self.initialized assert self.initialized
self.node_sig_cache.clear()
self.ancestry_cache.clear()
self._clean_cache() self._clean_cache()
self._clean_subcaches() self._clean_subcaches()
@ -302,6 +309,8 @@ class BasicCache:
subcache = self.subcaches.get(subcache_key, None) subcache = self.subcaches.get(subcache_key, None)
if subcache is None: if subcache is None:
subcache = BasicCache(self.key_class) subcache = BasicCache(self.key_class)
subcache.node_sig_cache = self.node_sig_cache
subcache.ancestry_cache = self.ancestry_cache
self.subcaches[subcache_key] = subcache self.subcaches[subcache_key] = subcache
await subcache.set_prompt(self.dynprompt, children_ids, self.is_changed) await subcache.set_prompt(self.dynprompt, children_ids, self.is_changed)
return subcache return subcache
@ -414,6 +423,8 @@ class LRUCache(BasicCache):
self._mark_used(node_id) self._mark_used(node_id)
def clean_unused(self): def clean_unused(self):
self.node_sig_cache.clear()
self.ancestry_cache.clear()
while len(self.cache) > self.max_size and self.min_generation < self.generation: while len(self.cache) > self.max_size and self.min_generation < self.generation:
self.min_generation += 1 self.min_generation += 1
to_remove = [key for key in self.cache if self.used_generation[key] < self.min_generation] to_remove = [key for key in self.cache if self.used_generation[key] < self.min_generation]
@ -480,6 +491,8 @@ class RAMPressureCache(LRUCache):
self.timestamps = {} self.timestamps = {}
def clean_unused(self): def clean_unused(self):
self.node_sig_cache.clear()
self.ancestry_cache.clear()
self._clean_subcaches() self._clean_subcaches()
def set(self, node_id, value): def set(self, node_id, value):