Skip to content

Commit 86f2182

Browse files
authored
Merge branch 'main' into longcat_flash
2 parents 6618400 + da84eb2 commit 86f2182

File tree

224 files changed

+14597
-4044
lines changed

Some content is hidden

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

224 files changed

+14597
-4044
lines changed

.github/workflows/_e2e_nightly_multi_node.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ on:
3232
description: how many pods will be pulled up via lws.yaml, indicates number of nodes we need
3333
vllm_version:
3434
required: false
35-
default: "v0.11.2"
35+
default: "v0.12.0"
3636
type: string
3737
description: vllm version to use
3838
vllm_ascend_remote_url:
@@ -106,7 +106,7 @@ jobs:
106106
echo "${{ secrets.KUBECONFIG_B64 }}" | base64 -d > $KUBECONFIG
107107
108108
- name: Checkout code
109-
uses: actions/checkout@v6
109+
uses: actions/checkout@v6.0.0
110110

111111
- name: Prepare scripts
112112
run: |

.github/workflows/_e2e_nightly_single_node_models.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
name: ${{inputs.model_list}} accuracy test
6060
runs-on: ${{ inputs.runner }}
6161
container:
62-
image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.3.rc2-910b-ubuntu22.04-py3.11
62+
image: "${{ inputs.image }}"
6363
env:
6464
VLLM_USE_MODELSCOPE: True
6565
GHA_VLLM_ASCEND_VERSION: ${{ inputs.vllm-ascend }}
@@ -78,15 +78,15 @@ jobs:
7878
git config --global url."https://gh-proxy.test.osinfra.cn/https://github.com/".insteadOf https://github.com/
7979
8080
- name: Checkout vllm-project/vllm-ascend repo
81-
uses: actions/checkout@v6
81+
uses: actions/checkout@v6.0.0
8282

8383
- name: Install system dependencies
8484
run: |
8585
apt-get -y install `cat packages.txt`
8686
apt-get -y install gcc g++ cmake libnuma-dev
8787
8888
- name: Checkout vllm-project/vllm repo
89-
uses: actions/checkout@v6
89+
uses: actions/checkout@v6.0.0
9090
with:
9191
repository: vllm-project/vllm
9292
ref: ${{ inputs.vllm }}
@@ -111,6 +111,12 @@ jobs:
111111
. /usr/local/Ascend/ascend-toolkit/8.3.RC2/bisheng_toolkit/set_env.sh
112112
python3 -m pip install "https://vllm-ascend.obs.cn-north-4.myhuaweicloud.com/vllm-ascend/triton_ascend-3.2.0.dev2025110717-cp311-cp311-manylinux_2_27_aarch64.whl"
113113
114+
- name: Install tensorflow (for Molmo-7B-D-0924)
115+
if: ${{ inputs.runner == 'linux-aarch64-a2-1' && contains(inputs.model_list, 'Molmo-7B-D-0924') }}
116+
shell: bash -l {0}
117+
run: |
118+
pip install tensorflow --no-cache-dir
119+
114120
- name: Resolve vllm-ascend version
115121
run: |
116122
VERSION_INPUT="${{ inputs.vllm-ascend }}"
@@ -129,7 +135,7 @@ jobs:
129135
echo "GHA_VLLM_ASCEND_VERSION=$RESOLVED_VERSION" >> $GITHUB_ENV
130136
131137
- name: Checkout vllm-project/vllm-ascend repo
132-
uses: actions/checkout@v6
138+
uses: actions/checkout@v6.0.0
133139
with:
134140
repository: vllm-project/vllm-ascend
135141
path: ./vllm-ascend
@@ -172,6 +178,7 @@ jobs:
172178
id: report
173179
env:
174180
VLLM_WORKER_MULTIPROC_METHOD: spawn
181+
HF_DATASETS_OFFLINE: True
175182
VLLM_USE_MODELSCOPE: True
176183
VLLM_CI_RUNNER: ${{ inputs.runner }}
177184
VLLM_VERSION: ${{ env.GHA_VLLM_VERSION }}

.github/workflows/_e2e_test.yaml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ jobs:
4040
apt install git -y
4141
4242
- name: Checkout vllm-project/vllm-ascend repo
43-
uses: actions/checkout@v6
43+
uses: actions/checkout@v6.0.0
4444

4545
- name: Install system dependencies
4646
run: |
4747
apt-get -y install `cat packages.txt`
4848
apt-get -y install gcc g++ cmake libnuma-dev
4949
5050
- name: Checkout vllm-project/vllm repo
51-
uses: actions/checkout@v6
51+
uses: actions/checkout@v6.0.0
5252
with:
5353
repository: vllm-project/vllm
5454
ref: ${{ inputs.vllm }}
@@ -91,14 +91,13 @@ jobs:
9191
pytest -sv tests/e2e/singlecard/test_completion_with_prompt_embeds.py
9292
pytest -sv tests/e2e/singlecard/test_aclgraph.py
9393
pytest -sv tests/e2e/singlecard/test_aclgraph_mem.py
94-
pytest -sv tests/e2e/singlecard/test_ascend_scheduler.py
9594
pytest -sv tests/e2e/singlecard/test_bge_model.py
9695
pytest -sv tests/e2e/singlecard/test_camem.py
97-
pytest -sv tests/e2e/singlecard/test_chunked.py
9896
pytest -sv tests/e2e/singlecard/test_embedding.py
9997
# pytest -sv tests/e2e/singlecard/test_embedding_aclgraph.py
10098
pytest -sv tests/e2e/singlecard/test_guided_decoding.py
101-
pytest -sv tests/e2e/singlecard/test_ilama_lora.py
99+
# torch 2.8 doesn't work with lora, fix me
100+
#pytest -sv tests/e2e/singlecard/test_ilama_lora.py
102101
pytest -sv tests/e2e/singlecard/test_profile_execute_duration.py
103102
pytest -sv tests/e2e/singlecard/test_quantization.py
104103
pytest -sv tests/e2e/singlecard/test_sampler.py
@@ -134,15 +133,15 @@ jobs:
134133
apt install git -y
135134
136135
- name: Checkout vllm-project/vllm-ascend repo
137-
uses: actions/checkout@v6
136+
uses: actions/checkout@v6.0.0
138137

139138
- name: Install system dependencies
140139
run: |
141140
apt-get -y install `cat packages.txt`
142141
apt-get -y install gcc g++ cmake libnuma-dev
143142
144143
- name: Checkout vllm-project/vllm repo
145-
uses: actions/checkout@v6
144+
uses: actions/checkout@v6.0.0
146145
with:
147146
repository: vllm-project/vllm
148147
ref: ${{ inputs.vllm }}
@@ -188,7 +187,8 @@ jobs:
188187
pytest -sv tests/e2e/multicard/test_external_launcher.py
189188
pytest -sv tests/e2e/multicard/test_single_request_aclgraph.py
190189
pytest -sv tests/e2e/multicard/test_fused_moe_allgather_ep.py
191-
pytest -sv tests/e2e/multicard/test_ilama_lora_tp2.py
190+
# torch 2.8 doesn't work with lora, fix me
191+
#pytest -sv tests/e2e/multicard/test_ilama_lora_tp2.py
192192
193193
# To avoid oom, we need to run the test in a single process.
194194
pytest -sv tests/e2e/multicard/test_offline_inference_distributed.py::test_models_distributed_QwQ
@@ -231,7 +231,7 @@ jobs:
231231
git config --global url."https://gh-proxy.test.osinfra.cn/https://github.com/".insteadOf https://github.com/
232232
233233
- name: Checkout vllm-project/vllm-ascend repo
234-
uses: actions/checkout@v6
234+
uses: actions/checkout@v6.0.0
235235
with:
236236
path: ./vllm-ascend
237237

@@ -241,7 +241,7 @@ jobs:
241241
apt-get -y install gcc g++ cmake libnuma-dev
242242
243243
- name: Checkout vllm-project/vllm repo
244-
uses: actions/checkout@v6
244+
uses: actions/checkout@v6.0.0
245245
with:
246246
repository: vllm-project/vllm
247247
ref: ${{ inputs.vllm }}
@@ -266,11 +266,10 @@ jobs:
266266
VLLM_WORKER_MULTIPROC_METHOD: spawn
267267
VLLM_USE_MODELSCOPE: True
268268
run: |
269-
pytest -sv \
270-
tests/e2e/multicard/test_offline_inference_distributed.py::test_models_distributed_DeepSeek_multistream_moe \
271-
tests/e2e/multicard/test_offline_inference_distributed.py::test_models_distributed_DeepSeek_W4A8DYNAMIC
272-
# tests/e2e/multicard/test_qwen3_moe.py::test_models_distributed_Qwen3_MOE_TP2_WITH_EP \
273-
# tests/e2e/multicard/test_qwen3_moe.py::test_models_distributed_Qwen3_MOE_W8A8_WITH_EP
269+
pytest -sv tests/e2e/multicard/test_offline_inference_distributed.py::test_models_distributed_DeepSeek_multistream_moe
270+
pytest -sv tests/e2e/multicard/test_offline_inference_distributed.py::test_models_distributed_DeepSeek_W4A8DYNAMIC
271+
# pytest -sv tests/e2e/multicard/test_qwen3_moe.py::test_models_distributed_Qwen3_MOE_TP2_WITH_EP
272+
# pytest -sv tests/e2e/multicard/test_qwen3_moe.py::test_models_distributed_Qwen3_MOE_W8A8_WITH_EP
274273
pytest -sv tests/e2e/multicard/test_data_parallel_tp2.py
275274
276275
- name: Install Ascend toolkit & triton_ascend (for Qwen3-Next-80B-A3B-Instruct)
@@ -287,4 +286,4 @@ jobs:
287286
VLLM_USE_MODELSCOPE: True
288287
run: |
289288
. /usr/local/Ascend/ascend-toolkit/8.3.RC2/bisheng_toolkit/set_env.sh
290-
#pytest -sv tests/e2e/multicard/test_qwen3_next.py
289+
pytest -sv tests/e2e/multicard/test_qwen3_next.py

.github/workflows/_nightly_image_build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
image-tag: ${{ steps.build-image.outputs.image-tag }}
2020

2121
steps:
22-
- uses: actions/checkout@v6
22+
- uses: actions/checkout@v6.0.0
2323

2424
- name: Show build target
2525
run: |

.github/workflows/format_pr_body.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636

3737
- name: Get vLLM version
3838
run: |
39-
VLLM_COMMIT=v0.11.2
39+
VLLM_COMMIT=v0.12.0
4040
echo "VLLM_COMMIT=https://github.com/vllm-project/vllm/commit/$VLLM_COMMIT" >> $GITHUB_ENV
4141
4242
- name: Checkout repository
43-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.2.2
43+
uses: actions/checkout@c2d88d3ecc89a9ef08eebf45d9637801dcee7eb5 # v4.2.2
4444

4545
- name: Set up Python
46-
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
46+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
4747

4848
- name: Get vLLM release version
4949
run: |

.github/workflows/image_310p_openeuler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
}}
6363
if: ${{ github.event_name == 'push' || (contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test')) }}
6464
steps:
65-
- uses: actions/checkout@v6
65+
- uses: actions/checkout@v6.0.0
6666
with:
6767
fetch-depth: 0
6868
persist-credentials: false

.github/workflows/image_310p_ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
runs-on: ubuntu-latest
5959
if: ${{ github.event_name == 'push' || (contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test')) }}
6060
steps:
61-
- uses: actions/checkout@v6
61+
- uses: actions/checkout@v6.0.0
6262
with:
6363
fetch-depth: 0
6464
persist-credentials: false

.github/workflows/image_a3_openeuler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
}}
6363
if: ${{ github.event_name == 'push' || (contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test')) }}
6464
steps:
65-
- uses: actions/checkout@v6
65+
- uses: actions/checkout@v6.0.0
6666
with:
6767
fetch-depth: 0
6868
persist-credentials: false

.github/workflows/image_a3_ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
runs-on: ubuntu-latest
5959
if: ${{ github.event_name == 'push' || (contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test')) }}
6060
steps:
61-
- uses: actions/checkout@v6
61+
- uses: actions/checkout@v6.0.0
6262
with:
6363
fetch-depth: 0
6464
persist-credentials: false

.github/workflows/image_openeuler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
}}
6262
if: ${{ github.event_name == 'push' || (contains(github.event.pull_request.labels.*.name, 'ready') && contains(github.event.pull_request.labels.*.name, 'ready-for-test')) }}
6363
steps:
64-
- uses: actions/checkout@v6
64+
- uses: actions/checkout@v6.0.0
6565
with:
6666
fetch-depth: 0
6767
persist-credentials: false

0 commit comments

Comments
 (0)