<!-- Thanks for sending a pull request! BEFORE SUBMITTING, PLEASE READ https://docs.vllm.ai/en/latest/contributing/overview.html --> ### What this PR does / why we need it? As custom deepseek modeling do some changes to support graph mode in https://github.com/vllm-project/vllm-ascend/pull/585, so i follow it to change custom deepseek_mtp modeling. And some modifications for k>1 were not carried over by the https://github.com/vllm-project/vllm-ascend/pull/429, now i add it. In order to better take care of the MTP feature in the vllm-ascend repository, I added cases related to graph mode(torchair), but i skip it since torchair can not correctly clean up memory in vllmrunner. Also i add some case for MTP quantization weights, but test weight is not ready, so i skip it and i will open it when test quant weights is ready. https://github.com/vllm-project/vllm-ascend/pull/648 did not completely fix the sample change(https://github.com/vllm-project/vllm-ascend/issues/660) issue, I added the relevant changes. ### Does this PR introduce _any_ user-facing change? now, u can use following method to use mtp in deepseek v3/r1 float or quant weights with eager mode. ```python llm = LLM( model="wemaster/deepseek_mtp_main_random_bf16", tensor_parallel_size=2, speculative_config={ "num_speculative_tokens": 1, }, enforce_eager=True, trust_remote_code=True, disable_log_stats=False, gpu_memory_utilization=0.8, max_model_len=64, ) ``` or use mtp in deepseek v3/r1 float or quant weights with graph mode(torchair) ```python llm = LLM( model="wemaster/deepseek_mtp_main_random_bf16", tensor_parallel_size=2, speculative_config={ "num_speculative_tokens": 1, }, trust_remote_code=True, additional_config={ 'enable_graph_mode': True, }, disable_log_stats=False, gpu_memory_utilization=0.8, max_model_len=64, ) ``` add notes: 1. now, we support k>1, so u can set num_speculative_tokens > 1 if there is sufficient redundant computing power; 2. MTP is not supported in V1, we will support it when vLLM does it in https://github.com/vllm-project/vllm/issues/13500. 3. if u run MTP failed by `segmentation fault`, u can follow v0.7.3 patch https://github.com/vllm-project/vllm-ascend/pull/236 file `vllm_ascend/patch/patch_metrics.py` method `__npu_async_metrics_collector_init__` ### How was this patch tested? local tested passed and test by CI Signed-off-by: mengwei805 <mengwei25@huawei.com>
275 lines
9.8 KiB
Python
275 lines
9.8 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/e2e/conftest.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.
|
|
#
|
|
|
|
import shutil
|
|
from itertools import cycle
|
|
from pathlib import Path
|
|
from typing import List, Optional, Sequence, Tuple, Union
|
|
|
|
import pytest
|
|
import torch
|
|
from vllm import LLM, SamplingParams
|
|
from vllm.distributed import cleanup_dist_env_and_memory
|
|
from vllm.model_executor.utils import set_random_seed
|
|
from vllm.sequence import PromptLogprobs, SampleLogprobs
|
|
|
|
from ....model_utils import (TokensTextLogprobs,
|
|
TokensTextLogprobsPromptLogprobs,
|
|
check_logprobs_close, check_outputs_equal)
|
|
|
|
PROMPTS = [
|
|
"Hello, my name is",
|
|
"The president of the United States is",
|
|
"The capital of France is",
|
|
"The future of AI is",
|
|
"San Francisco is know for its",
|
|
"Facebook was created in 2004 by",
|
|
"Curious George is a",
|
|
"Python 3.11 brings improvements to its",
|
|
]
|
|
|
|
|
|
@pytest.fixture
|
|
def test_llm_generator(common_llm_kwargs, per_test_common_llm_kwargs,
|
|
test_llm_kwargs, seed):
|
|
|
|
def generate():
|
|
kwargs = {
|
|
**common_llm_kwargs,
|
|
**per_test_common_llm_kwargs,
|
|
**test_llm_kwargs,
|
|
}
|
|
|
|
llm = LLM(**kwargs)
|
|
|
|
if seed is not None:
|
|
set_random_seed(seed)
|
|
|
|
yield llm
|
|
|
|
del llm
|
|
cleanup_dist_env_and_memory()
|
|
|
|
return generate
|
|
|
|
|
|
def maybe_assert_ngram_worker(llm):
|
|
# Verify the proposer worker is ngram if ngram is specified.
|
|
if (llm.llm_engine.speculative_config is not None
|
|
and llm.llm_engine.speculative_config.method == "ngram"):
|
|
from vllm.spec_decode.ngram_worker import NGramWorker
|
|
assert isinstance(
|
|
llm.llm_engine.model_executor.driver_worker.proposer_worker,
|
|
NGramWorker)
|
|
|
|
|
|
def get_output_from_llm_generator(
|
|
llm_generator, prompts,
|
|
sampling_params) -> Tuple[List[str], List[List[int]], float]:
|
|
tokens: List[str] = []
|
|
token_ids: List[List[int]] = []
|
|
acceptance_rate: float = -1.0
|
|
for llm in llm_generator():
|
|
maybe_assert_ngram_worker(llm)
|
|
|
|
outputs = llm.generate(prompts, sampling_params, use_tqdm=True)
|
|
|
|
token_ids = [output.outputs[0].token_ids for output in outputs]
|
|
tokens = [output.outputs[0].text for output in outputs]
|
|
|
|
# Fetch acceptance rate if logging is enabled.
|
|
if stat_loggers := getattr(llm.llm_engine, "stat_loggers", None):
|
|
stat_logger = stat_loggers["prometheus"]
|
|
acceptance_rate = (stat_logger.metrics.
|
|
gauge_spec_decode_draft_acceptance_rate.labels(
|
|
**stat_logger.labels)._value.get())
|
|
del llm
|
|
|
|
return tokens, token_ids, acceptance_rate
|
|
|
|
|
|
def check_logprobs_correctness(
|
|
spec_outputs: Sequence[Union[TokensTextLogprobs,
|
|
TokensTextLogprobsPromptLogprobs]],
|
|
baseline_outputs: Sequence[Union[TokensTextLogprobs,
|
|
TokensTextLogprobsPromptLogprobs]],
|
|
disable_logprobs: bool = False,
|
|
):
|
|
"""Compare sampled and prompt logprobs between baseline and spec decoding
|
|
"""
|
|
if not disable_logprobs:
|
|
return check_logprobs_close(
|
|
outputs_0_lst=baseline_outputs,
|
|
outputs_1_lst=spec_outputs,
|
|
name_0="org",
|
|
name_1="sd",
|
|
)
|
|
|
|
# Check correctness when disable_logprobs == True
|
|
for spec_output, baseline_output in zip(spec_outputs, baseline_outputs):
|
|
# Check generated token logprobs.
|
|
spec_logprobs = spec_output[2]
|
|
baseline_logprobs = baseline_output[2]
|
|
_check_logprobs_when_output_disabled(spec_logprobs,
|
|
baseline_logprobs,
|
|
is_prompt_logprobs=False)
|
|
|
|
# Check prompt logprobs too, if they exist
|
|
if len(baseline_output) == 4:
|
|
assert len(spec_output) == 4
|
|
spec_prompt_logprobs = spec_output[3]
|
|
baseline_prompt_logprobs = baseline_output[3]
|
|
_check_logprobs_when_output_disabled(spec_prompt_logprobs,
|
|
baseline_prompt_logprobs,
|
|
is_prompt_logprobs=True)
|
|
|
|
|
|
def _check_logprobs_when_output_disabled(
|
|
spec_logprobs: Union[Optional[PromptLogprobs], SampleLogprobs],
|
|
baseline_logprobs: Union[Optional[PromptLogprobs], SampleLogprobs],
|
|
is_prompt_logprobs: bool = False,
|
|
):
|
|
# Prompt logprobs are optional
|
|
if is_prompt_logprobs and baseline_logprobs is None:
|
|
assert spec_logprobs is None
|
|
return
|
|
|
|
assert spec_logprobs is not None
|
|
assert baseline_logprobs is not None
|
|
assert len(spec_logprobs) == len(baseline_logprobs)
|
|
|
|
# For each generated position of the sequence.
|
|
for pos, (spec_pos_logprobs, baseline_pos_logprobs) in enumerate(
|
|
zip(spec_logprobs, baseline_logprobs)):
|
|
|
|
# First prompt logprob is expected to be None
|
|
if is_prompt_logprobs and baseline_pos_logprobs is None:
|
|
assert spec_pos_logprobs is None
|
|
assert pos == 0
|
|
continue
|
|
|
|
assert spec_pos_logprobs is not None
|
|
assert baseline_pos_logprobs is not None
|
|
|
|
# When disabled, the 1 logprob is returned with dummy values for the
|
|
# score and rank, but the token id should match the baseline model
|
|
assert len(spec_pos_logprobs) == 1
|
|
(spec_pos_logprob_token_id,
|
|
spec_pos_logprob) = next(iter(spec_pos_logprobs.items()))
|
|
assert spec_pos_logprob.rank == -1
|
|
assert spec_pos_logprob.logprob == 0.0
|
|
if isinstance(spec_pos_logprob_token_id, torch.Tensor):
|
|
spec_pos_logprob_token_id = spec_pos_logprob_token_id.item()
|
|
assert spec_pos_logprob_token_id in baseline_pos_logprobs
|
|
|
|
|
|
def _clean_torchair_cache():
|
|
cache_path = Path.cwd() / '.torchair_cache'
|
|
if cache_path.exists() and cache_path.is_dir():
|
|
shutil.rmtree(cache_path)
|
|
|
|
|
|
def run_equality_correctness_test(
|
|
vllm_runner,
|
|
common_llm_kwargs,
|
|
per_test_common_llm_kwargs,
|
|
baseline_llm_kwargs,
|
|
test_llm_kwargs,
|
|
batch_size: int,
|
|
max_output_len: int,
|
|
seed: Optional[int] = 0,
|
|
temperature: float = 0.0,
|
|
disable_seed: bool = False,
|
|
ignore_eos: bool = True,
|
|
ensure_all_accepted: bool = False,
|
|
expected_acceptance_rate: Optional[float] = None,
|
|
logprobs: Optional[int] = None,
|
|
prompt_logprobs: Optional[int] = None,
|
|
disable_logprobs: bool = False):
|
|
|
|
org_args = {
|
|
**common_llm_kwargs,
|
|
**per_test_common_llm_kwargs,
|
|
**baseline_llm_kwargs,
|
|
}
|
|
|
|
sd_args = {
|
|
**common_llm_kwargs,
|
|
**per_test_common_llm_kwargs,
|
|
**test_llm_kwargs,
|
|
}
|
|
|
|
prompts = [prompt for prompt, _ in zip(cycle(PROMPTS), range(batch_size))]
|
|
|
|
if disable_seed:
|
|
seed = None
|
|
|
|
sampling_params = SamplingParams(temperature=temperature,
|
|
max_tokens=max_output_len,
|
|
seed=seed,
|
|
ignore_eos=ignore_eos,
|
|
logprobs=logprobs,
|
|
prompt_logprobs=prompt_logprobs)
|
|
|
|
# TODO current torchair graph mode needs clean torchair cache.
|
|
# if do not clean, it will raise error
|
|
additional_config = common_llm_kwargs.get("additional_config")
|
|
enable_graph_mode = additional_config.get(
|
|
"enable_graph_mode") if additional_config else False
|
|
|
|
with vllm_runner(**org_args) as vllm_model:
|
|
if enable_graph_mode:
|
|
_clean_torchair_cache()
|
|
org_outputs = vllm_model.generate_w_logprobs(prompts, sampling_params)
|
|
|
|
with vllm_runner(**sd_args) as vllm_model:
|
|
if enable_graph_mode:
|
|
_clean_torchair_cache()
|
|
if ensure_all_accepted or expected_acceptance_rate is not None:
|
|
# Force log interval to be 0 to catch all metrics.
|
|
stat_logger = vllm_model.model.llm_engine.stat_loggers[
|
|
'prometheus']
|
|
stat_logger.local_interval = -100
|
|
|
|
sd_outputs = vllm_model.generate_w_logprobs(prompts, sampling_params)
|
|
|
|
if ensure_all_accepted or expected_acceptance_rate is not None:
|
|
acceptance_rate = (stat_logger.metrics.
|
|
gauge_spec_decode_draft_acceptance_rate.labels(
|
|
**stat_logger.labels)._value.get())
|
|
|
|
if ensure_all_accepted:
|
|
assert True
|
|
# FIXME: ci fails to log acceptance rate.
|
|
# It works locally.
|
|
# assert acceptance_rate == 1.0
|
|
|
|
if expected_acceptance_rate is not None:
|
|
assert acceptance_rate >= expected_acceptance_rate - 1e-2
|
|
|
|
# Only pass token entries, not the logprobs
|
|
check_outputs_equal(outputs_0_lst=[out[0:2] for out in org_outputs],
|
|
outputs_1_lst=[out[0:2] for out in sd_outputs],
|
|
name_0="org",
|
|
name_1="sd")
|
|
|
|
# Check logprobs if requested
|
|
if logprobs is not None or prompt_logprobs is not None:
|
|
check_logprobs_correctness(sd_outputs, org_outputs, disable_logprobs)
|