Merge ed4901d316 into 7ee77ff038

Add name to LoraLoaderModelOnly. (#12078 )
Merge branch 'master' into pytorch-attention-vae-rdna4
2026-02-05 19:12:41 +08:00 · 2026-01-26 14:29:31 +08:00 · 2026-01-25 21:01:55 -05:00 · 2026-01-23 18:28:58 +02:00 · 2025-09-20 00:10:20 +03:00
2 changed files with 3 additions and 2 deletions
--- a/comfy/model_management.py
+++ b/comfy/model_management.py
@ -1252,7 +1252,7 @@ def pytorch_attention_enabled():
    return ENABLE_PYTORCH_ATTENTION

 def pytorch_attention_enabled_vae():
-    if is_amd():
+    if is_amd() and not amd_min_version(device=None, min_rdna_version=4):
        return False  # enabling pytorch attention on AMD currently causes crash when doing high res
    return pytorch_attention_enabled()

--- a/nodes.py
+++ b/nodes.py
@ -2105,7 +2105,8 @@ NODE_DISPLAY_NAME_MAPPINGS = {
    "CheckpointLoader": "Load Checkpoint With Config (DEPRECATED)",
    "CheckpointLoaderSimple": "Load Checkpoint",
    "VAELoader": "Load VAE",
-    "LoraLoader": "Load LoRA",
+    "LoraLoader": "Load LoRA (Model and CLIP)",
+    "LoraLoaderModelOnly": "Load LoRA",
    "CLIPLoader": "Load CLIP",
    "ControlNetLoader": "Load ControlNet Model",
    "DiffControlNetLoader": "Load ControlNet Model (diff)",
Author	SHA1	Message	Date
DELUXA	06dfdf8747	Merge `ed4901d316` into `7ee77ff038`	2026-01-26 14:29:31 +08:00
comfyanonymous	7ee77ff038	Add name to LoraLoaderModelOnly. (#12078 ) Some checks are pending Full Comfy CI Workflow Runs / test-unix-nightly (12.1, , linux, 3.11, [self-hosted Linux], nightly) (push) Waiting to run Details Execution Tests / test (macos-latest) (push) Waiting to run Details Execution Tests / test (ubuntu-latest) (push) Waiting to run Details Execution Tests / test (windows-latest) (push) Waiting to run Details Test server launches without errors / test (push) Waiting to run Details Unit Tests / test (macos-latest) (push) Waiting to run Details Unit Tests / test (ubuntu-latest) (push) Waiting to run Details Unit Tests / test (windows-2022) (push) Waiting to run Details Python Linting / Run Ruff (push) Waiting to run Details Python Linting / Run Pylint (push) Waiting to run Details Full Comfy CI Workflow Runs / test-stable (12.1, , linux, 3.10, [self-hosted Linux], stable) (push) Waiting to run Details Full Comfy CI Workflow Runs / test-stable (12.1, , linux, 3.11, [self-hosted Linux], stable) (push) Waiting to run Details Full Comfy CI Workflow Runs / test-stable (12.1, , linux, 3.12, [self-hosted Linux], stable) (push) Waiting to run Details	2026-01-25 21:01:55 -05:00
DELUXA	ed4901d316	Merge branch 'master' into pytorch-attention-vae-rdna4	2026-01-23 18:28:58 +02:00
Your Name	3988f37386	Enable pytorch attention in VAE for AMD RDNA 4	2025-09-20 00:10:20 +03:00