### What this PR does / why we need it?
Fixed the issue where the PCP and MTP services could not be started due
to asynchronous scheduling.
After the pcp, mtp, and asynchronous scheduling functions are enabled,
the service is suspended because of a shape mismatch after a curl
request is sent. This PR resolves this issue.
### Does this PR introduce _any_ user-facing change?
### How was this patch tested?
- vLLM version: v0.13.0
- vLLM main:
2c24bc6996
---------
Signed-off-by: weiguihua2 <weiguihua2@huawei.com>
172 lines
5.5 KiB
Python
172 lines
5.5 KiB
Python
#
|
|
# Copyright (c) 2025 Huawei Technologies Co., Ltd. All Rights Reserved.
|
|
# 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.
|
|
# This file is a part of the vllm-ascend project.
|
|
# Adapted from vllm/tests/basic_correctness/test_basic_correctness.py
|
|
#
|
|
|
|
import os
|
|
import pytest
|
|
|
|
from tests.e2e.conftest import VllmRunner
|
|
from vllm_ascend.utils import vllm_version_is
|
|
|
|
os.environ["HCCL_BUFFSIZE"] = "512"
|
|
|
|
|
|
def test_pcp_dcp_mtp1_eager():
|
|
prompts = [
|
|
"The capital of France is", "Hello, my name is Tom, I am",
|
|
"The president of United States is", "AI future is"
|
|
]
|
|
model = "wemaster/deepseek_mtp_main_random_bf16"
|
|
with VllmRunner(
|
|
model,
|
|
max_model_len=1024,
|
|
tensor_parallel_size=2,
|
|
prefill_context_parallel_size=2,
|
|
decode_context_parallel_size=2,
|
|
max_num_batched_tokens=1024,
|
|
enable_expert_parallel=True,
|
|
block_size=128,
|
|
speculative_config={
|
|
"num_speculative_tokens": 1,
|
|
"method": "deepseek_mtp",
|
|
},
|
|
enforce_eager=True,
|
|
async_scheduling=False,
|
|
) as runner:
|
|
runner.generate_greedy(prompts, 32)
|
|
|
|
|
|
@pytest.mark.skipif(
|
|
not vllm_version_is('0.13.0'),
|
|
reason="vLLM PR-32118 break this",
|
|
)
|
|
def test_pcp_dcp_mtp3_eager():
|
|
prompts = [
|
|
"The capital of France is", "Hello, my name is Tom, I am",
|
|
"The president of United States is", "AI future is"
|
|
]
|
|
model = "wemaster/deepseek_mtp_main_random_bf16"
|
|
with VllmRunner(
|
|
model,
|
|
max_model_len=1024,
|
|
tensor_parallel_size=2,
|
|
prefill_context_parallel_size=2,
|
|
decode_context_parallel_size=2,
|
|
max_num_batched_tokens=1024,
|
|
enable_expert_parallel=True,
|
|
block_size=128,
|
|
async_scheduling=True,
|
|
speculative_config={
|
|
"num_speculative_tokens": 3,
|
|
"method": "deepseek_mtp",
|
|
},
|
|
enforce_eager=True,
|
|
) as runner:
|
|
runner.generate_greedy(prompts, 32)
|
|
|
|
|
|
@pytest.mark.skipif(
|
|
not vllm_version_is('0.13.0'),
|
|
reason="vLLM PR-32118 break this",
|
|
)
|
|
def test_pcp_dcp_mtp3_piecewise_graph():
|
|
prompts = [
|
|
"The capital of France is", "Hello, my name is Tom, I am",
|
|
"The president of United States is", "AI future is"
|
|
]
|
|
model = "wemaster/deepseek_mtp_main_random_bf16"
|
|
with VllmRunner(
|
|
model,
|
|
max_model_len=1024,
|
|
tensor_parallel_size=2,
|
|
prefill_context_parallel_size=2,
|
|
decode_context_parallel_size=2,
|
|
max_num_batched_tokens=1024,
|
|
enable_expert_parallel=True,
|
|
block_size=128,
|
|
speculative_config={
|
|
"num_speculative_tokens": 3,
|
|
"method": "deepseek_mtp",
|
|
},
|
|
compilation_config={
|
|
"cudagraph_mode": "PIECEWISE",
|
|
"cudagraph_capture_sizes": [4, 8, 16],
|
|
},
|
|
async_scheduling=False,
|
|
) as runner:
|
|
runner.generate_greedy(prompts, 32)
|
|
|
|
|
|
@pytest.mark.skipif(
|
|
not vllm_version_is('0.13.0'),
|
|
reason="vLLM PR-32118 break this",
|
|
)
|
|
def test_pcp_dcp_mtp3_full_graph():
|
|
prompts = [
|
|
"The capital of France is", "Hello, my name is Tom, I am",
|
|
"The president of United States is", "AI future is"
|
|
]
|
|
model = "wemaster/deepseek_mtp_main_random_bf16"
|
|
with VllmRunner(
|
|
model,
|
|
max_model_len=1024,
|
|
tensor_parallel_size=2,
|
|
prefill_context_parallel_size=2,
|
|
decode_context_parallel_size=2,
|
|
max_num_batched_tokens=1024,
|
|
enable_expert_parallel=True,
|
|
block_size=128,
|
|
speculative_config={
|
|
"num_speculative_tokens": 3,
|
|
"method": "deepseek_mtp",
|
|
},
|
|
compilation_config={
|
|
"cudagraph_mode": "FULL_DECODE_ONLY",
|
|
"cudagraph_capture_sizes": [4, 8, 16],
|
|
},
|
|
async_scheduling=False,
|
|
) as runner:
|
|
runner.generate_greedy(prompts, 32)
|
|
|
|
|
|
def test_dcp_mtp3_full_graph():
|
|
prompts = [
|
|
"The capital of France is", "Hello, my name is Tom, I am",
|
|
"The president of United States is", "AI future is"
|
|
]
|
|
model = "wemaster/deepseek_mtp_main_random_bf16"
|
|
with VllmRunner(
|
|
model,
|
|
max_model_len=1024,
|
|
tensor_parallel_size=2,
|
|
decode_context_parallel_size=2,
|
|
max_num_batched_tokens=1024,
|
|
enable_expert_parallel=True,
|
|
block_size=128,
|
|
speculative_config={
|
|
"num_speculative_tokens": 3,
|
|
"method": "deepseek_mtp",
|
|
},
|
|
compilation_config={
|
|
"cudagraph_mode": "FULL_DECODE_ONLY",
|
|
"cudagraph_capture_sizes": [4, 8, 16],
|
|
},
|
|
async_scheduling=False,
|
|
) as runner:
|
|
runner.generate_greedy(prompts, 32)
|