diff options
| author | C43H66N12O12S2 <36072735+C43H66N12O12S2@users.noreply.github.com> | 2022-10-07 06:01:14 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-07 06:01:14 +0300 |
| commit | 5303df24282ba06abb34a423f2967354d37d078e (patch) | |
| tree | fd1c9ff42cd5ed6772ea7c7c08e1fd9d0e2ca233 | |
| parent | 35d6b231628d18d53d166c3a92fea1523e88d51e (diff) | |
Update sd_hijack.py
| -rw-r--r-- | modules/sd_hijack.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py index a006c0a3..ddacb0ad 100644 --- a/modules/sd_hijack.py +++ b/modules/sd_hijack.py @@ -23,10 +23,10 @@ def apply_optimizations(): ldm.modules.diffusionmodules.model.nonlinearity = silu
if cmd_opts.opt_split_attention_v1:
ldm.modules.attention.CrossAttention.forward = sd_hijack_optimizations.split_cross_attention_forward_v1
- if cmd_opts.opt_split_attention:
+ 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:
+ elif not cmd_opts.disable_opt_xformers_attention and not cmd_opts.opt_split_attention:
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
|