xformers disbled

R3gm · Oct 19, 2023 · 7f9e76f · 7f9e76f
1 parent 4148a66
commit 7f9e76f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 28 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -23,7 +23,6 @@ controlnet-aux = "^0.0.6"
 mediapipe = "0.10.1"
 pytorch-lightning = "^2.0.9.post0"
 asdff = {git = "https://github.com/R3gm/asdff.git"}
-xformers = "^0.0.22.post4"
 
 
 [[tool.poetry.source]]

diff --git a/stablepy/diffusers_vanilla/model.py b/stablepy/diffusers_vanilla/model.py
@@ -348,8 +348,8 @@ def load_pipe(
 
             pipe.scheduler = UniPCMultistepScheduler.from_config(pipe.scheduler.config)
 
-        if self.device.type == "cuda":
-            pipe.enable_xformers_memory_efficient_attention()
+        # if self.device.type == "cuda":
+        #     pipe.enable_xformers_memory_efficient_attention()
 
         pipe.to(self.device)
         torch.cuda.empty_cache()
@@ -1117,6 +1117,7 @@ def __call__(
         # self.pipe = self.process_lora(lora_D, lora_scale_D)
         # self.pipe = self.process_lora(lora_E, lora_scale_E)
 
+        xformers_memory_efficient_attention=False # disabled
         if xformers_memory_efficient_attention and torch.cuda.is_available():
             self.pipe.disable_xformers_memory_efficient_attention()
         self.pipe.to(self.device)
@@ -1308,8 +1309,8 @@ def __call__(
 
             compel = None
             del compel
-
-        if torch.cuda.is_available():
+        
+        if torch.cuda.is_available() and xformers_memory_efficient_attention:
             if xformers_memory_efficient_attention:
                 self.pipe.enable_xformers_memory_efficient_attention()
             else: