[Feat] Support PP with PCP in GPU Model Runner V2 (#59139)
Signed-off-by: QiuChunshuo <qiuchunshuo@huawei.com> Co-authored-by: Lucas Wilkinson <LucasWilkinson@users.noreply.github.com>
This commit is contained in:
co-authored by
Lucas Wilkinson
parent
2e52a558f0
commit
98b45c1a94
@@ -3,6 +3,7 @@
|
||||
|
||||
import contextlib
|
||||
from types import SimpleNamespace
|
||||
from unittest.mock import Mock
|
||||
|
||||
import pytest
|
||||
import torch
|
||||
@@ -18,7 +19,43 @@ from vllm.v1.kv_cache_interface import (
|
||||
UniformTypeKVCacheSpecs,
|
||||
)
|
||||
from vllm.v1.worker.gpu.block_table import BlockTables
|
||||
from vllm.v1.worker.gpu.model_runner import GPUModelRunner
|
||||
from vllm.v1.worker.gpu.model_runner import ExecuteModelState, GPUModelRunner
|
||||
|
||||
|
||||
def test_non_last_pp_rank_uses_global_batch_for_sample_feedback():
|
||||
runner = GPUModelRunner.__new__(GPUModelRunner)
|
||||
runner.is_last_pp_rank = False
|
||||
local_batch = object()
|
||||
global_batch = SimpleNamespace(idx_mapping=object())
|
||||
runner.pcp_manager = SimpleNamespace(
|
||||
global_batch=global_batch,
|
||||
restore_for_sampling=Mock(),
|
||||
)
|
||||
runner.pp_handler = SimpleNamespace(receive=Mock(return_value=False))
|
||||
runner.postprocess_num_computed_tokens = Mock()
|
||||
runner.model_state = SimpleNamespace(postprocess_state=Mock())
|
||||
runner.kv_connector = SimpleNamespace(post_forward=Mock(return_value=None))
|
||||
runner.eplb = SimpleNamespace(step=Mock())
|
||||
runner.execute_model_state = ExecuteModelState(
|
||||
input_batch=local_batch,
|
||||
attn_metadata=None,
|
||||
slot_mappings_by_layer=None,
|
||||
hidden_states=None,
|
||||
aux_hidden_states=None,
|
||||
dp_sync=None,
|
||||
finished_req_ids=set(),
|
||||
ec_connector_output=None,
|
||||
cudagraph_stats=None,
|
||||
)
|
||||
|
||||
runner.sample_tokens(None)
|
||||
|
||||
runner.pp_handler.receive.assert_called_once_with(global_batch)
|
||||
runner.postprocess_num_computed_tokens.assert_called_once_with(global_batch)
|
||||
runner.model_state.postprocess_state.assert_called_once_with(
|
||||
global_batch.idx_mapping, 0
|
||||
)
|
||||
runner.pcp_manager.restore_for_sampling.assert_not_called()
|
||||
|
||||
|
||||
def test_qsa_circular_group_uses_custom_slot_mapping(monkeypatch):
|
||||
|
||||
@@ -79,6 +79,7 @@ def _make_runner(**overrides: Any) -> Any:
|
||||
runner.use_aux_hidden_state_outputs = False
|
||||
runner.speculative_config = None
|
||||
runner.speculator = None
|
||||
runner.pcp_manager = None
|
||||
runner.num_speculative_steps = 0
|
||||
runner.encoder_cache = None
|
||||
runner.is_pooling_model = False
|
||||
|
||||
Reference in New Issue
Block a user