Merge branch 'main' into stable

loader.py

@@ -11,7 +11,7 @@ from .dequant import is_quantized, dequantize_tensor
 
 IMG_ARCH_LIST = {"flux", "sd1", "sdxl", "sd3", "aura", "hidream", "cosmos", "ltxv", "hyvid", "wan", "lumina2", "qwen_image"}
 TXT_ARCH_LIST = {"t5", "t5encoder", "llama", "qwen2vl"}
-VIS_TYPE_LIST = {"clip-vision"}
+VIS_TYPE_LIST = {"clip-vision", "mmproj"}
 
 def get_orig_shape(reader, tensor_name):
     field_key = f"comfy.gguf.orig_shape.{tensor_name}"

nodes.py

@@ -79,13 +79,14 @@ class GGUFModelPatcher(comfy.model_patcher.ModelPatcher):
 
     def pin_weight_to_device(self, key):
         op_key = key.rsplit('.', 1)[0]
-        if self.named_modules_to_munmap is not None and op_key in self.named_modules_to_munmap:
+        if not self.mmap_released and op_key in self.named_modules_to_munmap:
             # TODO: possible to OOM, find better way to detach
             self.named_modules_to_munmap[op_key].to(self.load_device).to(self.offload_device)
             del self.named_modules_to_munmap[op_key]
         super().pin_weight_to_device(key)
 
     mmap_released = False
+    named_modules_to_munmap = {}
 
     def load(self, *args, force_patch_weights=False, **kwargs):
         if not self.mmap_released:
@@ -115,7 +116,7 @@ class GGUFModelPatcher(comfy.model_patcher.ModelPatcher):
                     # TODO: possible to OOM, find better way to detach
                     m.to(self.load_device).to(self.offload_device)
             self.mmap_released = True
-        self.named_modules_to_munmap = None
+            self.named_modules_to_munmap = {}
 
     def clone(self, *args, **kwargs):
         src_cls = self.__class__
@@ -125,6 +126,7 @@ class GGUFModelPatcher(comfy.model_patcher.ModelPatcher):
         self.__class__ = src_cls
         # GGUF specific clone values below
         n.patch_on_device = getattr(self, "patch_on_device", False)
+        n.mmap_released = getattr(self, "mmap_released", False)
         if src_cls != GGUFModelPatcher:
             n.size = 0 # force recalc
         return n