emergency fix for xformers (continue + shared)

1 files changed, 8 insertions, 8 deletions

diff --git a/modules/sd_hijack_optimizations.py b/modules/sd_hijack_optimizations.py
index e43e2c7a..05023b6f 100644
--- a/modules/sd_hijack_optimizations.py
+++ b/modules/sd_hijack_optimizations.py
@@ -1,19 +1,19 @@
 import math

 import torch

 from torch import einsum

-try:

-    import xformers.ops

-    import functorch

-    xformers._is_functorch_available = True

-    shared.xformers_available = True

-except:

-    print('Cannot find xformers, defaulting to split attention. Try setting --xformers in your webui-user file if you wish to install it.')

-    continue

+

 from ldm.util import default

 from einops import rearrange

 

 from modules import shared

 

+try:

+    import xformers.ops

+    import functorch

+    xformers._is_functorch_available = True

+    shared.xformers_available = True

+except Exception:

+    print('Cannot find xformers, defaulting to split attention. Try adding --xformers commandline argument to your webui-user file if you wish to install it.')

 

 # see https://github.com/basujindal/stable-diffusion/pull/117 for discussion

 def split_cross_attention_forward_v1(self, x, context=None, mask=None):