Skip to content

Commit 9c1d673

Browse files
author
yangcheng (AJ)
committed
Merge remote-tracking branch 'upstream/v0.9.1-dev' into new_091
2 parents 8a5be56 + 04e6169 commit 9c1d673

File tree

74 files changed

+387
-901
lines changed

Some content is hidden

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

74 files changed

+387
-901
lines changed

.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: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@ jobs:
163163
cp -r benchmarks/* /github/home/benchmarks/
164164
165165
- name: Run benchmark iteration
166-
env:
167-
PIP_EXTRA_INDEX_URL: https://mirrors.huaweicloud.com/ascend/repos/pypi
168166
if: github.event_name != 'pull_request'
169167
run: |
170168
while IFS= read -r line || [[ -n "$line" ]]; do

.github/workflows/vllm_ascend_doctest.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
# Each version should be tested
4444
fail-fast: false
4545
matrix:
46-
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]
4747
name: vLLM Ascend test
4848
runs-on: linux-arm64-npu-1
4949
container:
@@ -67,13 +67,13 @@ jobs:
6767
run: |
6868
sed -i 's|ports.ubuntu.com|mirrors.tuna.tsinghua.edu.cn|g' /etc/apt/sources.list
6969
apt-get update -y
70-
apt install -y gcc g++ libnuma-dev git curl jq
70+
apt install git curl -y
7171
7272
- name: Config OS mirrors - openEuler
7373
if: ${{ endsWith(matrix.vllm_verison, '-openeuler') }}
7474
run: |
7575
yum update -y
76-
yum install -y gcc g++ numactl-devel git curl jq
76+
yum install git curl -y
7777
7878
- name: Config pip mirrors
7979
run: |
@@ -85,13 +85,11 @@ jobs:
8585
- name: Run vllm-ascend/tests/e2e/run_doctests.sh
8686
run: |
8787
# PWD: /__w/vllm-ascend/vllm-ascend
88-
echo "Replacing /vllm-workspace/vllm-ascend/tests/e2e ..."
89-
rm -rf /vllm-workspace/vllm-ascend/tests/e2e
90-
mkdir -p /vllm-workspace/vllm-ascend/tests
91-
cp -r tests/e2e /vllm-workspace/vllm-ascend/tests/
92-
93-
# TODO(yikun): Remove this after conf.py merged
94-
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
9593
9694
# Simulate container to enter directory
9795
cd /workspace

docs/requirements-test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pytest-asyncio
2-
pytest-mock
2+

docs/source/community/contributors.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
| Xiyuan Wang| [@wangxiyuan](https://github.com/wangxiyuan) | 2025/01 |
88
| Yikun Jiang| [@Yikun](https://github.com/Yikun) | 2025/02 |
99
| Yi Gan| [@ganyi1996ppo](https://github.com/ganyi1996ppo) | 2025/02 |
10-
| Shoujian Zheng| [@jianzs](https://github.com/jianzs) | 2025/06 |
1110

1211
## Contributors
1312

docs/source/community/user_stories/index.md

Lines changed: 0 additions & 19 deletions
This file was deleted.

docs/source/community/user_stories/llamafactory.md

Lines changed: 0 additions & 19 deletions
This file was deleted.

docs/source/index.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,11 @@ developer_guide/evaluation/index
6666
:maxdepth: 1
6767
community/governance
6868
community/contributors
69-
community/user_stories/index
69+
:::
70+
71+
% User stories about vLLM Ascend project
72+
:::{toctree}
73+
:caption: User Story
74+
:maxdepth: 1
75+
user_stories/index
7076
:::

docs/source/user_stories/example.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# xxx project uses Ascend vLLM, gain 200% performance enhancement of inference.
2+
3+
## About / Introduction
4+
Draft content
5+
6+
## The Business Challenge
7+
Our goal is to ...
8+
9+
## Solving challenges with vLLM Ascend
10+
vLLM Ascend helped us ...
11+
12+
## Benefits using vLLM Ascend
13+
14+
## Learn more
15+
more info about this case

0 commit comments

Comments
 (0)