fix(moe): guard FP8 delegate activation params (#36275)

Signed-off-by: jikuixie <jikuixie@gmail.com>
Co-authored-by: Mohammad Angkad <mohammad.angkad@radixark.ai>
Co-authored-by: Mohammad Miadh Angkad <176301910+mmangkad@users.noreply.github.com>
Co-authored-by: shyeh25 <206795756+shyeh25@users.noreply.github.com>
This commit is contained in:
Jikui Xie
2026-08-26 12:12:21 +00:00
committed by GitHub
co-authored by Mohammad Angkad Mohammad Miadh Angkad shyeh25
parent 937af8538b
commit 27c36368b6
2 changed files with 126 additions and 1 deletions
+8 -1
View File
@@ -1085,6 +1085,9 @@ class Fp8MoEMethod(FusedMoEMethodBase):
self.is_fp4_expert = self.quant_config.is_fp4_experts self.is_fp4_expert = self.quant_config.is_fp4_experts
self.dequant_fp4_to_fp8 = self.quant_config.dequant_fp4_to_fp8 self.dequant_fp4_to_fp8 = self.quant_config.dequant_fp4_to_fp8
self.with_bias = False self.with_bias = False
# The MxFP4 wrapper methods borrow this instance for weight loading;
# they never call create_moe_runner, so moe_runner_config is unset.
self._owns_moe_runner = False
if get_moe_runner_backend().is_cutlass(): if get_moe_runner_backend().is_cutlass():
assert ( assert (
cutlass_fp8_supported() cutlass_fp8_supported()
@@ -2144,10 +2147,12 @@ class Fp8MoEMethod(FusedMoEMethodBase):
align_fp8_moe_weights_for_flashinfer_trtllm(layer) align_fp8_moe_weights_for_flashinfer_trtllm(layer)
# The runner backend is global, so it is also true for a borrowed delegate,
# which has no moe_runner_config and whose kernel ignores these params.
if ( if (
get_moe_runner_backend().is_flashinfer_trtllm() get_moe_runner_backend().is_flashinfer_trtllm()
or get_moe_runner_backend().is_flashinfer_trtllm_routed() or get_moe_runner_backend().is_flashinfer_trtllm_routed()
): ) and self._owns_moe_runner:
self._prepare_flashinfer_trtllm_activation_params(layer) self._prepare_flashinfer_trtllm_activation_params(layer)
if get_moe_runner_backend().is_hpc_ops(): if get_moe_runner_backend().is_hpc_ops():
@@ -2325,6 +2330,7 @@ class Fp8MoEMethod(FusedMoEMethodBase):
def create_moe_runner( def create_moe_runner(
self, layer: torch.nn.Module, moe_runner_config: MoeRunnerConfig self, layer: torch.nn.Module, moe_runner_config: MoeRunnerConfig
): ):
self._owns_moe_runner = False
self.moe_runner_config = moe_runner_config self.moe_runner_config = moe_runner_config
moe_runner_backend = get_moe_runner_backend() moe_runner_backend = get_moe_runner_backend()
@@ -2349,6 +2355,7 @@ class Fp8MoEMethod(FusedMoEMethodBase):
or moe_runner_backend.is_hpc_ops() or moe_runner_backend.is_hpc_ops()
): ):
self.runner = MoeRunner(moe_runner_backend, moe_runner_config) self.runner = MoeRunner(moe_runner_backend, moe_runner_config)
self._owns_moe_runner = True
else: else:
# TODO(cwan): refactor other backends # TODO(cwan): refactor other backends
pass pass
@@ -0,0 +1,118 @@
"""Unit tests for srt/layers/quantization/fp8.py MoE runner ownership.
`--moe-runner-backend flashinfer_trtllm[_routed]` is a global setting, so
`Fp8MoEMethod.process_weights_after_loading` must also require that this
instance owns a MoeRunner before materializing the TRT-LLM SwiGLU params:
the MxFP4 wrapper methods borrow an `Fp8MoEMethod` for weight loading only
and never give it a `moe_runner_config` (issue #36264).
"""
import unittest
from types import SimpleNamespace
from unittest.mock import patch
import torch
from sglang.srt.layers.moe.moe_runner.base import MoeRunnerConfig
from sglang.srt.layers.moe.utils import MoeRunnerBackend
from sglang.srt.layers.quantization.fp8 import Fp8Config, Fp8MoEMethod
from sglang.srt.runtime_context import get_flags
from sglang.test.ci.ci_register import register_cpu_ci
from sglang.test.test_utils import CustomTestCase
register_cpu_ci(est_time=2, suite="base-a-test-cpu")
_ACTIVATION_PARAMS = ("gemm1_alpha", "gemm1_beta", "gemm1_clamp_limit")
class TestFp8MoERunnerOwnership(CustomTestCase):
def setUp(self):
moe = get_flags().moe
self._saved_runner_backend = moe.runner_backend
moe.runner_backend = MoeRunnerBackend.FLASHINFER_TRTLLM
# _use_hip_int4 would divert this to the ROCm int4 branch, past the guard.
hip_int4 = patch("sglang.srt.layers.quantization.fp8._use_hip_int4", False)
hip_int4.start()
self.addCleanup(hip_int4.stop)
def tearDown(self):
get_flags().moe.runner_backend = self._saved_runner_backend
@staticmethod
def _make_block_fp8_method() -> Fp8MoEMethod:
# The real constructor's _owns_moe_runner default is what a delegate relies on.
return Fp8MoEMethod(
Fp8Config(is_checkpoint_fp8_serialized=True, weight_block_size=[128, 128])
)
@staticmethod
def _make_layer(num_local_experts: int = 2) -> SimpleNamespace:
return SimpleNamespace(
num_local_experts=num_local_experts,
w13_weight=torch.empty(num_local_experts, 4),
)
def _run_post_load(self, method: Fp8MoEMethod, layer: SimpleNamespace) -> None:
with patch.object(method, "process_weights_after_loading_block_quant") as work:
method.process_weights_after_loading(layer)
work.assert_called_once_with(layer)
def _assert_activation_params_absent(self, layer: SimpleNamespace) -> None:
for name in _ACTIVATION_PARAMS:
self.assertFalse(hasattr(layer, f"_flashinfer_trtllm_{name}"))
def test_borrowed_delegate_skips_trtllm_activation_params(self):
"""A method with no MoeRunner must not read moe_runner_config; doing so
aborts weight loading whenever a TRT-LLM runner backend is selected."""
method = self._make_block_fp8_method()
layer = self._make_layer()
self._run_post_load(method=method, layer=layer)
self._assert_activation_params_absent(layer)
def test_owning_method_prepares_trtllm_activation_params(self):
"""The owning method must still materialize the params it consumes;
apply() dereferences layer._flashinfer_trtllm_* on the TRT-LLM branch."""
method = self._make_block_fp8_method()
layer = self._make_layer()
method.create_moe_runner(
layer=layer,
moe_runner_config=MoeRunnerConfig(
gemm1_alpha=1.5, gemm1_beta=0.25, gemm1_clamp_limit=None
),
)
self._run_post_load(method=method, layer=layer)
self.assertTrue(
torch.equal(
layer._flashinfer_trtllm_gemm1_alpha,
torch.full((2,), 1.5, dtype=torch.float32),
)
)
self.assertTrue(
torch.equal(
layer._flashinfer_trtllm_gemm1_beta,
torch.full((2,), 0.25, dtype=torch.float32),
)
)
# None stays None: a zero-filled tensor would not mean "no clamp".
self.assertIsNone(layer._flashinfer_trtllm_gemm1_clamp_limit)
def test_owning_method_skips_params_on_non_trtllm_backend(self):
"""Ownership alone must not materialize params no kernel consumes."""
get_flags().moe.runner_backend = MoeRunnerBackend.TRITON
method = self._make_block_fp8_method()
layer = self._make_layer()
method.create_moe_runner(
layer=layer, moe_runner_config=MoeRunnerConfig(gemm1_alpha=1.5)
)
self._run_post_load(method=method, layer=layer)
self._assert_activation_params_absent(layer)
if __name__ == "__main__":
unittest.main()