Skip to content

[MoE Refactor] Combine MoERunnerBase + DefaultMoERunner #40560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robertgshaw2-redhat merged 6 commits into from
Apr 22, 2026
+729 −835
Merged

[MoE Refactor] Combine MoERunnerBase + DefaultMoERunner #40560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4da9a8c
[MoE Refactor] Combine MoERunnerBase + DefaultMoERunner
bnellnm Apr 21, 2026
08fee64
remove factory
bnellnm Apr 21, 2026
8f214e6
renames + collapse a function call layer
bnellnm Apr 21, 2026
d388e4b
renames + review comments
bnellnm Apr 21, 2026
2909f58
Merge remote-tracking branch 'origin/main' into collapse-runner
bnellnm Apr 22, 2026
4d533e9
merge
bnellnm Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions vllm/model_executor/layers/fused_moe/layer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,11 @@
from vllm.model_executor.layers.fused_moe.router.router_factory import (
create_fused_moe_router,
)
from vllm.model_executor.layers.fused_moe.runner.moe_runner_factory import (
create_moe_runner,
from vllm.model_executor.layers.fused_moe.runner.moe_runner import (
MoERunner,
)
from vllm.model_executor.layers.fused_moe.runner.moe_runner_interface import (
MoERunnerInterface,
)
from vllm.model_executor.layers.fused_moe.runner.shared_experts import (
SharedExperts,
Expand Down Expand Up @@ -586,7 +589,7 @@ def _get_quant_method() -> FusedMoEMethodBase:
# Storing the runner in the FusedMoE is an intermediate state, eventually
# the runner will own the FusedMoE layer and provide the execution interface
# for MoE ops.
self.runner = create_moe_runner(
self.runner: MoERunnerInterface = MoERunner(
layer_name=self.layer_name,
moe_config=self.moe_config,
router=self.router,
Expand Down
128 changes: 0 additions & 128 deletions vllm/model_executor/layers/fused_moe/runner/default_moe_runner.py
View file
Open in desktop

This file was deleted.

Loading
Loading