1. remove some useless test func and file 2. fix format.sh problem 3. enable full test for singlecard and multicard 4. move long term test to long_term folder. For this kind of test, it only runs by labeled and daily test. Include: spec decode、accuracy test ## After refactor: There are 4 test modules - `singlecard`: contains the test running on one NPU. It'll be run for each PR and daily test. - `multicard`: contains the test running on multi NPUs. It'll be run for each PR and daily test. - `long_term`: contains the test that cost much time(Now include `spec decode` and `accuracy` test). It'll be run for the PR with `long-term-test` labeled and daily test. - `e2e`: contains the test for doc and pd feature. It'll be run for the PR with `pd-test` labeled and daily test. ## Todo: 1. some test are skipped, they should be fixed and reenabled in the future. 2. pyhccl test for multicard doesn't work at all. It should be enabled as well. 3. ensure long-term-test pass by daily test. ### Know issue Now, `ready` labels is required to start pd test or long term test. And when `long-term-test` or `pd-test` is labeled after another one, the old labeled test will be re-run again. So the labeled test should be ran in the following step: 1. decide which test need run, then label it. `long-term-test` or `pd-test` or both. 2. add `ready-for-test` label, then the test will be ran. Signed-off-by: wangxiyuan <wangxiyuan1007@gmail.com>
166 lines
5.5 KiB
Python
166 lines
5.5 KiB
Python
#
|
|
# Copyright (c) 2025 Huawei Technologies Co., Ltd. All Rights Reserved.
|
|
# This file is a part of the vllm-ascend project.
|
|
# Adapted from vllm-project/vllm/tests/spec_decode/test_utils.py
|
|
# Copyright 2023 The vLLM team.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
from unittest.mock import MagicMock
|
|
|
|
import pytest
|
|
import torch
|
|
from vllm.model_executor.layers.rejection_sampler import RejectionSampler
|
|
from vllm.model_executor.layers.sampler import _get_ranks
|
|
from vllm.model_executor.layers.typical_acceptance_sampler import \
|
|
TypicalAcceptanceSampler
|
|
from vllm.sequence import SequenceGroupMetadata, get_all_seq_ids
|
|
from vllm.spec_decode.util import (get_sampled_token_logprobs,
|
|
split_batch_by_proposal_len)
|
|
|
|
|
|
def test_get_all_seq_ids():
|
|
"""Verify get_all_seq_ids extracts all seq ids.
|
|
"""
|
|
expected_seq_ids = list(range(10)) + list(range(100, 110))
|
|
|
|
seq_group_metadata_list = [
|
|
SequenceGroupMetadata(
|
|
request_id=str(seq_id),
|
|
is_prompt=True,
|
|
seq_data={
|
|
seq_id: MagicMock(),
|
|
},
|
|
sampling_params=MagicMock(),
|
|
block_tables={
|
|
seq_id: MagicMock(),
|
|
},
|
|
lora_request=None,
|
|
) for seq_id in expected_seq_ids
|
|
]
|
|
|
|
actual_seq_ids = get_all_seq_ids(seq_group_metadata_list)
|
|
assert actual_seq_ids == expected_seq_ids
|
|
|
|
|
|
@pytest.fixture
|
|
def fake_sequence_group_metadata():
|
|
seq_ids = list(range(3))
|
|
return [
|
|
SequenceGroupMetadata(
|
|
request_id=str(i),
|
|
is_prompt=True,
|
|
seq_data={
|
|
i: MagicMock(),
|
|
},
|
|
sampling_params=MagicMock(),
|
|
block_tables={
|
|
i: MagicMock(),
|
|
},
|
|
lora_request=None,
|
|
) for i in seq_ids
|
|
]
|
|
|
|
|
|
def test_filter_zero_length_proposals(fake_sequence_group_metadata):
|
|
proposal_lens = [0, 1, 0]
|
|
_, (filtered_groups,
|
|
indices) = split_batch_by_proposal_len(fake_sequence_group_metadata,
|
|
proposal_lens)
|
|
|
|
expected_groups = [
|
|
fake_sequence_group_metadata[0], fake_sequence_group_metadata[2]
|
|
]
|
|
expected_indices = [0, 2]
|
|
|
|
assert filtered_groups == expected_groups
|
|
assert indices == expected_indices
|
|
|
|
|
|
def test_filter_non_zero_length_proposals(fake_sequence_group_metadata):
|
|
proposal_lens = [0, 1, 2]
|
|
(filtered_groups,
|
|
indices), _ = split_batch_by_proposal_len(fake_sequence_group_metadata,
|
|
proposal_lens)
|
|
|
|
expected_groups = [
|
|
fake_sequence_group_metadata[1], fake_sequence_group_metadata[2]
|
|
]
|
|
expected_indices = [1, 2]
|
|
|
|
assert filtered_groups == expected_groups
|
|
assert indices == expected_indices
|
|
|
|
|
|
def test_empty_inputs():
|
|
_, (filtered_groups, indices) = split_batch_by_proposal_len([], [])
|
|
|
|
assert filtered_groups == []
|
|
assert indices == []
|
|
|
|
|
|
def test_all_zero_with_non_zero_filter(fake_sequence_group_metadata):
|
|
proposal_lens = [0, 0, 0]
|
|
(filtered_groups,
|
|
indices), _ = split_batch_by_proposal_len(fake_sequence_group_metadata,
|
|
proposal_lens)
|
|
|
|
assert filtered_groups == []
|
|
assert indices == []
|
|
|
|
|
|
def test_all_non_zero_with_zero_filter(fake_sequence_group_metadata):
|
|
proposal_lens = [1, 1, 1]
|
|
_, (filtered_groups,
|
|
indices) = split_batch_by_proposal_len(fake_sequence_group_metadata,
|
|
proposal_lens)
|
|
|
|
assert filtered_groups == []
|
|
assert indices == []
|
|
|
|
|
|
def mock_spec_decode_sampler(acceptance_sampler_method):
|
|
"""
|
|
Returns either a RejectionSampler or TypicalAcceptanceSampler
|
|
object depending on whether acceptance_sampler_method is
|
|
'rejection_sampler' or 'typical_acceptance_sampler' respectively.
|
|
"""
|
|
if acceptance_sampler_method == "rejection_sampler":
|
|
sampler = MagicMock(spec=RejectionSampler)
|
|
sampler.token_id_dtype = torch.int64
|
|
return sampler
|
|
elif acceptance_sampler_method == "typical_acceptance_sampler":
|
|
sampler = MagicMock(spec=TypicalAcceptanceSampler)
|
|
sampler.token_id_dtype = torch.int64
|
|
return sampler
|
|
else:
|
|
raise ValueError(f"Invalid sampler name {acceptance_sampler_method}")
|
|
|
|
|
|
def test_get_sampled_token_logprobs():
|
|
"""Verify get_sampled_token_logprobs returns consistent rankings
|
|
with regular get_ranks when probabilities match exactly.
|
|
"""
|
|
logprob_tensor = torch.tensor(
|
|
[[[-.1, -.1]] * 2]) # shape (num_steps, batch_size, vocab_size)
|
|
sampled_token_tensor = torch.tensor([[1,
|
|
0]]) # shape (num_steps, batch_size)
|
|
ranks_spec_dec, _ = get_sampled_token_logprobs(logprob_tensor,
|
|
sampled_token_tensor)
|
|
|
|
ranks_regular = _get_ranks(logprob_tensor.reshape((2, -1)),
|
|
sampled_token_tensor.reshape(-1))
|
|
|
|
assert torch.equal(ranks_spec_dec.reshape(-1), ranks_regular)
|