Bugfix: use PCP slot mappings for PIECEWISE capture (#53869)

Signed-off-by: QiuChunshuo <qiuchunshuo@huawei.com>
This commit is contained in:
Qiu Chunshuo
2026-08-27 05:39:36 +00:00
committed by GitHub
parent f25c580af1
commit b3af042abd
5 changed files with 64 additions and 3 deletions
+8 -1
View File
@@ -42,6 +42,7 @@ from vllm.v1.worker.utils import AttentionGroup
if TYPE_CHECKING:
from vllm.v1.worker.gpu.model_runner import GPUModelRunner
from vllm.v1.worker.gpu.pcp_manager import PCPManager
logger = init_logger(__name__)
@@ -494,6 +495,7 @@ class ModelCudaGraphManager(CudaGraphManager):
block_tables: BlockTables,
attn_groups: list[list[AttentionGroup]],
kv_cache_config: KVCacheConfig,
pcp_manager: "PCPManager | None" = None,
has_lora: bool = False,
use_aux_hidden_state_outputs: bool = False,
lora_capture_hook: Callable[[int, int, int], None] | None = None,
@@ -543,6 +545,7 @@ class ModelCudaGraphManager(CudaGraphManager):
kv_cache_config,
full_cudagraph=desc.cg_mode == CUDAGraphMode.FULL,
max_query_len=desc.max_query_len,
pcp_manager=pcp_manager,
)
# Capture with dummy rows marked as padding.
@@ -635,12 +638,16 @@ def prepare_inputs_to_capture(
kv_cache_config: KVCacheConfig,
full_cudagraph: bool,
max_query_len: int | None = None,
pcp_manager: "PCPManager | None" = None,
) -> AttentionState:
input_batch = InputBatch.make_dummy(
num_reqs, num_tokens, input_buffers, max_query_len=max_query_len
)
input_block_tables = block_tables.get_dummy_block_tables(num_reqs)
slot_mappings = block_tables.get_dummy_slot_mappings(num_tokens)
slot_mapping_provider: BlockTables | PCPManager = block_tables
if pcp_manager is not None:
slot_mapping_provider = pcp_manager
slot_mappings = slot_mapping_provider.get_dummy_slot_mappings(num_tokens)
slot_mappings_by_layer = build_slot_mappings_by_layer(
slot_mappings, kv_cache_config
)
+1
View File
@@ -920,6 +920,7 @@ class GPUModelRunner(LoRAModelRunnerMixin):
self.block_tables,
self.attn_groups,
self.kv_cache_config,
pcp_manager=self.pcp_manager,
has_lora=self.lora_config is not None,
use_aux_hidden_state_outputs=self.use_aux_hidden_state_outputs,
lora_capture_hook=create_lora_capture_hook(self.lora_config, self),