diff options
| author | Greendayle <81877451+Greendayle@users.noreply.github.com> | 2022-10-08 16:28:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-08 16:28:22 +0000 |
| commit | 0ec80f0125a14c03ac860279f40c0c062dbde0cf (patch) | |
| tree | f51f04feecca9006a6a40e622bae3d6ae997e5eb /modules/sd_hijack_optimizations.py | |
| parent | 01f8cb44474e454903c11718e6a4f33dbde34bb8 (diff) | |
| parent | 3061cdb7b610d4ba7f1ea695d9d6364b591e5bc7 (diff) | |
| download | stable-diffusion-webui-gfx803-0ec80f0125a14c03ac860279f40c0c062dbde0cf.tar.gz stable-diffusion-webui-gfx803-0ec80f0125a14c03ac860279f40c0c062dbde0cf.tar.bz2 stable-diffusion-webui-gfx803-0ec80f0125a14c03ac860279f40c0c062dbde0cf.zip | |
Merge branch 'master' into dev/deepdanbooru
Diffstat (limited to 'modules/sd_hijack_optimizations.py')
| -rw-r--r-- | modules/sd_hijack_optimizations.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/sd_hijack_optimizations.py b/modules/sd_hijack_optimizations.py index d23d733b..dba21192 100644 --- a/modules/sd_hijack_optimizations.py +++ b/modules/sd_hijack_optimizations.py @@ -211,6 +211,7 @@ def cross_attention_attnblock_forward(self, x): return h3
def xformers_attnblock_forward(self, x):
+ try:
h_ = x
h_ = self.norm(h_)
q1 = self.q(h_).contiguous()
@@ -218,4 +219,6 @@ def xformers_attnblock_forward(self, x): v = self.v(h_).contiguous()
out = xformers.ops.memory_efficient_attention(q1, k1, v)
out = self.proj_out(out)
- return x+out
+ return x + out
+ except NotImplementedError:
+ return cross_attention_attnblock_forward(self, x)
|