Add topk logits torch op for DS3.2. (#25945)
Signed-off-by: Daniel Campora <961215+dcampora@users.noreply.github.com> Signed-off-by: Daniel Cámpora <961215+dcampora@users.noreply.github.com> Co-authored-by: youkaichao <youkaichao@gmail.com>
This commit is contained in:
143
tests/kernels/test_top_k_per_row.py
Normal file
143
tests/kernels/test_top_k_per_row.py
Normal file
@@ -0,0 +1,143 @@
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
||||
|
||||
import numpy as np
|
||||
import pytest
|
||||
import torch
|
||||
|
||||
from vllm.platforms import current_platform
|
||||
|
||||
# Test parameters
|
||||
NUM_ROWS = [1, 32, 2050]
|
||||
TOP_K_VALUES = [2048]
|
||||
|
||||
|
||||
def create_random_logits(
|
||||
row_starts: torch.Tensor,
|
||||
row_ends: torch.Tensor,
|
||||
vocab_size: int,
|
||||
dtype: torch.dtype,
|
||||
seed: int,
|
||||
) -> torch.Tensor:
|
||||
"""Create random logits tensor for testing."""
|
||||
torch.manual_seed(seed)
|
||||
np.random.seed(seed)
|
||||
# Generate logits with some structure to make testing more meaningful
|
||||
logits = torch.randn(row_starts.shape[0], max(row_ends), dtype=dtype, device="cuda")
|
||||
for i, end in enumerate(row_ends):
|
||||
logits[i, end:] = float("-inf")
|
||||
return logits
|
||||
|
||||
|
||||
def create_row_boundaries(
|
||||
seq_len: int, vocab_size: int
|
||||
) -> tuple[torch.Tensor, torch.Tensor]:
|
||||
"""Create row start and end indices for testing."""
|
||||
row_starts = torch.zeros(seq_len, dtype=torch.int32, device="cuda")
|
||||
row_ends = torch.arange(1, seq_len + 1, device="cuda", dtype=torch.int32)
|
||||
return row_starts, row_ends
|
||||
|
||||
|
||||
def compare_top_k_results(
|
||||
cuda_indices: torch.Tensor,
|
||||
cuda_values: torch.Tensor,
|
||||
torch_indices: torch.Tensor,
|
||||
torch_values: torch.Tensor,
|
||||
row_starts: torch.Tensor,
|
||||
row_ends: torch.Tensor,
|
||||
top_k: int,
|
||||
tolerance: float = 1e-5,
|
||||
) -> bool:
|
||||
"""
|
||||
Compare results from CUDA top_k_per_row with torch.topk.
|
||||
Both results should be sorted and contain the same top-k elements.
|
||||
"""
|
||||
num_rows = cuda_indices.shape[0]
|
||||
|
||||
for row_idx in range(num_rows):
|
||||
# Get valid elements using row boundaries
|
||||
row_start = row_starts[row_idx].item()
|
||||
row_end = row_ends[row_idx].item()
|
||||
row_length = row_end - row_start
|
||||
num_valid = min(top_k, row_length)
|
||||
cuda_row_indices = cuda_indices[row_idx][:num_valid].cpu()
|
||||
torch_row_indices = torch_indices[row_idx][:num_valid].cpu()
|
||||
|
||||
# Compare the sets of indices first
|
||||
cuda_set = set(cuda_row_indices.tolist())
|
||||
torch_set = set(torch_row_indices.tolist())
|
||||
if cuda_set == torch_set:
|
||||
continue
|
||||
|
||||
# Any difference in elements, compare the values
|
||||
cuda_row_values = cuda_values[row_idx][:num_valid].cpu()
|
||||
torch_row_values = torch_values[row_idx][:num_valid].cpu()
|
||||
|
||||
cuda_only_values, torch_only_values = [], []
|
||||
for idx in cuda_set - torch_set:
|
||||
cuda_pos = (cuda_row_indices == idx).nonzero(as_tuple=True)[0]
|
||||
cuda_only_values.append(cuda_row_values[cuda_pos[0]])
|
||||
|
||||
for idx in torch_set - cuda_set:
|
||||
torch_pos = (torch_row_indices == idx).nonzero(as_tuple=True)[0]
|
||||
torch_only_values.append(torch_row_values[torch_pos[0]])
|
||||
|
||||
if len(cuda_only_values) != len(torch_only_values):
|
||||
return False
|
||||
if not torch.allclose(
|
||||
torch.tensor(cuda_only_values),
|
||||
torch.tensor(torch_only_values),
|
||||
rtol=tolerance,
|
||||
atol=tolerance,
|
||||
):
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
|
||||
@pytest.mark.parametrize("num_rows", NUM_ROWS)
|
||||
@pytest.mark.parametrize("top_k", TOP_K_VALUES)
|
||||
@pytest.mark.skipif(not current_platform.is_cuda(), reason="This test requires CUDA")
|
||||
@torch.inference_mode()
|
||||
def test_top_k_per_row(
|
||||
num_rows: int,
|
||||
top_k: int,
|
||||
) -> None:
|
||||
"""
|
||||
Test top_k_per_row.
|
||||
"""
|
||||
torch.set_default_device("cuda:0")
|
||||
|
||||
# Create test data
|
||||
vocab_size = 20000
|
||||
row_starts, row_ends = create_row_boundaries(num_rows, vocab_size)
|
||||
logits = create_random_logits(row_starts, row_ends, vocab_size, torch.float32, 42)
|
||||
|
||||
# Create output tensors
|
||||
indices = torch.empty((num_rows, 2048), dtype=torch.int32, device="cuda")
|
||||
values = torch.empty((num_rows, 2048), dtype=torch.float32, device="cuda")
|
||||
|
||||
# Run CUDA implementation
|
||||
torch.ops._C.top_k_per_row(
|
||||
logits,
|
||||
row_starts,
|
||||
row_ends,
|
||||
indices,
|
||||
values,
|
||||
num_rows,
|
||||
top_k,
|
||||
logits.stride(0),
|
||||
logits.stride(1),
|
||||
)
|
||||
|
||||
# Run reference implementation
|
||||
torch_values, torch_indices = logits.topk(min(top_k, max(row_ends)), dim=-1)
|
||||
mask_lo = torch_indices >= 0
|
||||
mask_hi = (torch_indices - (row_ends - row_starts)[:, None]) < 0
|
||||
mask = mask_lo & mask_hi
|
||||
torch_indices = torch_indices.masked_fill(~mask, -1)
|
||||
|
||||
# Compare results
|
||||
assert compare_top_k_results(
|
||||
indices, values, torch_indices, torch_values, row_starts, row_ends, top_k
|
||||
), "CUDA top_k_per_row results don't match torch.topk"
|
||||
Reference in New Issue
Block a user