Skip to content

Commit 3dc10ef

Browse files
author
yangcheng (AJ)
committed
merge update
1 parent d79ace8 commit 3dc10ef

File tree

142 files changed

+6026
-2151
lines changed

Some content is hidden

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

142 files changed

+6026
-2151
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ version: 2
22
updates:
33
- package-ecosystem: "github-actions"
44
directory: "/"
5-
schedule:
6-
# Check for updates to GitHub Actions every week
7-
interval: "weekly"
85
open-pull-requests-limit: 2
96
reviewers:
107
- "Yikun"

.github/workflows/image_openeuler.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'image / openEuler'
1+
name: 'image'
22
# This is a docker build check and publish job:
33
# 1. PR Triggered docker image build check
44
# - is for image build check
@@ -39,13 +39,9 @@ on:
3939

4040
jobs:
4141
build:
42-
name: vllm-ascend image build
43-
runs-on: >-
44-
${{
45-
github.event_name == 'push' && github.repository_owner == 'vllm-project' &&
46-
'ubuntu-latest' ||
47-
'ubuntu-24.04-arm'
48-
}}
42+
name: vllm-ascend openEuler image
43+
runs-on: ubuntu-latest
44+
4945
steps:
5046
- uses: actions/checkout@v4
5147

@@ -97,12 +93,7 @@ jobs:
9793
- name: Build and push
9894
uses: docker/build-push-action@v6
9995
with:
100-
platforms: >-
101-
${{
102-
github.event_name == 'push' && github.repository_owner == 'vllm-project' &&
103-
'linux/amd64,linux/arm64' ||
104-
'linux/arm64'
105-
}}
96+
platforms: linux/amd64,linux/arm64
10697
# use the current repo path as the build context, ensure .git is contained
10798
context: .
10899
# only trigger when tag, branch/main push

.github/workflows/image_ubuntu.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 'image / Ubuntu'
1+
name: 'image'
22
# This is a docker build check and publish job:
33
# 1. PR Triggered docker image build check
44
# - is for image build check
@@ -39,7 +39,7 @@ on:
3939
jobs:
4040

4141
build:
42-
name: vllm-ascend image build
42+
name: vllm-ascend Ubuntu image
4343
runs-on: ubuntu-latest
4444

4545
steps:
@@ -93,12 +93,7 @@ jobs:
9393
- name: Build and push
9494
uses: docker/build-push-action@v6
9595
with:
96-
platforms: >-
97-
${{
98-
github.event_name == 'push' && github.repository_owner == 'vllm-project' &&
99-
'linux/amd64,linux/arm64' ||
100-
'linux/amd64'
101-
}}
96+
platforms: linux/amd64,linux/arm64
10297
# use the current repo path as the build context, ensure .git is contained
10398
context: .
10499
# only trigger when tag, branch/main push

.github/workflows/nightly_benchmarks.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818
name: 'Benchmarks / Performance'
1919
# This workflow runs nightly benchmarks for vllm-ascend.
2020

21-
on:
22-
schedule:
23-
# Run at 02:00 everyday
24-
- cron: '00 18 * * *'
25-
21+
on:
2622
workflow_dispatch:
2723
# Allow manual triggering of the workflow
2824

@@ -167,8 +163,6 @@ jobs:
167163
cp -r benchmarks/* /github/home/benchmarks/
168164
169165
- name: Run benchmark iteration
170-
env:
171-
PIP_EXTRA_INDEX_URL: https://mirrors.huaweicloud.com/ascend/repos/pypi
172166
if: github.event_name != 'pull_request'
173167
run: |
174168
while IFS= read -r line || [[ -n "$line" ]]; do

.github/workflows/vllm_ascend_doctest.yaml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ on:
2929
- 'tests/e2e/doctests/**'
3030
- 'tests/e2e/common.sh'
3131
- 'tests/e2e/run_doctests.sh'
32-
schedule:
33-
# Runs every 4 hours
34-
- cron: '0 */4 * * *'
3532

3633
# Bash shells do not use ~/.profile or ~/.bashrc so these shells need to be explicitly
3734
# declared as "shell: bash -el {0}" on steps that need to be properly activated.
@@ -46,7 +43,7 @@ jobs:
4643
# Each version should be tested
4744
fail-fast: false
4845
matrix:
49-
vllm_verison: [v0.9.1-dev, v0.9.1-dev-openeuler, main, main-openeuler]
46+
vllm_verison: [main, v0.7.3-dev, main-openeuler, v0.7.3-dev-openeuler]
5047
name: vLLM Ascend test
5148
runs-on: linux-arm64-npu-1
5249
container:
@@ -70,13 +67,13 @@ jobs:
7067
run: |
7168
sed -i 's|ports.ubuntu.com|mirrors.tuna.tsinghua.edu.cn|g' /etc/apt/sources.list
7269
apt-get update -y
73-
apt install -y gcc g++ libnuma-dev git curl jq
70+
apt install git curl -y
7471
7572
- name: Config OS mirrors - openEuler
7673
if: ${{ endsWith(matrix.vllm_verison, '-openeuler') }}
7774
run: |
7875
yum update -y
79-
yum install -y gcc g++ numactl-devel git curl jq
76+
yum install git curl -y
8077
8178
- name: Config pip mirrors
8279
run: |
@@ -88,13 +85,11 @@ jobs:
8885
- name: Run vllm-ascend/tests/e2e/run_doctests.sh
8986
run: |
9087
# PWD: /__w/vllm-ascend/vllm-ascend
91-
echo "Replacing /vllm-workspace/vllm-ascend/tests/e2e ..."
92-
rm -rf /vllm-workspace/vllm-ascend/tests/e2e
93-
mkdir -p /vllm-workspace/vllm-ascend/tests
94-
cp -r tests/e2e /vllm-workspace/vllm-ascend/tests/
95-
96-
# TODO(yikun): Remove this after conf.py merged
97-
cp docs/source/conf.py /vllm-workspace/vllm-ascend/docs/source/
88+
# Address old branch like v0.7.3:
89+
if [ ! -d /vllm-workspace/vllm-ascend/tests/e2e ]; then
90+
echo "Warning: the doctest path doesn't exists, copy now"
91+
cp -r tests/e2e /vllm-workspace/vllm-ascend/tests/
92+
fi
9893
9994
# Simulate container to enter directory
10095
cd /workspace

0 commit comments

Comments
 (0)