[Bugfix] Remove extra args from CPU's compute slot mapping kernel (#61992)
Signed-off-by: Fadi Arafeh <fadi.arafeh@arm.com> Co-authored-by: vllm-agent <claw@inferact.ai>
This commit is contained in:
co-authored by
vllm-agent
parent
dcd07967ca
commit
556ac15eb9
@@ -220,3 +220,44 @@ def test_real_triton_kernel_override_end_to_end() -> None:
|
||||
"out_ptr",
|
||||
"BLOCK",
|
||||
)
|
||||
|
||||
|
||||
def test_cpu_slot_mapping_override_forwards_kernel_arguments(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
) -> None:
|
||||
from vllm.utils import cpu_triton_utils
|
||||
from vllm.v1.worker.block_table import ComputeSlotMappingKernel
|
||||
|
||||
calls: list[tuple[Any, ...]] = []
|
||||
fake_torch = types.SimpleNamespace(
|
||||
ops=types.SimpleNamespace(
|
||||
_C=types.SimpleNamespace(
|
||||
compute_slot_mapping_kernel_impl=lambda *args: calls.append(args)
|
||||
)
|
||||
)
|
||||
)
|
||||
monkeypatch.setattr(cpu_triton_utils, "torch", fake_torch)
|
||||
|
||||
override = KernelOverride(
|
||||
ComputeSlotMappingKernel.kernel,
|
||||
cpu_triton_utils._compute_slot_mapping_kernel_impl,
|
||||
)
|
||||
override[(2,)](
|
||||
num_tokens=2,
|
||||
max_num_tokens=4,
|
||||
query_start_loc_ptr="query_start_loc",
|
||||
positions_ptr="positions",
|
||||
block_table_ptr="block_table",
|
||||
block_table_stride=128,
|
||||
slot_mapping_ptr="slot_mapping",
|
||||
KV_CACHE_BLOCK_SIZE=16,
|
||||
TOTAL_CP_WORLD_SIZE=1,
|
||||
TOTAL_CP_RANK=0,
|
||||
CP_KV_CACHE_INTERLEAVE_SIZE=1,
|
||||
PAD_ID=-1,
|
||||
BLOCK_SIZE=1024,
|
||||
)
|
||||
|
||||
assert calls == [
|
||||
("query_start_loc", "positions", "block_table", "slot_mapping", 16)
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user