diff options
| author | C43H66N12O12S2 <36072735+C43H66N12O12S2@users.noreply.github.com> | 2022-10-08 01:10:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-08 01:10:35 +0000 |
| commit | b70eaeb2005a5a9593119e7fd32b8072c2a208d5 (patch) | |
| tree | 0720da97985a5986e16537dd30d54584e6f0b8ba | |
| parent | c9cc65b201679ea43c763b0d85e749d40bbc5433 (diff) | |
| download | stable-diffusion-webui-gfx803-b70eaeb2005a5a9593119e7fd32b8072c2a208d5.tar.gz stable-diffusion-webui-gfx803-b70eaeb2005a5a9593119e7fd32b8072c2a208d5.tar.bz2 stable-diffusion-webui-gfx803-b70eaeb2005a5a9593119e7fd32b8072c2a208d5.zip | |
delete broken and unnecessary aliases
| -rw-r--r-- | modules/sd_hijack.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py index cbdb9d3c..0e99c319 100644 --- a/modules/sd_hijack.py +++ b/modules/sd_hijack.py @@ -21,16 +21,14 @@ diffusionmodules_model_AttnBlock_forward = ldm.modules.diffusionmodules.model.At def apply_optimizations():
ldm.modules.diffusionmodules.model.nonlinearity = silu
- if cmd_opts.opt_split_attention_v1:
+ if not cmd_opts.disable_opt_xformers_attention and not (cmd_opts.opt_split_attention or torch.version.hip):
+ ldm.modules.attention.CrossAttention.forward = sd_hijack_optimizations.xformers_attention_forward
+ ldm.modules.diffusionmodules.model.AttnBlock.forward = sd_hijack_optimizations.cross_attention_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:
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
- elif not cmd_opts.disable_opt_xformers_attention and not (cmd_opts.opt_split_attention or torch.version.hip):
- ldm.modules.attention.CrossAttention.forward = sd_hijack_optimizations.xformers_attention_forward
- ldm.modules.attention.CrossAttention._maybe_init = sd_hijack_optimizations._maybe_init
- ldm.modules.attention.CrossAttention.attention_op = None
- ldm.modules.diffusionmodules.model.AttnBlock.forward = sd_hijack_optimizations.cross_attention_attnblock_forward
def undo_optimizations():
|