[Perf][DSV4.1] Pad shared experts for native MegaMoE fusion (#56568)
Signed-off-by: Canlin <canlinguosdu@gmail.com> Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
@@ -367,17 +367,21 @@ def test_deepseek_v4_mega_moe_padding_preserves_weights(monkeypatch, intermediat
|
||||
[
|
||||
pytest.param(128, 512, 128, True, False, id="aligned-block128"),
|
||||
pytest.param(128, 512, 128, True, True, id="aligned-block128-mxfp8"),
|
||||
pytest.param(5120, 2304, 32, False, False, id="deepseek-v41-flash"),
|
||||
pytest.param(5120, 2304, 32, True, False, id="deepseek-v41-flash"),
|
||||
pytest.param(128, 2304, 128, True, False, id="padded-block128"),
|
||||
pytest.param(5120, 2304, 32, True, True, id="deepseek-v41-flash-mxfp8"),
|
||||
pytest.param(128, 2304, 128, False, False, id="padded-packed-scale-fallback"),
|
||||
],
|
||||
)
|
||||
def test_deepseek_v4_mega_moe_finalizes_native_shared_expert_weights(
|
||||
monkeypatch, hidden_size, intermediate_size, block_size, fused, mxfp8
|
||||
):
|
||||
"""V4.1-Flash's routed padding must preserve the serial shared-expert fallback."""
|
||||
"""Shared fusion preserves checkpoint channels and zeros padded channels."""
|
||||
|
||||
class FakeDeepGemm:
|
||||
transformed_dims: list[tuple[int, int]] = []
|
||||
scale_inputs: list[tuple[int, ...]] = []
|
||||
scale_values: list[torch.Tensor] = []
|
||||
|
||||
@staticmethod
|
||||
def get_symm_buffer_for_mega_moe(*args, num_shared_experts=0, **kwargs):
|
||||
@@ -402,6 +406,7 @@ def test_deepseek_v4_mega_moe_finalizes_native_shared_expert_weights(
|
||||
@classmethod
|
||||
def transform_sf_into_required_layout(cls, sf, mn, k, *args, **kwargs):
|
||||
cls.scale_inputs.append(tuple(sf.shape))
|
||||
cls.scale_values.append(sf)
|
||||
return torch.empty((sf.shape[0], mn, k // 128), dtype=torch.int32)
|
||||
|
||||
@classmethod
|
||||
@@ -429,7 +434,10 @@ def test_deepseek_v4_mega_moe_finalizes_native_shared_expert_weights(
|
||||
|
||||
def fp8_parameter(*shape):
|
||||
return torch.nn.Parameter(
|
||||
torch.empty(*shape, dtype=torch.float8_e4m3fn), requires_grad=False
|
||||
torch.empty(*shape, dtype=torch.uint8)
|
||||
.random_(1, 119)
|
||||
.view(torch.float8_e4m3fn),
|
||||
requires_grad=False,
|
||||
)
|
||||
|
||||
def scale_parameter(*shape, dtype=torch.int32):
|
||||
@@ -460,21 +468,34 @@ def test_deepseek_v4_mega_moe_finalizes_native_shared_expert_weights(
|
||||
linear.weight_block_size = (1, 32)
|
||||
linear.weight_scale = torch.nn.Parameter(
|
||||
linear.weight_scale_inv.view(torch.uint8)
|
||||
.repeat_interleave(128, dim=0)
|
||||
.repeat_interleave(4, dim=1),
|
||||
.repeat_interleave(block_size, dim=0)
|
||||
.repeat_interleave(block_size // 32, dim=1),
|
||||
requires_grad=False,
|
||||
)
|
||||
del linear.weight_scale_inv
|
||||
originals = []
|
||||
for linear in (shared_experts.gate_up_proj, shared_experts.down_proj):
|
||||
scale = linear.weight_scale if mxfp8 else linear.weight_scale_inv
|
||||
if not fused:
|
||||
# Already packed scales cannot be padded as checkpoint UE8M0 bytes.
|
||||
linear.weight_scale_inv = scale_parameter(
|
||||
linear.weight.shape[0], linear.weight.shape[1] // 128
|
||||
)
|
||||
continue
|
||||
scale.data.view(torch.uint8).random_(124, 130)
|
||||
block_m, block_k = linear.weight_block_size
|
||||
scale_1x32 = (
|
||||
experts._ue8m0_uint8_to_float(scale.view(torch.uint8))
|
||||
.repeat_interleave(block_m, dim=0)
|
||||
.repeat_interleave(block_k // 32, dim=1)
|
||||
)
|
||||
originals.append((linear.weight.view(torch.uint8).clone(), scale_1x32))
|
||||
monkeypatch.setattr("vllm.utils.deep_gemm._import_deep_gemm", lambda: FakeDeepGemm)
|
||||
|
||||
original_gate_up_ptr = shared_experts.gate_up_proj.weight.data_ptr()
|
||||
original_down_ptr = shared_experts.down_proj.weight.data_ptr()
|
||||
experts.finalize_weights(shared_experts)
|
||||
|
||||
assert FakeDeepGemm.scale_inputs[-2:] == [
|
||||
(1, 2 * intermediate_size, hidden_size // 32),
|
||||
(1, hidden_size, intermediate_size // 32),
|
||||
]
|
||||
assert experts.has_fused_shared_experts is fused
|
||||
if not fused:
|
||||
assert experts.intermediate_size == 2560
|
||||
@@ -490,15 +511,56 @@ def test_deepseek_v4_mega_moe_finalizes_native_shared_expert_weights(
|
||||
return
|
||||
|
||||
assert FakeDeepGemm.transformed_dims == [(3, 3), (2, 2)]
|
||||
assert shared_experts.gate_up_proj.weight.data_ptr() != original_gate_up_ptr
|
||||
assert (
|
||||
experts._transformed_shared_l1_weights[0].data_ptr()
|
||||
== shared_experts.gate_up_proj.weight.data_ptr()
|
||||
)
|
||||
assert (
|
||||
experts._transformed_shared_l2_weights[0].data_ptr()
|
||||
== shared_experts.down_proj.weight.data_ptr()
|
||||
)
|
||||
padded_size = experts.intermediate_size
|
||||
assert FakeDeepGemm.scale_inputs[-2:] == [
|
||||
(1, 2 * padded_size, hidden_size // 32),
|
||||
(1, hidden_size, padded_size // 32),
|
||||
]
|
||||
for actual, original, fill in (
|
||||
(
|
||||
experts._transformed_shared_l1_weights[0].view(torch.uint8),
|
||||
originals[0][0],
|
||||
0,
|
||||
),
|
||||
(FakeDeepGemm.scale_values[-2][0], originals[0][1], 1),
|
||||
):
|
||||
actual = actual.unflatten(0, (2, padded_size))
|
||||
assert torch.equal(
|
||||
actual[:, :intermediate_size], original.unflatten(0, (2, intermediate_size))
|
||||
)
|
||||
assert torch.all(actual[:, intermediate_size:] == fill)
|
||||
for actual, original, fill in (
|
||||
(
|
||||
experts._transformed_shared_l2_weights[0].view(torch.uint8),
|
||||
originals[1][0],
|
||||
0,
|
||||
),
|
||||
(FakeDeepGemm.scale_values[-1][0], originals[1][1], 1),
|
||||
):
|
||||
assert torch.equal(actual[:, : original.shape[1]], original)
|
||||
assert torch.all(actual[:, original.shape[1] :] == fill)
|
||||
if padded_size != intermediate_size:
|
||||
# Generic linear post-load hooks still receive checkpoint-shaped weights.
|
||||
for linear, (weight, _) in zip(
|
||||
(shared_experts.gate_up_proj, shared_experts.down_proj), originals
|
||||
):
|
||||
assert torch.equal(linear.weight.view(torch.uint8), weight)
|
||||
assert shared_experts.gate_up_proj.weight.data_ptr() == original_gate_up_ptr
|
||||
assert shared_experts.down_proj.weight.data_ptr() == original_down_ptr
|
||||
else:
|
||||
assert shared_experts.gate_up_proj.weight.data_ptr() != original_gate_up_ptr
|
||||
assert (
|
||||
experts._transformed_shared_l1_weights[0].data_ptr()
|
||||
== shared_experts.gate_up_proj.weight.data_ptr()
|
||||
)
|
||||
assert (
|
||||
experts._transformed_shared_l2_weights[0].data_ptr()
|
||||
== shared_experts.down_proj.weight.data_ptr()
|
||||
)
|
||||
|
||||
transformed_l1 = experts._transformed_shared_l1_weights
|
||||
experts.finalize_weights(shared_experts)
|
||||
assert experts._transformed_shared_l1_weights is transformed_l1
|
||||
|
||||
|
||||
@pytest.mark.parametrize("fused", [False, True])
|
||||
|
||||
Reference in New Issue
Block a user