The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
pytorch_attention_enabled can now return True when xformers is enabled.
comfyanonymous88733c997fd8
diff --git a/comfy/ldm/modules/diffusionmodules/model.py b/comfy/ldm/modules/diffusionmodules/model.pyindex e6cf954ff..6576df4b6 100644--- a/comfy/ldm/modules/diffusionmodules/model.py+++ b/comfy/ldm/modules/diffusionmodules/model.py@@ -355,7 +355,7 @@ def make_attn(in_channels, attn_type="vanilla", attn_kwargs=None):assert attn_type in ["vanilla", "vanilla-xformers", "memory-efficient-cross-attn", "linear", "none"], f'attn_type {attn_type} unknown'if model_management.xformers_enabled_vae() and attn_type == "vanilla":attn_type = "vanilla-xformers"- if model_management.pytorch_attention_enabled() and attn_type == "vanilla":+ elif model_management.pytorch_attention_enabled() and attn_type == "vanilla":attn_type = "vanilla-pytorch"print(f"making attention of type '{attn_type}' with {in_channels} in_channels")if attn_type == "vanilla":diff --git a/comfy/model_management.py b/comfy/model_management.pyindex 3b43b21ac..3c390d9ca 100644--- a/comfy/model_management.py+++ b/comfy/model_management.py@@ -154,14 +154,18 @@ def is_nvidia():return Truereturn False-ENABLE_PYTORCH_ATTENTION = args.use_pytorch_cross_attention+ENABLE_PYTORCH_ATTENTION = False+if args.use_pytorch_cross_attention:+ ENABLE_PYTORCH_ATTENTION = True+ XFORMERS_IS_AVAILABLE = False+VAE_DTYPE = torch.float32try:if is_nvidia():torch_version = torch.version.__version__if int(torch_version[0]) >= 2:- if ENABLE_PYTORCH_ATTENTION == False and XFORMERS_IS_AVAILABLE == False and args.use_split_cross_attention == False and args.use_quad_cross_attention == False:+ if ENABLE_PYTORCH_ATTENTION == False and args.use_split_cross_attention == False and args.use_quad_cross_attention == False:ENABLE_PYTORCH_ATTENTION = Trueif torch.cuda.is_bf16_supported():VAE_DTYPE = torch.bfloat16@@ -186,7 +190,6 @@ if ENABLE_PYTORCH_ATTENTION:torch.backends.cuda.enable_math_sdp(True)torch.backends.cuda.enable_flash_sdp(True)torch.backends.cuda.enable_mem_efficient_sdp(True)- XFORMERS_IS_AVAILABLE = Falseif args.lowvram:set_vram_to = VRAMState.LOW_VRAM