Perf/minimax h3 dit swiglu rope cache npu (#6410)

Signed-off-by: Wenjia Li <wjialish@gmail.com>
Co-authored-by: WeiQing Chen <40507679+david6666666@users.noreply.github.com>
This commit is contained in:
Wenjia LiandWeiQing Chen authored and GitHub committed 2026-08-29 09:14:52 +00:00
1 parent bb5bf8fd0a
commit d9980c75e8
11 files changed
+920 -33

No files matched your search

@@ -1,5 +1,5 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
# SPDX-FileCopyrightText: Copyright contributors to the vLLM-Omni project
import pytest
import torch
@@ -113,6 +113,146 @@ def test_h3_rope_table_materializes_local_rows_in_fused_kernel_layout():
torch.testing.assert_close(actual, expected, atol=0, rtol=0)
def test_h3_prepared_rope_table_is_rank_local_and_validated(monkeypatch):
from vllm_omni.diffusion.models.minimax_h3 import minimax_h3_transformer as h3
class Rope(nn.Module):
def forward(self, position_ids):
freqs_half = position_ids[0].float()
return torch.cat((freqs_half, freqs_half), dim=-1)
model = object.__new__(h3.MiniMaxH3DiTModel)
nn.Module.__init__(model)
model.arch = h3.MiniMaxH3DiTArchConfig(rope_inv_freq_len=1)
model.rope = Rope()
model.local_sp_prepare = nn.Identity()
monkeypatch.setattr(h3, "_sequence_parallel_local_span", lambda *args, **kwargs: (1, 2))
position_ids = torch.arange(12, dtype=torch.long).reshape(1, 4, 3)
actual = model.prepare_rope_table(position_ids, seq_len=4)
expected = h3._build_rope_table(model.rope(position_ids[:, 1:3]))
torch.testing.assert_close(actual, expected, atol=0, rtol=0)
model._validate_prepared_rope_table(actual, local_len=2, device=torch.device("cpu"))
with pytest.raises(ValueError, match="local_seq_len"):
model._validate_prepared_rope_table(actual[:1], local_len=2, device=torch.device("cpu"))
def test_denoise_branch_prepares_rope_table_once_per_npu_run(monkeypatch: pytest.MonkeyPatch):
from vllm_omni.diffusion.models.minimax_h3 import denoise_loop
from vllm_omni.diffusion.models.minimax_h3.denoise_loop import (
MiniMaxH3DenoiseBranch,
minimax_h3_denoise_loop,
)
monkeypatch.setattr(denoise_loop.current_omni_platform, "is_npu", lambda: True)
packed = {
"seq_len": torch.tensor(3),
"img_pos": torch.tensor([1]),
"audio_pos": torch.tensor([2]),
"text_pos": torch.tensor([0]),
"update_mask": torch.tensor([True]),
"cu_seqlens": torch.tensor([0, 3, 3], dtype=torch.int32),
"img_position_ids": torch.zeros(3, 3, dtype=torch.long),
"latent_grid": torch.tensor([1, 1, 1]),
"video_row_start": torch.tensor(1),
}
branch = MiniMaxH3DenoiseBranch(
packed=packed,
text_embeddings=torch.zeros(1, 2),
token_tags=torch.zeros(3, dtype=torch.long),
device=torch.device("cpu"),
)
class Model:
def __init__(self):
self.rope_table = torch.zeros(3, 6, dtype=torch.bfloat16)
self.prepare_calls = 0
self.forward_calls = 0
def prepare_rope_table(self, img_position_ids, *, seq_len):
assert img_position_ids is branch.static_kwargs["img_position_ids"]
assert seq_len == 3
self.prepare_calls += 1
return self.rope_table
def __call__(self, **kwargs):
assert kwargs["rope_table"] is self.rope_table
self.forward_calls += 1
return torch.zeros(1, 96), torch.zeros(1, 32)
model = Model()
minimax_h3_denoise_loop(
model=model,
positive=branch,
initial_video_rows=torch.zeros(1, 96),
initial_audio_rows=torch.zeros(1, 32),
keyframe_cond_rows=None,
sigmas_video=[1.0, 0.5, 0.0],
sigmas_audio=[1.0, 0.5, 0.0],
device=torch.device("cpu"),
)
assert model.prepare_calls == 1
assert model.forward_calls == 2
def test_denoise_branch_keeps_rope_construction_on_the_reference_path_off_npu(
monkeypatch: pytest.MonkeyPatch,
):
from vllm_omni.diffusion.models.minimax_h3 import denoise_loop
from vllm_omni.diffusion.models.minimax_h3.denoise_loop import (
MiniMaxH3DenoiseBranch,
minimax_h3_denoise_loop,
)
monkeypatch.setattr(denoise_loop.current_omni_platform, "is_npu", lambda: False)
packed = {
"seq_len": torch.tensor(3),
"img_pos": torch.tensor([1]),
"audio_pos": torch.tensor([2]),
"text_pos": torch.tensor([0]),
"update_mask": torch.tensor([True]),
"cu_seqlens": torch.tensor([0, 3, 3], dtype=torch.int32),
"img_position_ids": torch.zeros(3, 3, dtype=torch.long),
"latent_grid": torch.tensor([1, 1, 1]),
"video_row_start": torch.tensor(1),
}
branch = MiniMaxH3DenoiseBranch(
packed=packed,
text_embeddings=torch.zeros(1, 2),
token_tags=torch.zeros(3, dtype=torch.long),
device=torch.device("cpu"),
)
class Model:
def __init__(self):
self.forward_calls = 0
def prepare_rope_table(self, *_args, **_kwargs):
raise AssertionError("the reference path must not pre-build a rope_table")
def __call__(self, **kwargs):
assert "rope_table" not in kwargs
self.forward_calls += 1
return torch.zeros(1, 96), torch.zeros(1, 32)
model = Model()
minimax_h3_denoise_loop(
model=model,
positive=branch,
initial_video_rows=torch.zeros(1, 96),
initial_audio_rows=torch.zeros(1, 32),
keyframe_cond_rows=None,
sigmas_video=[1.0, 0.5, 0.0],
sigmas_audio=[1.0, 0.5, 0.0],
device=torch.device("cpu"),
)
assert model.forward_calls == 2
def test_strict_sp_local_span_uses_rank_owned_rows(monkeypatch):
from vllm_omni.diffusion import forward_context
from vllm_omni.diffusion.distributed import parallel_state