The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Fix linear_input_act to respect _full_precision_mm fallback (#16285)
Jialong(Bruce) Lia20738f1d345
diff --git a/comfy/ops.py b/comfy/ops.pyindex 24631840a..e0bc79ad4 100644--- a/comfy/ops.py+++ b/comfy/ops.py@@ -968,7 +968,8 @@ def linear_input_act(linear, x, input_act):if (comfy.model_management.in_trainingor not isinstance(weight, QuantizedTensor)or weight._layout_cls != "TensorWiseINT8Layout"- or getattr(weight._params, "transposed", False)):+ or getattr(weight._params, "transposed", False)+ or getattr(linear, "_full_precision_mm", False)):return linear(INPUT_ACT_EAGER[input_act](x))# want_requant keeps a vbar-streamed layer on the INT8 path when a LoRA isdiff --git a/tests-unit/comfy_quant/test_mixed_precision.py b/tests-unit/comfy_quant/test_mixed_precision.pyindex 30a446539..03e1b0e6e 100644--- a/tests-unit/comfy_quant/test_mixed_precision.py+++ b/tests-unit/comfy_quant/test_mixed_precision.py@@ -1,4 +1,5 @@import unittest+import unittest.mockimport torchimport sysimport os@@ -340,6 +341,42 @@ class TestMixedPrecisionOps(unittest.TestCase):finally:mm.supports_int8_compute = orig_supports_int8+ def test_linear_input_act_respects_full_precision_mm_fallback(self):+ """linear_input_act folds an activation into the INT8 GEMM's input quantizer,+ bypassing Linear.forward entirely. On a device where the fast int8 kernel is+ disabled (e.g. MPS, which lacks aten::_int_mm), it must honor _full_precision_mm+ and dequantize instead, exactly like Linear.forward_comfy_cast_weights does+ (see Comfy-Org/ComfyUI#16284)."""+ operations = ops.mixed_precision_ops({}, compute_dtype=torch.bfloat16)++ torch.manual_seed(456)+ weight = torch.randn(32, 64, dtype=torch.bfloat16)+ bias = torch.randn(32, dtype=torch.bfloat16)++ layer = operations.Linear(64, 32, bias=True, device="cpu", dtype=torch.bfloat16)+ layer.weight = torch.nn.Parameter(+ QuantizedTensor.from_float(weight, "TensorWiseINT8Layout"), requires_grad=False+ )+ layer.bias = torch.nn.Parameter(bias, requires_grad=False)+ layer.quant_format = "int8_tensorwise"+ layer._full_precision_mm = True++ x = torch.randn(4, 128, dtype=torch.bfloat16)++ orig_int8_linear = ops.quant_ops.ck.int8_linear+ ops.quant_ops.ck.int8_linear = unittest.mock.Mock(+ side_effect=NotImplementedError("aten::_int_mm not implemented")+ )+ try:+ output = ops.linear_input_act(layer, x, "swiglu")+ finally:+ ops.quant_ops.ck.int8_linear = orig_int8_linear++ expected = torch.nn.functional.linear(+ ops.INPUT_ACT_EAGER["swiglu"](x), layer.weight.dequantize(), bias+ )+ torch.testing.assert_close(output, expected)+def test_supports_int8_compute_treats_mps_mode_as_unsupported_when_device_is_none(self):"""Call sites (like pick_operations' default) may omit load_device. On anMPS machine that must still report int8 as unsupported instead of