[Refactor] refactor humming linear and moe backends to use explicit layer configs (#49610)

Signed-off-by: Jinzhen Lin <jinzhen.ljz@antgroup.com>
Co-authored-by: OpenAI Codex <noreply@openai.com>
This commit is contained in:
Jinzhen Lin
2026-08-07 10:03:19 -07:00
committed by GitHub
co-authored by OpenAI Codex
parent e229fdbc87
commit fcde8e1460
37 changed files with 448 additions and 341 deletions
+9 -13
View File
@@ -1265,11 +1265,10 @@ def _make_humming_indexed_experts(activation: MoEActivation):
layer.intermediate_size_per_partition = intermediate_size
quant_config = humming_utils.get_humming_moe_quant_config(layer)
experts = HummingIndexedExperts(
layer,
moe_config,
quant_config,
moe_config=moe_config,
quant_config=quant_config,
)
return experts
return experts, layer
@pytest.mark.parametrize("activation", list(MoEActivation))
@@ -1328,8 +1327,7 @@ def test_humming_delegates_to_instance_activation():
def test_humming_gated_non_gated_shape_contract(activation: MoEActivation):
from vllm.utils import humming
experts = _make_humming_indexed_experts(activation)
layer = experts.layer
experts, layer = _make_humming_indexed_experts(activation)
moe_config = experts.moe_config
top_k = moe_config.experts_per_token
num_experts = moe_config.num_experts
@@ -1337,7 +1335,7 @@ def test_humming_gated_non_gated_shape_contract(activation: MoEActivation):
intermediate_size = moe_config.intermediate_size
gate_up_size = intermediate_size * 2 if activation.is_gated else intermediate_size
w13_meta, w2_meta = (layer.humming_metas[name] for name in ("w13", "w2"))
w13_meta, w2_meta = (experts.humming_configs[name] for name in ("w13", "w2"))
for meta in (w13_meta, w2_meta):
assert meta.a_dtype == humming.dtypes.bfloat16
assert meta.b_dtype == humming.dtypes.float4e2m1
@@ -1364,7 +1362,7 @@ def test_humming_indexed_writes_supplied_output_buffer():
from vllm.forward_context import set_forward_context
activation = MoEActivation.SILU
experts = _make_humming_indexed_experts(activation)
experts, layer = _make_humming_indexed_experts(activation)
moe_config = experts.moe_config
num_tokens = 1
top_k = moe_config.experts_per_token
@@ -1382,7 +1380,7 @@ def test_humming_indexed_writes_supplied_output_buffer():
)
device = torch.device("cuda")
dtype = experts.layer.params_dtype
dtype = layer.params_dtype
workspace13 = torch.empty(workspace13_shape, dtype=dtype, device=device)
workspace2 = torch.empty(workspace2_shape, dtype=dtype, device=device)
hidden_states = torch.ones((num_tokens, hidden_size), dtype=dtype, device=device)
@@ -1394,14 +1392,12 @@ def test_humming_indexed_writes_supplied_output_buffer():
device=device,
)
topk_ids = torch.arange(top_k, dtype=torch.int32, device=device).unsqueeze(0)
unused = torch.empty((num_experts, 0), device=device)
with set_forward_context(None, vllm_config, num_tokens=num_tokens):
experts.apply(
output=output,
hidden_states=hidden_states,
w1=unused,
w2=unused,
w1=layer.w13_weight,
w2=layer.w2_weight,
topk_weights=topk_weights,
topk_ids=topk_ids,
activation=activation,
-1
View File
@@ -1489,7 +1489,6 @@ def test_rocm_mxfp4_moe_oracle(
mxfp4_backend=backend,
experts_cls=experts_cls,
routing_tables=None,
layer=None,
)
# Create inputs