diff options
| author | AUTOMATIC <16777216c@gmail.com> | 2022-09-18 17:55:46 +0000 |
|---|---|---|
| committer | AUTOMATIC <16777216c@gmail.com> | 2022-09-18 17:55:46 +0000 |
| commit | cae5c5fa8d88a6d4206ec7d89e53685d53afe4c0 (patch) | |
| tree | 4e055443670e477c73e01380bcededc51506a56a /modules/sd_hijack.py | |
| parent | 6a28aac8666a301b066f1a0717a2bd3924111595 (diff) | |
| download | stable-diffusion-webui-gfx803-cae5c5fa8d88a6d4206ec7d89e53685d53afe4c0.tar.gz stable-diffusion-webui-gfx803-cae5c5fa8d88a6d4206ec7d89e53685d53afe4c0.tar.bz2 stable-diffusion-webui-gfx803-cae5c5fa8d88a6d4206ec7d89e53685d53afe4c0.zip | |
Making opt split attention the default. Are you upset about this? Sorry.
Diffstat (limited to 'modules/sd_hijack.py')
| -rw-r--r-- | modules/sd_hijack.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py index c4450ce4..98bb9b7e 100644 --- a/modules/sd_hijack.py +++ b/modules/sd_hijack.py @@ -243,12 +243,12 @@ class StableDiffusionModelHijack: model_embeddings.token_embedding = EmbeddingsWithFixes(model_embeddings.token_embedding, self)
m.cond_stage_model = FrozenCLIPEmbedderWithCustomWords(m.cond_stage_model, self)
- if cmd_opts.opt_split_attention:
+ if cmd_opts.opt_split_attention_v1:
+ ldm.modules.attention.CrossAttention.forward = split_cross_attention_forward_v1
+ elif not cmd_opts.disable_opt_split_attention:
ldm.modules.attention.CrossAttention.forward = split_cross_attention_forward
ldm.modules.diffusionmodules.model.nonlinearity = nonlinearity_hijack
ldm.modules.diffusionmodules.model.AttnBlock.forward = cross_attention_attnblock_forward
- elif cmd_opts.opt_split_attention_v1:
- ldm.modules.attention.CrossAttention.forward = split_cross_attention_forward_v1
def flatten(el):
flattened = [flatten(children) for children in el.children()]
|