From 8bfa6958de1156677b735709a2a1571e8582eca0 Mon Sep 17 00:00:00 2001 From: chukk Date: Mon, 9 Mar 2026 16:24:13 +0800 Subject: [PATCH] Fix indentation for Docker memory detection --- comfy_execution/caching.py | 82 +++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/comfy_execution/caching.py b/comfy_execution/caching.py index bbfbd2ce8..8dfac7a07 100644 --- a/comfy_execution/caching.py +++ b/comfy_execution/caching.py @@ -383,47 +383,47 @@ class RAMPressureCache(LRUCache): return super().get(node_id) def poll(self, ram_headroom): - def _ram_gb(): - fallback_to_host_available = False - cgroup_mem_limit_path = "/sys/fs/cgroup/memory.max" - cgroup_mem_usage_path = "/sys/fs/cgroup/memory.current" - - if not os.path.exists(cgroup_mem_limit_path): - cgroup_mem_limit_path = "/sys/fs/cgroup/memory/memory.limit_in_bytes" - cgroup_mem_usage_path = "/sys/fs/cgroup/memory/memory.usage_in_bytes" - - try: - with open(cgroup_mem_limit_path, "r") as f: - raw_limit = f.read().strip() - if raw_limit == "max": - fallback_to_host_available = True - mem_limit = psutil.virtual_memory().total - else: - mem_limit = int(raw_limit) - if mem_limit == 9223372036854771712: - fallback_to_host_available = True - mem_limit = psutil.virtual_memory().total - except (FileNotFoundError, ValueError): - fallback_to_host_available = True - mem_limit = psutil.virtual_memory().total - - if fallback_to_host_available: - return psutil.virtual_memory().available / (1024**3) - - try: - with open(cgroup_mem_usage_path, "r") as f: - mem_used = int(f.read().strip()) - except (FileNotFoundError, ValueError): - mem_used = psutil.virtual_memory().total - psutil.virtual_memory().available - - mem_available = max(0, mem_limit - mem_used) - return mem_available / (1024**3) - - if _ram_gb() > ram_headroom: - return - gc.collect() - if _ram_gb() > ram_headroom: - return + def _ram_gb(): + fallback_to_host_available = False + cgroup_mem_limit_path = "/sys/fs/cgroup/memory.max" + cgroup_mem_usage_path = "/sys/fs/cgroup/memory.current" + + if not os.path.exists(cgroup_mem_limit_path): + cgroup_mem_limit_path = "/sys/fs/cgroup/memory/memory.limit_in_bytes" + cgroup_mem_usage_path = "/sys/fs/cgroup/memory/memory.usage_in_bytes" + + try: + with open(cgroup_mem_limit_path, "r") as f: + raw_limit = f.read().strip() + if raw_limit == "max": + fallback_to_host_available = True + mem_limit = psutil.virtual_memory().total + else: + mem_limit = int(raw_limit) + if mem_limit == 9223372036854771712: + fallback_to_host_available = True + mem_limit = psutil.virtual_memory().total + except (FileNotFoundError, ValueError): + fallback_to_host_available = True + mem_limit = psutil.virtual_memory().total + + if fallback_to_host_available: + return psutil.virtual_memory().available / (1024**3) + + try: + with open(cgroup_mem_usage_path, "r") as f: + mem_used = int(f.read().strip()) + except (FileNotFoundError, ValueError): + mem_used = psutil.virtual_memory().total - psutil.virtual_memory().available + + mem_available = max(0, mem_limit - mem_used) + return mem_available / (1024**3) + + if _ram_gb() > ram_headroom: + return + gc.collect() + if _ram_gb() > ram_headroom: + return clean_list = []