Skip to content

Commit a8c7838

Browse files
YikunYikun
committed
test 092rc1
Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
1 parent 9c886d0 commit a8c7838

12 files changed

+82
-82
lines changed

‎.github/workflows/accuracy_test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ on:
3737
# Current supported vLLM versions
3838
options:
3939
- main
40-
- v0.9.1
40+
- v0.9.2rc1
4141
- v0.7.3
4242
vllm-ascend-version:
4343
description: 'vllm-ascend version:'
@@ -163,7 +163,7 @@ jobs:
163163
repository: vllm-project/vllm
164164
path: ./vllm-empty
165165
# Please also update this when bump matched version
166-
ref: ${{ github.event.inputs.vllm-version || 'v0.9.1' }}
166+
ref: ${{ github.event.inputs.vllm-version || 'v0.9.2rc1' }}
167167

168168
- name: Install vllm-project/vllm from source
169169
working-directory: ./vllm-empty

‎.github/workflows/nightly_benchmarks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
strategy:
5151
matrix:
5252
include:
53-
- vllm_branch: v0.9.1
53+
- vllm_branch: v0.9.2rc1
5454
vllm_ascend_branch: main
5555
vllm_use_v1: 1
5656
max-parallel: 1

‎.github/workflows/vllm_ascend_test.yaml

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -66,76 +66,76 @@ concurrency:
6666
cancel-in-progress: true
6767

6868
jobs:
69-
lint:
70-
# Only trigger lint on pull request
71-
if: ${{ github.event_name == 'pull_request' }}
72-
runs-on: ubuntu-latest
73-
strategy:
74-
matrix:
75-
python-version: ["3.10"]
76-
steps:
77-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
78-
- name: Set up Python ${{ matrix.python-version }}
79-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
80-
with:
81-
python-version: ${{ matrix.python-version }}
82-
- name: Install dependencies
83-
run: |
84-
python -m pip install --upgrade pip
85-
pip install -r requirements-lint.txt
86-
- name: Run codespell check
87-
run: |
88-
CODESPELL_EXCLUDES=('--skip' 'tests/prompts/**,./benchmarks/sonnet.txt,*tests/lora/data/**,build/**,./vllm_ascend.egg-info/**')
89-
CODESPELL_IGNORE_WORDS=('-L' 'CANN,cann,NNAL,nnal,ASCEND,ascend,EnQue,CopyIn,assertIn,rever')
90-
91-
codespell --toml pyproject.toml "${CODESPELL_EXCLUDES[@]}" "${CODESPELL_IGNORE_WORDS[@]}"
92-
- name: Analysing the code with ruff
93-
run: |
94-
echo "::add-matcher::.github/workflows/matchers/ruff.json"
95-
ruff check --output-format github .
96-
- name: Run isort
97-
run: |
98-
isort . --check-only
99-
- name: Running yapf
100-
run: |
101-
python -m pip install --upgrade pip
102-
pip install toml
103-
pip install yapf==0.32.0
104-
yapf --diff --recursive .
105-
106-
- name: Install dependencies
107-
run: |
108-
pip install -r requirements-dev.txt --extra-index-url https://download.pytorch.org/whl/cpu
109-
110-
- name: Checkout vllm-project/vllm repo
111-
uses: actions/checkout@v4
112-
with:
113-
repository: vllm-project/vllm
114-
path: vllm-empty
115-
116-
- name: Actionlint Check
117-
env:
118-
SHELLCHECK_OPTS: --exclude=SC2046,SC2006,SC2086
119-
run: |
120-
echo "::add-matcher::.github/workflows/matchers/actionlint.json"
121-
tools/actionlint.sh -color
122-
123-
- name: Install vllm-project/vllm from source
124-
working-directory: vllm-empty
125-
run: |
126-
pip install -r requirements/build.txt --extra-index-url https://download.pytorch.org/whl/cpu
127-
VLLM_TARGET_DEVICE=empty pip install .
128-
129-
- name: Mypy Check
130-
run: |
131-
echo "::add-matcher::.github/workflows/matchers/mypy.json"
132-
tools/mypy.sh 1 ${{ matrix.python-version }}
69+
# lint:
70+
# # Only trigger lint on pull request
71+
# if: ${{ github.event_name == 'pull_request' }}
72+
# runs-on: ubuntu-latest
73+
# strategy:
74+
# matrix:
75+
# python-version: ["3.10"]
76+
# steps:
77+
# - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
78+
# - name: Set up Python ${{ matrix.python-version }}
79+
# uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
80+
# with:
81+
# python-version: ${{ matrix.python-version }}
82+
# - name: Install dependencies
83+
# run: |
84+
# python -m pip install --upgrade pip
85+
# pip install -r requirements-lint.txt
86+
# - name: Run codespell check
87+
# run: |
88+
# CODESPELL_EXCLUDES=('--skip' 'tests/prompts/**,./benchmarks/sonnet.txt,*tests/lora/data/**,build/**,./vllm_ascend.egg-info/**')
89+
# CODESPELL_IGNORE_WORDS=('-L' 'CANN,cann,NNAL,nnal,ASCEND,ascend,EnQue,CopyIn,assertIn,rever')
90+
91+
# codespell --toml pyproject.toml "${CODESPELL_EXCLUDES[@]}" "${CODESPELL_IGNORE_WORDS[@]}"
92+
# - name: Analysing the code with ruff
93+
# run: |
94+
# echo "::add-matcher::.github/workflows/matchers/ruff.json"
95+
# ruff check --output-format github .
96+
# - name: Run isort
97+
# run: |
98+
# isort . --check-only
99+
# - name: Running yapf
100+
# run: |
101+
# python -m pip install --upgrade pip
102+
# pip install toml
103+
# pip install yapf==0.32.0
104+
# yapf --diff --recursive .
105+
106+
# - name: Install dependencies
107+
# run: |
108+
# pip install -r requirements-dev.txt --extra-index-url https://download.pytorch.org/whl/cpu
109+
110+
# - name: Checkout vllm-project/vllm repo
111+
# uses: actions/checkout@v4
112+
# with:
113+
# repository: vllm-project/vllm
114+
# path: vllm-empty
115+
116+
# - name: Actionlint Check
117+
# env:
118+
# SHELLCHECK_OPTS: --exclude=SC2046,SC2006,SC2086
119+
# run: |
120+
# echo "::add-matcher::.github/workflows/matchers/actionlint.json"
121+
# tools/actionlint.sh -color
122+
123+
# - name: Install vllm-project/vllm from source
124+
# working-directory: vllm-empty
125+
# run: |
126+
# pip install -r requirements/build.txt --extra-index-url https://download.pytorch.org/whl/cpu
127+
# VLLM_TARGET_DEVICE=empty pip install .
128+
129+
# - name: Mypy Check
130+
# run: |
131+
# echo "::add-matcher::.github/workflows/matchers/mypy.json"
132+
# tools/mypy.sh 1 ${{ matrix.python-version }}
133133

134134
ut:
135-
needs: [lint]
135+
# needs: [lint]
136136
name: unit test
137137
# only trigger e2e test on [pull request after lint passed] and [merged commit]
138-
if: ${{ needs.lint.result == 'success' || github.event_name == 'push' }}
138+
# if: ${{ needs.lint.result == 'success' || github.event_name == 'push' }}
139139
runs-on: ubuntu-latest
140140
container:
141141
image: m.daocloud.io/quay.io/ascend/cann:8.1.rc1-910b-ubuntu22.04-py3.10
@@ -144,7 +144,7 @@ jobs:
144144
VLLM_USE_MODELSCOPE: True
145145
strategy:
146146
matrix:
147-
vllm_version: [main, v0.9.1]
147+
vllm_version: [main, v0.9.2rc1]
148148
steps:
149149
- name: Install packages
150150
run: |
@@ -201,7 +201,7 @@ jobs:
201201
max-parallel: 2
202202
matrix:
203203
os: [linux-arm64-npu-1]
204-
vllm_version: [main, v0.9.1]
204+
vllm_version: [main, v0.9.2rc1]
205205
name: singlecard e2e test
206206
runs-on: ${{ matrix.os }}
207207
container:
@@ -302,7 +302,7 @@ jobs:
302302
max-parallel: 1
303303
matrix:
304304
os: [linux-arm64-npu-4]
305-
vllm_version: [main, v0.9.1]
305+
vllm_version: [main, v0.9.2rc1]
306306
name: multicard e2e test
307307
runs-on: ${{ matrix.os }}
308308
container:

‎.github/workflows/vllm_ascend_test_long_term.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
max-parallel: 2
4444
matrix:
4545
os: [linux-arm64-npu-1, linux-arm64-npu-4]
46-
vllm_version: [main, v0.9.1]
46+
vllm_version: [main, v0.9.2rc1]
4747
name: vLLM Ascend long term test
4848
runs-on: ${{ matrix.os }}
4949
container:

‎.github/workflows/vllm_ascend_test_pd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
vllm_verison: [
4545
# revert me when V1 disaggregation prefill is merged in main
4646
# main,
47-
v0.9.1
47+
v0.9.2rc1
4848
]
4949
name: vLLM Ascend prefilling decoding disaggregation test
5050
runs-on: linux-arm64-npu-static-8

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN pip config set global.index-url ${PIP_INDEX_URL}
3737

3838
# Install vLLM
3939
ARG VLLM_REPO=https://github.com/vllm-project/vllm.git
40-
ARG VLLM_TAG=v0.9.1
40+
ARG VLLM_TAG=v0.9.2rc1
4141
RUN git clone --depth 1 $VLLM_REPO --branch $VLLM_TAG /vllm-workspace/vllm
4242
# In x86, triton will be installed by vllm. But in Ascend, triton doesn't work correctly. we need to uninstall it.
4343
RUN VLLM_TARGET_DEVICE="empty" python3 -m pip install -v -e /vllm-workspace/vllm/ --extra-index https://download.pytorch.org/whl/cpu/ && \

‎Dockerfile.310p

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN pip config set global.index-url ${PIP_INDEX_URL}
3737

3838
# Install vLLM
3939
ARG VLLM_REPO=https://github.com/vllm-project/vllm.git
40-
ARG VLLM_TAG=v0.9.1
40+
ARG VLLM_TAG=v0.9.2rc1
4141
RUN git clone --depth 1 $VLLM_REPO --branch $VLLM_TAG /vllm-workspace/vllm
4242
# In x86, triton will be installed by vllm. But in Ascend, triton doesn't work correctly. we need to uninstall it.
4343
RUN VLLM_TARGET_DEVICE="empty" python3 -m pip install -v -e /vllm-workspace/vllm/ --extra-index https://download.pytorch.org/whl/cpu/ && \

‎Dockerfile.310p.openEuler

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ COPY . /vllm-workspace/vllm-ascend/
3434

3535
# Install vLLM
3636
ARG VLLM_REPO=https://github.com/vllm-project/vllm.git
37-
ARG VLLM_TAG=v0.9.1
37+
ARG VLLM_TAG=v0.9.2rc1
3838

3939
RUN git clone --depth 1 $VLLM_REPO --branch $VLLM_TAG /vllm-workspace/vllm
4040
# In x86, triton will be installed by vllm. But in Ascend, triton doesn't work correctly. we need to uninstall it.

‎Dockerfile.openEuler

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ COPY . /vllm-workspace/vllm-ascend/
3434

3535
# Install vLLM
3636
ARG VLLM_REPO=https://github.com/vllm-project/vllm.git
37-
ARG VLLM_TAG=v0.9.1
37+
ARG VLLM_TAG=v0.9.2rc1
3838

3939
RUN git clone --depth 1 $VLLM_REPO --branch $VLLM_TAG /vllm-workspace/vllm
4040
# In x86, triton will be installed by vllm. But in Ascend, triton doesn't work correctly. we need to uninstall it.

‎docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@
6565
# the branch of vllm, used in vllm clone
6666
# - main branch: 'main'
6767
# - vX.Y.Z branch: 'vX.Y.Z'
68-
'vllm_version': 'v0.9.1',
68+
'vllm_version': 'v0.9.2rc1',
6969
# the branch of vllm-ascend, used in vllm-ascend clone and image tag
7070
# - main branch: 'main'
7171
# - vX.Y.Z branch: latest vllm-ascend release tag
7272
'vllm_ascend_version': 'v0.9.1rc1',
7373
# the newest release version of vllm-ascend and matched vLLM, used in pip install.
7474
# This value should be updated when cut down release.
7575
'pip_vllm_ascend_version': "0.9.1rc1",
76-
'pip_vllm_version': "0.9.1",
76+
'pip_vllm_version': "0.9.2",
7777
# CANN image tag
7878
'cann_image_tag': "8.1.rc1-910b-ubuntu22.04-py3.10",
7979
}

0 commit comments

Comments
 (0)