simplify xfrmers options: --xformers to enable and that's it

This commit is contained in:
AUTOMATIC
2022-10-08 17:02:18 +03:00
parent 7ff1170a2e
commit dc1117233e
4 changed files with 16 additions and 10 deletions

View File

@@ -22,7 +22,7 @@ def apply_optimizations():
undo_optimizations()
ldm.modules.diffusionmodules.model.nonlinearity = silu
if not cmd_opts.disable_opt_xformers_attention and not (cmd_opts.opt_split_attention or torch.version.hip) and shared.xformers_available:
if cmd_opts.xformers and shared.xformers_available and not torch.version.hip:
ldm.modules.attention.CrossAttention.forward = sd_hijack_optimizations.xformers_attention_forward
ldm.modules.diffusionmodules.model.AttnBlock.forward = sd_hijack_optimizations.xformers_attnblock_forward
elif cmd_opts.opt_split_attention_v1: