InvokeAI 4.0.3__tar.gz → 4.0.4__tar.gz

{InvokeAI-4.0.3 → InvokeAI-4.0.4}/InvokeAI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: InvokeAI
-Version: 4.0.3
+Version: 4.0.4
 Summary: An implementation of Stable Diffusion which provides various new features and options to aid the image generation process
 Author-email: The InvokeAI Project <lincoln.stein@gmail.com>
 License:                                  Apache License

{InvokeAI-4.0.3 → InvokeAI-4.0.4}/InvokeAI.egg-info/SOURCES.txt

@@ -314,11 +314,11 @@ invokeai/frontend/install/__init__.py
 invokeai/frontend/install/import_images.py
 invokeai/frontend/web/__init__.py
 invokeai/frontend/web/dist/index.html
-invokeai/frontend/web/dist/assets/App-BLcNMYZP.js
+invokeai/frontend/web/dist/assets/App-CSqsGtxM.js
 invokeai/frontend/web/dist/assets/App-DI6oCUg0.css
 invokeai/frontend/web/dist/assets/ThemeLocaleProvider-Bsx7ESc2.css
-invokeai/frontend/web/dist/assets/ThemeLocaleProvider-DKJ1LbAm.js
-invokeai/frontend/web/dist/assets/index-MDF-DOT9.js
+invokeai/frontend/web/dist/assets/ThemeLocaleProvider-CwuwZXTI.js
+invokeai/frontend/web/dist/assets/index-7ad0WVcM.js
 invokeai/frontend/web/dist/assets/inter-cyrillic-ext-wght-normal-DIEz8p5i.woff2
 invokeai/frontend/web/dist/assets/inter-cyrillic-wght-normal-BmJJXa8e.woff2
 invokeai/frontend/web/dist/assets/inter-greek-ext-wght-normal-D5AYLNiq.woff2

{InvokeAI-4.0.3 → InvokeAI-4.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: InvokeAI
-Version: 4.0.3
+Version: 4.0.4
 Summary: An implementation of Stable Diffusion which provides various new features and options to aid the image generation process
 Author-email: The InvokeAI Project <lincoln.stein@gmail.com>
 License:                                  Apache License

{InvokeAI-4.0.3 → InvokeAI-4.0.4}/invokeai/app/invocations/ip_adapter.py

@@ -67,7 +67,7 @@ class IPAdapterInvocation(BaseInvocation):
     )
     clip_vision_model: Literal["ViT-H", "ViT-G"] = InputField(
         description="CLIP Vision model to use. Overrides model settings. Mandatory for checkpoint models.",
-        default="auto",
+        default="ViT-H",
         ui_order=2,
     )
     weight: Union[float, List[float]] = InputField(

{InvokeAI-4.0.3 → InvokeAI-4.0.4}/invokeai/backend/model_manager/load/model_cache/model_cache_base.py

@@ -117,7 +117,7 @@ class ModelCacheBase(ABC, Generic[T]):
 
     @property
     @abstractmethod
-    def stats(self) -> CacheStats:
+    def stats(self) -> Optional[CacheStats]:
         """Return collected CacheStats object."""
         pass
 

{InvokeAI-4.0.3 → InvokeAI-4.0.4}/invokeai/backend/model_manager/load/model_cache/model_cache_default.py

@@ -269,9 +269,6 @@ class ModelCache(ModelCacheBase[AnyModel]):
         if torch.device(source_device).type == torch.device(target_device).type:
             return
 
-        # may raise an exception here if insufficient GPU VRAM
-        self._check_free_vram(target_device, cache_entry.size)
-
         start_model_to_time = time.time()
         snapshot_before = self._capture_memory_snapshot()
         cache_entry.model.to(target_device)
@@ -329,11 +326,11 @@ class ModelCache(ModelCacheBase[AnyModel]):
                     f" {in_ram_models}/{in_vram_models}({locked_in_vram_models})"
                 )
 
-    def make_room(self, model_size: int) -> None:
+    def make_room(self, size: int) -> None:
         """Make enough room in the cache to accommodate a new model of indicated size."""
         # calculate how much memory this model will require
         # multiplier = 2 if self.precision==torch.float32 else 1
-        bytes_needed = model_size
+        bytes_needed = size
         maximum_size = self.max_cache_size * GIG  # stored in GB, convert to bytes
         current_size = self.cache_size()
 
@@ -388,7 +385,7 @@ class ModelCache(ModelCacheBase[AnyModel]):
             # 1 from onnx runtime object
             if not cache_entry.locked and refs <= (3 if "onnx" in model_key else 2):
                 self.logger.debug(
-                    f"Removing {model_key} from RAM cache to free at least {(model_size/GIG):.2f} GB (-{(cache_entry.size/GIG):.2f} GB)"
+                    f"Removing {model_key} from RAM cache to free at least {(size/GIG):.2f} GB (-{(cache_entry.size/GIG):.2f} GB)"
                 )
                 current_size -= cache_entry.size
                 models_cleared += 1
@@ -420,24 +417,3 @@ class ModelCache(ModelCacheBase[AnyModel]):
             mps.empty_cache()
 
         self.logger.debug(f"After making room: cached_models={len(self._cached_models)}")
-
-    def _free_vram(self, device: torch.device) -> int:
-        vram_device = (  # mem_get_info() needs an indexed device
-            device if device.index is not None else torch.device(str(device), index=0)
-        )
-        free_mem, _ = torch.cuda.mem_get_info(vram_device)
-        for _, cache_entry in self._cached_models.items():
-            if cache_entry.loaded and not cache_entry.locked:
-                free_mem += cache_entry.size
-        return free_mem
-
-    def _check_free_vram(self, target_device: torch.device, needed_size: int) -> None:
-        if target_device.type != "cuda":
-            return
-        free_mem = self._free_vram(target_device)
-        if needed_size > free_mem:
-            needed_gb = round(needed_size / GIG, 2)
-            free_gb = round(free_mem / GIG, 2)
-            raise torch.cuda.OutOfMemoryError(
-                f"Insufficient VRAM to load model, requested {needed_gb}GB but only had {free_gb}GB free"
-            )