[2/5] [core]refactor communication layer: PR 2 of 5 Qwen3 Omni non async (#2677)
Signed-off-by: natureofnature <wzliu@connect.hku.hk> Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
This commit is contained in:
1 parent
c7178d89bb
commit
82a0b3a467
20 files changed
+1223
-100
No files matched your search
@@ -5,6 +5,7 @@ import pytest
|
||||
import torch
|
||||
|
||||
from vllm_omni.worker.gpu_model_runner import OmniGPUModelRunner
|
||||
from vllm_omni.worker.omni_connector_model_runner_mixin import OmniConnectorModelRunnerMixin
|
||||
|
||||
pytestmark = [pytest.mark.core_model, pytest.mark.cpu]
|
||||
|
||||
@@ -330,6 +331,117 @@ def test_update_intermediate_buffer_skips_unknown_req_id():
|
||||
assert "unknown_req" not in runner.model_intermediate_buffer
|
||||
|
||||
|
||||
def _make_full_payload_accumulation_runner(
|
||||
model_arch="Qwen3OmniMoeForConditionalGeneration",
|
||||
model_stage="talker",
|
||||
async_chunk=False,
|
||||
):
|
||||
runner = object.__new__(OmniConnectorModelRunnerMixin)
|
||||
runner.model_config = SimpleNamespace(
|
||||
model_arch=model_arch,
|
||||
model_stage=model_stage,
|
||||
async_chunk=async_chunk,
|
||||
)
|
||||
runner._custom_process_func = object()
|
||||
runner._pending_full_payload_send = {}
|
||||
runner._stage_id = 1
|
||||
return runner
|
||||
|
||||
|
||||
def test_accumulate_full_payload_output_preserves_aligned_all_zero_qwen3_omni_codec_rows():
|
||||
runner = _make_full_payload_accumulation_runner()
|
||||
request = SimpleNamespace(output_token_ids=[0, 1])
|
||||
codes = torch.zeros((2, 3), dtype=torch.long)
|
||||
|
||||
OmniConnectorModelRunnerMixin.accumulate_full_payload_output(runner, "r1", {"codes.audio": codes}, request)
|
||||
|
||||
stored, _ = OmniConnectorModelRunnerMixin._materialize_full_payload_entry(runner._pending_full_payload_send["r1"])
|
||||
assert torch.equal(stored["codes.audio"], codes)
|
||||
|
||||
|
||||
def test_accumulate_full_payload_output_keeps_misaligned_all_zero_qwen3_omni_codec_rows():
|
||||
# After removing the sender-side zero filter, the accumulator keeps every
|
||||
# codec row including misaligned all-zero rows. The downstream consumer
|
||||
# (_extract_qwen3_full_payload_codec_rows) is the authoritative crop and
|
||||
# filters by output_token_ids.
|
||||
runner = _make_full_payload_accumulation_runner()
|
||||
request = SimpleNamespace(output_token_ids=[0, 1])
|
||||
codes = torch.zeros((1, 3), dtype=torch.long)
|
||||
|
||||
OmniConnectorModelRunnerMixin.accumulate_full_payload_output(runner, "r1", {"codes.audio": codes}, request)
|
||||
|
||||
stored, _ = OmniConnectorModelRunnerMixin._materialize_full_payload_entry(runner._pending_full_payload_send["r1"])
|
||||
assert "codes.audio" in stored
|
||||
assert torch.equal(stored["codes.audio"], codes)
|
||||
|
||||
|
||||
def test_accumulate_full_payload_output_preserves_incremental_aligned_all_zero_qwen3_omni_codec_rows():
|
||||
runner = _make_full_payload_accumulation_runner()
|
||||
request = SimpleNamespace(output_token_ids=[0, 1])
|
||||
runner._pending_full_payload_send["r1"] = (
|
||||
{"codes.audio": torch.ones((1, 3), dtype=torch.long)},
|
||||
request,
|
||||
)
|
||||
codes = torch.zeros((1, 3), dtype=torch.long)
|
||||
|
||||
OmniConnectorModelRunnerMixin.accumulate_full_payload_output(runner, "r1", {"codes.audio": codes}, request)
|
||||
|
||||
stored, _ = OmniConnectorModelRunnerMixin._materialize_full_payload_entry(runner._pending_full_payload_send["r1"])
|
||||
assert stored["codes.audio"].shape == (2, 3)
|
||||
assert torch.equal(stored["codes.audio"][1], torch.zeros(3, dtype=torch.long))
|
||||
|
||||
|
||||
def test_accumulate_full_payload_output_keeps_all_zero_qwen3_omni_prefill_placeholder():
|
||||
# Prefill placeholder rows (output_token_ids empty) are no longer dropped
|
||||
# at the sender. The consumer-side crop trims them off using
|
||||
# output_token_ids, so the end-to-end semantics are unchanged.
|
||||
runner = _make_full_payload_accumulation_runner()
|
||||
request = SimpleNamespace(output_token_ids=[])
|
||||
codes = torch.zeros((2, 3), dtype=torch.long)
|
||||
|
||||
OmniConnectorModelRunnerMixin.accumulate_full_payload_output(runner, "r1", {"codes.audio": codes}, request)
|
||||
|
||||
stored, _ = OmniConnectorModelRunnerMixin._materialize_full_payload_entry(runner._pending_full_payload_send["r1"])
|
||||
assert "codes.audio" in stored
|
||||
assert torch.equal(stored["codes.audio"], codes)
|
||||
|
||||
|
||||
def test_full_payload_output_accumulation_hook_matrix():
|
||||
assert _make_full_payload_accumulation_runner(model_stage="thinker")._should_accumulate_full_payload_output()
|
||||
assert _make_full_payload_accumulation_runner(model_stage="talker")._should_accumulate_full_payload_output()
|
||||
assert not _make_full_payload_accumulation_runner(model_stage="code2wav")._should_accumulate_full_payload_output()
|
||||
assert not _make_full_payload_accumulation_runner(
|
||||
model_stage="talker", async_chunk=True
|
||||
)._should_accumulate_full_payload_output()
|
||||
assert not _make_full_payload_accumulation_runner(
|
||||
model_arch="Qwen3TTSForConditionalGeneration"
|
||||
)._should_accumulate_full_payload_output()
|
||||
assert not _make_full_payload_accumulation_runner(
|
||||
model_arch="Qwen2_5OmniForConditionalGeneration"
|
||||
)._should_accumulate_full_payload_output()
|
||||
|
||||
|
||||
def test_sync_local_stage_payloads_retains_payload_until_request_is_active():
|
||||
runner = object.__new__(OmniGPUModelRunner)
|
||||
payload = {"codes": {"audio": [1, 2, 3]}}
|
||||
runner._local_stage_payload_cache = {"late": payload}
|
||||
runner._full_payload_pending_broadcast_req_ids = set()
|
||||
runner.requests = {}
|
||||
runner.model_intermediate_buffer = {}
|
||||
|
||||
OmniGPUModelRunner._sync_local_stage_payloads(runner)
|
||||
|
||||
assert runner._local_stage_payload_cache == {"late": payload}
|
||||
assert runner.model_intermediate_buffer == {}
|
||||
|
||||
runner.requests = {"late": DummyReqState()}
|
||||
OmniGPUModelRunner._sync_local_stage_payloads(runner)
|
||||
|
||||
assert runner._local_stage_payload_cache == {}
|
||||
assert runner.model_intermediate_buffer["late"] == payload
|
||||
assert runner.requests["late"].additional_information_cpu == payload
|
||||
|
||||
|
||||
def test_maybe_attach_mimo_audio_req_infos_enriches_dict():
|
||||
runner = _make_runner_for_mimo()
|
||||
req_id = "r_mimo"
|
||||
|
||||
Reference in new issue
Block a user