Skip to content

Commit ad04583

Browse files
authored
Merge branch 'vllm-project:main' into main
2 parents d2197fe + 382c29f commit ad04583

Some content is hidden

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

51 files changed

+383
-264
lines changed

.github/workflows/accuracy_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
uses: actions/checkout@v4
113113
with:
114114
repository: vllm-project/vllm
115-
ref: main
115+
ref: v0.10.2
116116
path: ./vllm-empty
117117

118118
- name: Install vllm-project/vllm from source

.github/workflows/image_310p_openeuler.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,15 @@ concurrency:
5252
jobs:
5353
build:
5454
name: vllm-ascend image build
55+
# Only arm64 build on openEuler arm64, only amd64 build on Ubuntu amd64
56+
# Push event or PR with both 'ready' and 'ready-for-test' labels
5557
runs-on: >-
5658
${{
5759
github.event_name == 'push' && github.repository_owner == 'vllm-project' &&
5860
'ubuntu-latest' ||
5961
'ubuntu-24.04-arm'
6062
}}
61-
if: ${{ contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test') }}
63+
if: ${{ github.event_name == 'push' || (contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test')) }}
6264
steps:
6365
- uses: actions/checkout@v4
6466
with:

.github/workflows/image_310p_ubuntu.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ jobs:
5353

5454
build:
5555
name: vllm-ascend image build
56+
# Only arm64 build on openEuler arm64, only amd64 build on Ubuntu amd64
57+
# Push event or PR with both 'ready' and 'ready-for-test' labels
5658
runs-on: ubuntu-latest
57-
if: ${{ contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test') }}
59+
if: ${{ github.event_name == 'push' || (contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test')) }}
5860
steps:
5961
- uses: actions/checkout@v4
6062
with:

.github/workflows/image_a3_openeuler.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,15 @@ concurrency:
5252
jobs:
5353
build:
5454
name: vllm-ascend image build
55+
# Only arm64 build on openEuler arm64, only amd64 build on Ubuntu amd64
56+
# Push event or PR with both 'ready' and 'ready-for-test' labels
5557
runs-on: >-
5658
${{
5759
github.event_name == 'push' && github.repository_owner == 'vllm-project' &&
5860
'ubuntu-latest' ||
5961
'ubuntu-24.04-arm'
6062
}}
61-
if: ${{ contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test') }}
63+
if: ${{ github.event_name == 'push' || (contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test')) }}
6264
steps:
6365
- uses: actions/checkout@v4
6466
with:

.github/workflows/image_a3_ubuntu.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ jobs:
5353

5454
build:
5555
name: vllm-ascend image build
56+
# Only arm64 build on openEuler arm64, only amd64 build on Ubuntu amd64
57+
# Push event or PR with both 'ready' and 'ready-for-test' labels
5658
runs-on: ubuntu-latest
57-
if: ${{ contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test') }}
59+
if: ${{ github.event_name == 'push' || (contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test')) }}
5860
steps:
5961
- uses: actions/checkout@v4
6062
with:

.github/workflows/image_openeuler.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,15 @@ concurrency:
5151
jobs:
5252
build:
5353
name: vllm-ascend image build
54+
# Only arm64 build on openEuler arm64, only amd64 build on Ubuntu amd64
55+
# Push event or PR with both 'ready' and 'ready-for-test' labels
5456
runs-on: >-
5557
${{
5658
github.event_name == 'push' && github.repository_owner == 'vllm-project' &&
5759
'ubuntu-latest' ||
5860
'ubuntu-24.04-arm'
5961
}}
60-
if: ${{ contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test') }}
62+
if: ${{ github.event_name == 'push' || (contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test')) }}
6163
steps:
6264
- uses: actions/checkout@v4
6365
with:

.github/workflows/image_ubuntu.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ jobs:
5353

5454
build:
5555
name: vllm-ascend image build
56+
# Only arm64 build on openEuler arm64, only amd64 build on Ubuntu amd64
57+
# Push event or PR with both 'ready' and 'ready-for-test' labels
5658
runs-on: ubuntu-latest
57-
if: ${{ contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test') }}
59+
if: ${{ github.event_name == 'push' || (contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test')) }}
5860
steps:
5961
- uses: actions/checkout@v4
6062
with:

.github/workflows/nightly_benchmarks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
strategy:
5252
matrix:
5353
include:
54-
- vllm_branch: main
54+
- vllm_branch: v0.10.2
5555
vllm_ascend_branch: main
5656
vllm_use_v1: 1
5757
max-parallel: 1

.github/workflows/vllm_ascend_dist.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
strategy:
4444
matrix:
4545
os: [linux-aarch64-a3-8]
46-
vllm_version: [main]
46+
vllm_version: [v0.10.2]
4747
name: vLLM Ascend test
4848
runs-on: ${{ matrix.os }}
4949
container:

.github/workflows/vllm_ascend_test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
VLLM_USE_MODELSCOPE: True
8383
strategy:
8484
matrix:
85-
vllm_version: [main]
85+
vllm_version: [v0.10.2]
8686
steps:
8787
- name: Install packages
8888
run: |
@@ -138,7 +138,7 @@ jobs:
138138
max-parallel: 2
139139
matrix:
140140
os: [linux-aarch64-a2-1]
141-
vllm_version: [main]
141+
vllm_version: [v0.10.2]
142142
name: singlecard e2e test - light
143143
runs-on: ${{ matrix.os }}
144144
container:
@@ -203,7 +203,7 @@ jobs:
203203
max-parallel: 2
204204
matrix:
205205
os: [linux-aarch64-a2-2]
206-
vllm_version: [main]
206+
vllm_version: [v0.10.2]
207207
name: multicard e2e test - light
208208
runs-on: ${{ matrix.os }}
209209
container:

0 commit comments

Comments
 (0)