diff --git a/tests/worker/test_gpu_ar_model_runner.py b/tests/worker/test_gpu_ar_model_runner.py index 9d3e5f794..654c50dc7 100644 --- a/tests/worker/test_gpu_ar_model_runner.py +++ b/tests/worker/test_gpu_ar_model_runner.py @@ -2027,18 +2027,6 @@ def test_token_only_output_keeps_prefix_cache_merge(token_only_builder, mocker): assert output.inter_stage_outputs[1]["codes.audio"].tolist() == [32] -def test_token_only_output_keeps_routed_experts(token_only_builder, mocker): - runner, kwargs = token_only_builder - runner.model_config.enable_return_routed_experts = True - runner.routed_experts_initialized = True - routes = np.array([[[1, 2]], [[3, 4]]], dtype=np.int32) - extract = mocker.patch.object(runner, "_omni_extract_routed_experts", return_value=routes) - output = runner._build_omni_model_runner_output_from_snapshot(**kwargs) - - extract.assert_called_once_with(kwargs["scheduler_output"]) - assert output.routed_experts is routes - - @pytest.mark.parametrize("snapshot", [True, False], ids=["background", "inline"]) def test_query_metadata_lifetime_matches_materialization_mode(snapshot): runner = object.__new__(GPUARModelRunner) diff --git a/tests/worker_v2/test_omni_ar_model_runner.py b/tests/worker_v2/test_omni_ar_model_runner.py index fe89df3a2..d3f1b9eb4 100644 --- a/tests/worker_v2/test_omni_ar_model_runner.py +++ b/tests/worker_v2/test_omni_ar_model_runner.py @@ -52,7 +52,7 @@ def _async_output(req_ids=("req-0",), **overrides) -> OmniAsyncOutput: @pytest.mark.parametrize("compact_width", [1, 2]) -def test_async_output_blocking_event_and_routing_masks(monkeypatch, compact_width) -> None: +def test_async_output_blocking_event_preserves_masks_and_aux_output(monkeypatch, compact_width) -> None: event_kwargs = [] monkeypatch.setattr(torch.cuda, "set_stream", lambda _stream: None) @@ -68,7 +68,7 @@ def test_async_output_blocking_event_and_routing_masks(monkeypatch, compact_widt vocab_size=4, ) sampler_output = SamplerOutput( - torch.tensor([[2], [0]]), None, None, torch.tensor([1, 0]), torch.tensor([0, 0]), masks + torch.tensor([[2], [0]]), None, None, torch.tensor([1, 0]), torch.tensor([2, 0]), masks ) copied: list[tuple[np.ndarray, np.ndarray]] = [] @@ -98,7 +98,9 @@ def test_async_output_blocking_event_and_routing_masks(monkeypatch, compact_widt np.testing.assert_array_equal(output.aux_output_connector_output["prefill"].rows, [[4, 5]]) assert output.aux_output_connector_output["decode"].token_start == 0 np.testing.assert_array_equal(output.sampling_masks.token_ids, [0, 2]) - assert len(copied) == 1 and copied[0][0].tolist() == [1, 0] + assert len(copied) == 1 + np.testing.assert_array_equal(copied[0][0], [1, 0]) + np.testing.assert_array_equal(copied[0][1], [2, 0]) @pytest.mark.parametrize("needs_history", [False, True])