aboutsummaryrefslogtreecommitdiff
path: root/modules/sd_hijack.py
diff options
context:
space:
mode:
authorAUTOMATIC <16777216c@gmail.com>2022-10-08 17:10:05 +0300
committerAUTOMATIC <16777216c@gmail.com>2022-10-08 17:10:05 +0300
commit27032c47df9c07ac21dd5b89fa7dc247bb8705b6 (patch)
tree6c52df36488499707260953725ce4eb806c4697e /modules/sd_hijack.py
parentdc1117233ef8f9b25ff1ac40b158f20b70ba2fcb (diff)
restore old opt_split_attention/disable_opt_split_attention logic
Diffstat (limited to 'modules/sd_hijack.py')
-rw-r--r--modules/sd_hijack.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py
index 91e98c16..335a2bcf 100644
--- a/modules/sd_hijack.py
+++ b/modules/sd_hijack.py
@@ -27,7 +27,7 @@ def apply_optimizations():
ldm.modules.diffusionmodules.model.AttnBlock.forward = sd_hijack_optimizations.xformers_attnblock_forward
elif cmd_opts.opt_split_attention_v1:
ldm.modules.attention.CrossAttention.forward = sd_hijack_optimizations.split_cross_attention_forward_v1
- elif cmd_opts.opt_split_attention or torch.cuda.is_available():
+ elif not cmd_opts.disable_opt_split_attention and (cmd_opts.opt_split_attention or torch.cuda.is_available()):
ldm.modules.attention_CrossAttention_forward = sd_hijack_optimizations.split_cross_attention_forward
ldm.modules.diffusionmodules.model.AttnBlock.forward = sd_hijack_optimizations.cross_attention_attnblock_forward