cfe77e83ae
[Bugfix]Support Qwen3-MOE on aclgraph mode in sizes capture and add new
ut
What this PR does / why we need it?
This PR solves the problem of sizes capture and stream error caused by
using ACLgraph on the Qwen3-30B MOE model.
Add new ut.
Does this PR introduce any user-facing change?
no
How was this patch tested?
ut
- vLLM version: v0.10.1.1
- vLLM main:
6fad29b11b
Signed-off-by: lilinsiman <lilinsiman@gmail.com>
109 lines
3.2 KiB
Python
109 lines
3.2 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
|
|
#
|
|
"""Compare the short outputs of HF and vLLM when using greedy sampling.
|
|
|
|
Run `pytest tests/e2e/multicard/test_qwen3_moe.py`.
|
|
"""
|
|
|
|
import os
|
|
|
|
from modelscope import snapshot_download # type: ignore
|
|
|
|
from tests.e2e.conftest import VllmRunner
|
|
|
|
|
|
def test_models_distributed_Qwen3_MOE_TP2():
|
|
example_prompts = [
|
|
"Hello, my name is",
|
|
]
|
|
dtype = "half"
|
|
max_tokens = 5
|
|
with VllmRunner(
|
|
"Qwen/Qwen3-30B-A3B",
|
|
dtype=dtype,
|
|
tensor_parallel_size=2,
|
|
distributed_executor_backend="mp",
|
|
) as vllm_model:
|
|
vllm_model.generate_greedy(example_prompts, max_tokens)
|
|
|
|
|
|
def test_models_distributed_Qwen3_MOE_TP2_WITH_EP():
|
|
example_prompts = [
|
|
"Hello, my name is",
|
|
]
|
|
dtype = "half"
|
|
max_tokens = 5
|
|
with VllmRunner(
|
|
"Qwen/Qwen3-30B-A3B",
|
|
dtype=dtype,
|
|
tensor_parallel_size=2,
|
|
enable_expert_parallel=True,
|
|
distributed_executor_backend="mp",
|
|
) as vllm_model:
|
|
vllm_model.generate_greedy(example_prompts, max_tokens)
|
|
|
|
|
|
def test_models_distributed_Qwen3_MOE_W8A8():
|
|
example_prompts = [
|
|
"Hello, my name is",
|
|
]
|
|
dtype = "auto"
|
|
max_tokens = 5
|
|
with VllmRunner(
|
|
snapshot_download("vllm-ascend/Qwen3-30B-A3B-W8A8"),
|
|
max_model_len=8192,
|
|
dtype=dtype,
|
|
tensor_parallel_size=2,
|
|
quantization="ascend",
|
|
enforce_eager=False,
|
|
) as vllm_model:
|
|
vllm_model.generate_greedy(example_prompts, max_tokens)
|
|
|
|
|
|
def test_models_distributed_Qwen3_MOE_TP2_WITH_ACLGRAPH_AIV():
|
|
os.environ['HCCL_OP_EXPANSION_MODE'] = 'AIV'
|
|
example_prompts = [
|
|
"Hello, my name is",
|
|
]
|
|
dtype = "auto"
|
|
max_tokens = 5
|
|
with VllmRunner(
|
|
"Qwen/Qwen3-30B-A3B",
|
|
dtype=dtype,
|
|
tensor_parallel_size=2,
|
|
enforce_eager=False,
|
|
) as vllm_model:
|
|
vllm_model.generate_greedy(example_prompts, max_tokens)
|
|
|
|
|
|
def test_models_distributed_Qwen3_MOE_TP2_WITH_ACLGRAPH():
|
|
if 'HCCL_OP_EXPANSION_MODE' in os.environ:
|
|
del os.environ['HCCL_OP_EXPANSION_MODE']
|
|
example_prompts = [
|
|
"Hello, my name is",
|
|
]
|
|
dtype = "auto"
|
|
max_tokens = 5
|
|
with VllmRunner(
|
|
"Qwen/Qwen3-30B-A3B",
|
|
dtype=dtype,
|
|
tensor_parallel_size=2,
|
|
enforce_eager=False,
|
|
) as vllm_model:
|
|
vllm_model.generate_greedy(example_prompts, max_tokens) |