diff options
| author | InvincibleDude <81354513+InvincibleDude@users.noreply.github.com> | 2023-03-14 13:55:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-14 13:55:59 +0000 |
| commit | f5e44364535ccc7efef445dacb6395c3942f2f17 (patch) | |
| tree | ca7384e6225fccdae1e89db1e0ccc44dd60c7311 /modules/sd_hijack.py | |
| parent | f6e27378404631d951656388fc178b784fe1495b (diff) | |
| parent | a9fed7c364061ae6efb37f797b6b522cb3cf7aa2 (diff) | |
| download | stable-diffusion-webui-gfx803-f5e44364535ccc7efef445dacb6395c3942f2f17.tar.gz stable-diffusion-webui-gfx803-f5e44364535ccc7efef445dacb6395c3942f2f17.tar.bz2 stable-diffusion-webui-gfx803-f5e44364535ccc7efef445dacb6395c3942f2f17.zip | |
Merge branch 'master' into improved-hr-conflict-test
Diffstat (limited to 'modules/sd_hijack.py')
| -rw-r--r-- | modules/sd_hijack.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py index 79476783..f4bb0266 100644 --- a/modules/sd_hijack.py +++ b/modules/sd_hijack.py @@ -37,11 +37,23 @@ def apply_optimizations(): optimization_method = None
+ can_use_sdp = hasattr(torch.nn.functional, "scaled_dot_product_attention") and callable(getattr(torch.nn.functional, "scaled_dot_product_attention")) # not everyone has torch 2.x to use sdp
+
if cmd_opts.force_enable_xformers or (cmd_opts.xformers and shared.xformers_available and torch.version.cuda and (6, 0) <= torch.cuda.get_device_capability(shared.device) <= (9, 0)):
print("Applying xformers cross attention optimization.")
ldm.modules.attention.CrossAttention.forward = sd_hijack_optimizations.xformers_attention_forward
ldm.modules.diffusionmodules.model.AttnBlock.forward = sd_hijack_optimizations.xformers_attnblock_forward
optimization_method = 'xformers'
+ elif cmd_opts.opt_sdp_no_mem_attention and can_use_sdp:
+ print("Applying scaled dot product cross attention optimization (without memory efficient attention).")
+ ldm.modules.attention.CrossAttention.forward = sd_hijack_optimizations.scaled_dot_product_no_mem_attention_forward
+ ldm.modules.diffusionmodules.model.AttnBlock.forward = sd_hijack_optimizations.sdp_no_mem_attnblock_forward
+ optimization_method = 'sdp-no-mem'
+ elif cmd_opts.opt_sdp_attention and can_use_sdp:
+ print("Applying scaled dot product cross attention optimization.")
+ ldm.modules.attention.CrossAttention.forward = sd_hijack_optimizations.scaled_dot_product_attention_forward
+ ldm.modules.diffusionmodules.model.AttnBlock.forward = sd_hijack_optimizations.sdp_attnblock_forward
+ optimization_method = 'sdp'
elif cmd_opts.opt_sub_quad_attention:
print("Applying sub-quadratic cross attention optimization.")
ldm.modules.attention.CrossAttention.forward = sd_hijack_optimizations.sub_quad_attention_forward
|