remove fairscale requirement, add fake fairscale to make BLIP not com…

…plain about it
AUTOMATIC1111 · Jan 24, 2023 · 2818998 · 2818998
1 parent dac4529
commit 2818998
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/modules/interrogate.py b/modules/interrogate.py
@@ -82,9 +82,16 @@ def categories(self):
 
         return self.loaded_categories
 
+    def create_fake_fairscale(self):
+        class FakeFairscale:
+            def checkpoint_wrapper(self):
+                pass
+
+        sys.modules["fairscale.nn.checkpoint.checkpoint_activations"] = FakeFairscale
+
     def load_blip_model(self):
-        with paths.Prioritize("BLIP"):
-            import models.blip
+        create_fake_fairscale()
+        import models.blip
 
         files = modelloader.load_models(
             model_path=os.path.join(paths.models_path, "BLIP"),

diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,6 @@
 blendmodes
 accelerate
 basicsr
-fairscale==0.4.4
 fonts
 font-roboto
 gfpgan

diff --git a/requirements_versions.txt b/requirements_versions.txt
@@ -14,7 +14,6 @@ scikit-image==0.19.2
 fonts
 font-roboto
 timm==0.6.7
-fairscale==0.4.9
 piexif==1.1.3
 einops==0.4.1
 jsonmerge==1.8.0