Skip to content

The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.

quant_ops: drop the dead ROCm triton arch gate (#16211)

DELUXAbe92396834f9
diff --git a/comfy/cli_args.py b/comfy/cli_args.py
index fdb6e329d..54f2269ff 100644
--- a/comfy/cli_args.py
+++ b/comfy/cli_args.py
@@ -117,7 +117,7 @@ parser.add_argument("--directml", type=int, nargs="?", metavar="DIRECTML_DEVICE"
parser.add_argument("--oneapi-device-selector", type=str, default=None, metavar="SELECTOR_STRING", help="Sets the oneAPI device(s) this instance will use.")
parser.add_argument("--supports-fp8-compute", action="store_true", help="ComfyUI will act like if the device supports fp8 compute.")
parser.add_argument("--enable-triton-backend", action="store_true", help="ComfyUI will enable the use of Triton backend in comfy-kitchen. Is disabled at launch by default.")
-parser.add_argument("--disable-triton-backend", action="store_true", help="Force-disable the comfy-kitchen Triton backend, overriding the automatic ROCm/AMD default and --enable-triton-backend.")
+parser.add_argument("--disable-triton-backend", action="store_true", help="Force-disable the comfy-kitchen Triton backend, overriding --enable-triton-backend.")
class LatentPreviewMethod(enum.Enum):
NoPreviews = "none"
diff --git a/comfy/quant_ops.py b/comfy/quant_ops.py
index 18fd2d613..01dfff370 100644
--- a/comfy/quant_ops.py
+++ b/comfy/quant_ops.py
@@ -4,21 +4,6 @@ import logging
from comfy.cli_args import args
-def _rocm_kitchen_arch_supported():
- """comfy-kitchen's INT8 Triton kernels compile tl.dot to matrix-core instructions.
- RDNA3/3.5/4 (gfx11xx/gfx12xx) have WMMA and CDNA (gfx9xx) has MFMA; RDNA1/RDNA2
- (gfx10xx) have neither, so the INT8 path hangs the GPU there. Gates the automatic
- ROCm default so those cards stay on the eager fallback (an explicit
- --enable-triton-backend still forces it on any arch)."""
- try:
- arch = torch.cuda.get_device_properties(torch.cuda.current_device()).gcnArchName.split(":")[0]
- except Exception:
- return False
- if arch.startswith(("gfx11", "gfx12")):
- return True
- return arch in ("gfx908", "gfx90a", "gfx940", "gfx941", "gfx942", "gfx950")
-
-
try:
import comfy_kitchen as ck
from comfy_kitchen.tensor import (
@@ -42,22 +27,13 @@ try:
ck.registry.disable("cuda")
logging.warning("WARNING: You need pytorch with cu130 or higher to use optimized CUDA operations.\nWARNING WARNING WARNING\nIf you are on nvidia 20 series and above it is required that you update your pytorch to cu130 or higher.\n")
- # On ROCm/AMD the CUDA backend is unavailable, so Triton is the only accelerated
- # comfy-kitchen backend. Enable it by default there, but only on Triton >= 3.7 AND a
- # matrix-core GPU (RDNA3+ WMMA gfx11xx/gfx12xx, CDNA MFMA gfx9xx). RDNA1/RDNA2
- # (gfx10xx) have no WMMA -> the INT8 tl.dot path hangs the GPU, so they stay eager.
- # older Triton lacks libdevice.rint on the HIP backend and hard-crashes the INT8 path.
- if args.disable_triton_backend:
- ck.registry.disable("triton")
- elif args.enable_triton_backend: # or (torch.version.hip is not None and _rocm_kitchen_arch_supported()):
+ # comfy-kitchen picks its accelerated backend on import: the HIP backend registers
+ # itself on a supported AMD device and takes dispatch priority there, CUDA on NVIDIA.
+ # Triton is an opt-in override, off by default on every platform.
+ if args.enable_triton_backend and not args.disable_triton_backend:
try:
import triton
- triton_version = tuple(int(v) for v in triton.__version__.split(".")[:2])
- if args.enable_triton_backend or triton_version >= (3, 7):
- logging.info("Found triton %s. Enabling comfy-kitchen triton backend.", triton.__version__)
- else:
- logging.info("Triton %s is too old for the ROCm INT8 path (needs >= 3.7); comfy-kitchen triton backend disabled.", triton.__version__)
- ck.registry.disable("triton")
+ logging.info("Found triton %s. Enabling comfy-kitchen triton backend.", triton.__version__)
except ImportError as e:
logging.error(f"Failed to import triton, Error: {e}, the comfy-kitchen triton backend will not be available.")
ck.registry.disable("triton")