From bba2658e93eb1c793922e039b731c27d92f8d0cb Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Mon, 26 Feb 2024 09:47:13 -0500 Subject: [PATCH] fix sdp-memory-attention in original --- CHANGELOG.md | 3 ++- modules/sd_hijack.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2552eb46e..6ea35f244 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log for SD.Next -## Update for 2024-02-25 +## Update for 2024-02-26 - **Image2Video** - new module for creating videos from images @@ -20,6 +20,7 @@ - **Fixes** - improve model offload compatibility - fix extra networks refresh + - fix sdp memory attention in backend original - exception handler around vram memory stats gather - improve ZLUDA installer with `--use-zluda` cli param, thanks @lshqqytiger diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py index d2c31fffb..6360982b8 100644 --- a/modules/sd_hijack.py +++ b/modules/sd_hijack.py @@ -56,11 +56,11 @@ def apply_optimizations(): if can_use_sdp and shared.opts.cross_attention_optimization == "Scaled-Dot-Product": optimization_method = 'sdp' if 'Memory attention' in shared.opts.sdp_options: - 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 - else: 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 + else: + 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 if shared.xformers_available and shared.opts.cross_attention_optimization == "xFormers": ldm.modules.attention.CrossAttention.forward = sd_hijack_optimizations.xformers_attention_forward ldm.modules.diffusionmodules.model.AttnBlock.forward = sd_hijack_optimizations.xformers_attnblock_forward