Skip to content

Commit 359c157

Browse files
Merge branch 'vllm-project:main' into main
2 parents 2b4eb21 + 72eceff commit 359c157

File tree

79 files changed

+2383
-2991
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2383
-2991
lines changed

.github/Dockerfile.buildwheel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515
# This file is a part of the vllm-ascend project.
1616
#
17-
ARG PY_VERSION=3.10
17+
ARG PY_VERSION=3.11
1818
FROM quay.io/ascend/manylinux:8.0.0-910b-manylinux_2_28-py${PY_VERSION}
1919

2020
ARG COMPILE_CUSTOM_KERNELS=1

.github/actionlint.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
self-hosted-runner:
22
# Labels of self-hosted runner in array of strings.
33
labels:
4-
- linux-arm64-npu-1
5-
- linux-arm64-npu-2
6-
- linux-arm64-npu-4
4+
- linux-aarch64-a2-0
5+
- linux-aarch64-a2-1
6+
- linux-aarch64-a2-2
7+
- linux-aarch64-a2-4
8+
- linux-aarch64-a2-8
79
- linux-arm64-npu-static-8
10+
- linux-aarch64-310p-1
11+
- linux-aarch64-310p-2
12+
- linux-aarch64-310p-4
813
- ubuntu-24.04-arm

.github/workflows/accuracy_test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ jobs:
8585
}}
8686
runs-on: >-
8787
${{
88-
(matrix.model_name == 'Qwen/Qwen3-30B-A3B' && 'linux-arm64-npu-4') ||
89-
'linux-arm64-npu-2'
88+
(matrix.model_name == 'Qwen/Qwen3-30B-A3B' && 'linux-aarch64-a2-2') ||
89+
'linux-aarch64-a2-1'
9090
}}
9191
strategy:
9292
matrix:

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/checkout@v4
1515
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
1616
with:
17-
python-version: "3.10"
17+
python-version: "3.11"
1818
- run: echo "::add-matcher::.github/workflows/matchers/actionlint.json"
1919
- run: echo "::add-matcher::.github/workflows/matchers/mypy.json"
2020
- name: Checkout vllm-project/vllm repo

.github/workflows/release_code.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
runs-on: ubuntu-latest
4242
strategy:
4343
matrix:
44-
python-version: ["3.10"]
44+
python-version: ["3.11"]
4545
steps:
4646
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4747

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: PR Reminder Comment Bot
2+
permissions:
3+
pull-requests: write
4+
on:
5+
pull_request_target:
6+
types: [opened]
7+
jobs:
8+
pr_reminder:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Remind to run full CI on PR
12+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
13+
with:
14+
script: |
15+
github.rest.issues.createComment({
16+
owner: context.repo.owner,
17+
repo: context.repo.repo,
18+
issue_number: context.issue.number,
19+
body: '👋 Hi! Thank you for contributing to the vLLM Ascend project. The following points will speed up your PR merge:‌‌\n\n' +
20+
'- A PR should do only one thing, smaller PRs enable faster reviews.\n' +
21+
'- Every PR should include unit tests and end-to-end tests ‌to ensure it works and is not broken by other future PRs.\n' +
22+
'- Write the commit message by fulfilling the PR description to help reviewer and future developers understand.\n\n' +
23+
'If CI fails, you can run linting and testing checks locally according [Contributing](https://vllm-ascend.readthedocs.io/zh-cn/latest/developer_guide/contribution/index.html) and [Testing](https://vllm-ascend.readthedocs.io/zh-cn/latest/developer_guide/contribution/testing.html).'
24+
})
25+
env:
26+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/vllm_ascend_doctest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
matrix:
4949
vllm_verison: [v0.9.1-dev, v0.9.1-dev-openeuler, main, main-openeuler]
5050
name: vLLM Ascend test
51-
runs-on: linux-arm64-npu-1
51+
runs-on: linux-aarch64-a2-1
5252
container:
5353
image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/vllm-ascend:${{ matrix.vllm_verison }}
5454
steps:

.github/workflows/vllm_ascend_test.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
strategy:
137137
max-parallel: 2
138138
matrix:
139-
os: [linux-arm64-npu-1]
139+
os: [linux-aarch64-a2-1]
140140
vllm_version: [main, v0.10.0]
141141
name: singlecard e2e test
142142
runs-on: ${{ matrix.os }}
@@ -203,7 +203,8 @@ jobs:
203203
--ignore=tests/e2e/singlecard/test_camem.py \
204204
--ignore=tests/e2e/singlecard/test_embedding.py \
205205
--ignore=tests/e2e/singlecard/spec_decode_v1/test_v1_mtp_correctness.py \
206-
--ignore=tests/e2e/singlecard/spec_decode_v1/test_v1_spec_decode.py
206+
--ignore=tests/e2e/singlecard/spec_decode_v1/test_v1_spec_decode.py \
207+
--ignore=tests/e2e/singlecard/test_offline_inference_310p.py
207208
# ------------------------------------ v1 spec decode test ------------------------------------ #
208209
VLLM_USE_MODELSCOPE=True pytest -sv tests/e2e/singlecard/spec_decode_v1/test_v1_mtp_correctness.py
209210
# TODO: revert me when test_v1_spec_decode.py::test_ngram_correctness is fixed
@@ -213,9 +214,9 @@ jobs:
213214
needs: [e2e]
214215
if: ${{ needs.e2e.result == 'success' }}
215216
strategy:
216-
max-parallel: 1
217+
max-parallel: 2
217218
matrix:
218-
os: [linux-arm64-npu-4]
219+
os: [linux-aarch64-a2-2]
219220
vllm_version: [main, v0.10.0]
220221
name: multicard e2e test
221222
runs-on: ${{ matrix.os }}
@@ -275,10 +276,11 @@ jobs:
275276
# To avoid oom, we need to run the test in a single process.
276277
pytest -sv tests/e2e/multicard/test_offline_inference_distributed.py::test_models_distributed_DeepSeek_multistream_moe
277278
pytest -sv tests/e2e/multicard/test_offline_inference_distributed.py::test_models_distributed_QwQ
278-
pytest -sv tests/e2e/multicard/test_offline_inference_distributed.py::test_models_distributed_DeepSeek_W8A8
279279
pytest -sv tests/e2e/multicard/test_offline_inference_distributed.py::test_models_distributed_DeepSeek_dbo
280280
pytest -sv tests/e2e/multicard/test_offline_inference_distributed.py::test_models_distributed_DeepSeekV3_dbo
281+
pytest -sv tests/e2e/multicard/test_offline_inference_distributed.py::test_models_distributed_Qwen3_W4A8DYNAMIC
281282
pytest -sv tests/e2e/multicard/test_data_parallel.py
282283
pytest -sv tests/e2e/multicard/ --ignore=tests/e2e/multicard/test_ilama_lora_tp2.py \
283284
--ignore=tests/e2e/multicard/test_offline_inference_distributed.py \
284-
--ignore=tests/e2e/multicard/test_data_parallel.py
285+
--ignore=tests/e2e/multicard/test_data_parallel.py \
286+
--ignore=tests/e2e/multicard/test_offline_inference_310p.py
Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
#
2+
# Copyright (c) 2025 Huawei Technologies Co., Ltd. All Rights Reserved.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
# This file is a part of the vllm-ascend project.
16+
#
17+
18+
name: 'e2e test / 310p-test'
19+
20+
on:
21+
push:
22+
tags:
23+
- 'v*'
24+
schedule:
25+
# Runs every 6 hours
26+
- cron: '0 */6 * * *'
27+
pull_request:
28+
types: [ labeled ]
29+
30+
# Bash shells do not use ~/.profile or ~/.bashrc so these shells need to be explicitly
31+
# declared as "shell: bash -el {0}" on steps that need to be properly activated.
32+
# It's used to activate ascend-toolkit environment variables.
33+
defaults:
34+
run:
35+
shell: bash -el {0}
36+
37+
# only cancel in-progress runs of the same workflow
38+
# and ignore the lint / 1 card / 4 cards test type
39+
concurrency:
40+
group: ${{ github.workflow }}-${{ github.ref }}
41+
cancel-in-progress: true
42+
43+
jobs:
44+
e2e:
45+
# e2e-310p-test will be triggered when tag 'e2e-310p-test' & 'ready-for-test' or schedule job
46+
if: >-
47+
${{
48+
(contains(github.event.pull_request.labels.*.name, 'e2e-310p-test')) &&
49+
contains(github.event.pull_request.labels.*.name, 'ready-for-test') ||
50+
github.event_name == 'schedule' || github.event_name == 'push'
51+
}}
52+
strategy:
53+
max-parallel: 2
54+
matrix:
55+
os: [linux-aarch64-310p-1, linux-aarch64-310p-4]
56+
vllm_version: [main, v0.10.0]
57+
name: 310p e2e test
58+
runs-on: ${{ matrix.os }}
59+
container:
60+
# TODO(yikun): Remove m.daocloud.io prefix when infra proxy ready
61+
image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.1.rc1-310p-ubuntu22.04-py3.10
62+
env:
63+
VLLM_LOGGING_LEVEL: ERROR
64+
VLLM_USE_MODELSCOPE: True
65+
steps:
66+
- name: Check npu and CANN info
67+
run: |
68+
npu-smi info
69+
cat /usr/local/Ascend/ascend-toolkit/latest/"$(uname -i)"-linux/ascend_toolkit_install.info
70+
71+
- name: Config mirrors
72+
run: |
73+
sed -Ei 's@(ports|archive)[email protected]:8081@g' /etc/apt/sources.list
74+
pip config set global.index-url http://cache-service.nginx-pypi-cache.svc.cluster.local/pypi/simple
75+
pip config set global.trusted-host cache-service.nginx-pypi-cache.svc.cluster.local
76+
apt-get update -y
77+
apt install git -y
78+
79+
- name: Checkout vllm-project/vllm-ascend repo
80+
uses: actions/checkout@v4
81+
82+
- name: Install system dependencies
83+
run: |
84+
apt-get -y install `cat packages.txt`
85+
apt-get -y install git vim wget net-tools gcc g++ cmake libnuma-dev curl gnupg2
86+
87+
- name: Checkout vllm-project/vllm repo
88+
uses: actions/checkout@v4
89+
with:
90+
repository: vllm-project/vllm
91+
ref: ${{ matrix.vllm_version }}
92+
path: ./vllm-empty
93+
94+
- name: Install vllm-project/vllm from source
95+
working-directory: ./vllm-empty
96+
run: |
97+
VLLM_TARGET_DEVICE=empty pip install -e .
98+
99+
- name: Install vllm-project/vllm-ascend
100+
run: |
101+
export PIP_EXTRA_INDEX_URL=https://mirrors.huaweicloud.com/ascend/repos/pypi
102+
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/x86_64-linux/devlib
103+
export SOC_VERSION=ASCEND310P3
104+
pip install -r requirements-dev.txt
105+
pip install -v -e .
106+
107+
- name: Run e2e test
108+
env:
109+
VLLM_WORKER_MULTIPROC_METHOD: spawn
110+
VLLM_USE_MODELSCOPE: True
111+
PYTORCH_NPU_ALLOC_CONF: max_split_size_mb:256
112+
run: |
113+
if [[ "${{ matrix.os }}" == "linux-aarch64-310p-1" ]]; then
114+
pytest -sv tests/e2e/singlecard/test_offline_inference_310p.py
115+
else
116+
pytest -sv tests/e2e/multicard/test_offline_inference_310p.py
117+
fi

.github/workflows/vllm_ascend_test_long_term.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
strategy:
4343
max-parallel: 2
4444
matrix:
45-
os: [linux-arm64-npu-1, linux-arm64-npu-4]
45+
os: [linux-aarch64-a2-1, linux-aarch64-a2-2]
4646
vllm_version: [main, v0.10.0]
4747
name: vLLM Ascend long term test
4848
runs-on: ${{ matrix.os }}

0 commit comments

Comments
 (0)