diff --git a/tests/model_executor/test_routed_experts_capture.py b/tests/model_executor/test_routed_experts_capture.py index 9efee9eec8..7bb7b8ba51 100644 --- a/tests/model_executor/test_routed_experts_capture.py +++ b/tests/model_executor/test_routed_experts_capture.py @@ -138,9 +138,7 @@ def test_gpu_model_runner_binds_router_capture(monkeypatch): monkeypatch.setattr(fused_moe_layer, "MoERunner", DummyFusedMoE) dummy_self = types.SimpleNamespace( - compilation_config=types.SimpleNamespace( - static_forward_context={"dummy": dummy_module} - ) + model=types.SimpleNamespace(modules=lambda: [dummy_module]) ) capturer = DummyCapturer() @@ -177,9 +175,7 @@ def test_gpu_model_runner_binding_stage(monkeypatch): monkeypatch.setattr(fused_moe_layer, "MoERunner", DummyFusedMoE) dummy_self = types.SimpleNamespace( - compilation_config=types.SimpleNamespace( - static_forward_context={"dummy": dummy_module} - ) + model=types.SimpleNamespace(modules=lambda: [dummy_module]) ) # Before binding, no capture hook. @@ -194,6 +190,38 @@ def test_gpu_model_runner_binding_stage(monkeypatch): assert len(capturer.calls) == 1 +def test_gpu_model_runner_does_not_bind_draft_router_capture(monkeypatch): + from vllm.v1.worker import gpu_model_runner as gmr + + class DummyFusedMoE: + def __init__(self, layer_id): + self.layer_id = layer_id + self.router = _make_router() + + target_module = DummyFusedMoE(layer_id=7) + draft_module = DummyFusedMoE(layer_id=0) + + import vllm.model_executor.layers.fused_moe.layer as fused_moe_layer + + monkeypatch.setattr(fused_moe_layer, "MoERunner", DummyFusedMoE) + + dummy_self = types.SimpleNamespace( + model=types.SimpleNamespace(modules=lambda: [target_module]), + compilation_config=types.SimpleNamespace( + static_forward_context={ + "model.layers.7.mlp.experts": target_module, + "mtp.layers.0.mlp.experts": draft_module, + } + ), + ) + + capturer = types.SimpleNamespace(capture=lambda *_: None) + gmr.GPUModelRunner._bind_routed_experts_capturer(dummy_self, capturer) + + assert target_module.router.capture_fn is not None + assert draft_module.router.capture_fn is None + + def test_routed_experts_capturer_single_dp_no_metadata(): """dp_metadata is None: capture writes the full topk_ids rows.""" capturer = _capturer_with_buffer(dp_rank=0) diff --git a/vllm/v1/worker/gpu_model_runner.py b/vllm/v1/worker/gpu_model_runner.py index ecf8d8ec0d..377fb670e3 100644 --- a/vllm/v1/worker/gpu_model_runner.py +++ b/vllm/v1/worker/gpu_model_runner.py @@ -7589,7 +7589,7 @@ class GPUModelRunner( BaseRouter, ) - for module in self.compilation_config.static_forward_context.values(): + for module in self.model.modules(): if isinstance(module, MoERunner) and isinstance(module.router, BaseRouter): layer_id = module.layer_id