restore old opt_split_attention/disable_opt_split_attention logic

This commit is contained in:
AUTOMATIC 2022-10-08 17:10:05 +03:00
parent dc1117233e
commit 27032c47df

View File

@ -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