Skip to content

Commit 039523a

Browse files
wangxiyuanwangxiyuan
committed
[CI] Refactor CI
Signed-off-by: wangxiyuan <wangxiyuan1007@gmail.com>
1 parent 01e3d59 commit 039523a

35 files changed

+163
-1279
lines changed

‎.github/workflows/vllm_ascend_test.yaml

Lines changed: 18 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ on:
3030
- '.github/workflows/vllm_ascend_test.yaml'
3131
- '!docs/**'
3232
- 'pytest.ini'
33-
3433
# Bash shells do not use ~/.profile or ~/.bashrc so these shells need to be explicitly
3534
# declared as "shell: bash -el {0}" on steps that need to be properly activated.
3635
# It's used to activate ascend-toolkit environment variables.
@@ -47,15 +46,16 @@ jobs:
4746
strategy:
4847
max-parallel: 2
4948
matrix:
50-
os: [linux-arm64-npu-1, linux-arm64-npu-4]
51-
vllm_verison: [main, v0.8.5.post1]
49+
#os: [linux-arm64-npu-1, linux-arm64-npu-4]
50+
os: [linux-arm64-npu-4]
51+
vllm_version: [main, v0.8.5.post1]
5252
concurrency:
5353
group: >
5454
${{
5555
matrix.os == 'linux-arm64-npu-4'
5656
&& github.event.pull_request.number
5757
&& format('pr-{0}-limit-npu-4', github.event.pull_request.number)
58-
|| format('job-{0}-{1}-{2}', matrix.os, matrix.vllm_verison, github.event.pull_request.number)
58+
|| format('job-{0}-{1}-{2}', matrix.os, matrix.vllm_version, github.event.pull_request.number)
5959
}}
6060
cancel-in-progress: false
6161
name: vLLM Ascend test
@@ -66,6 +66,7 @@ jobs:
6666
env:
6767
HF_ENDPOINT: https://hf-mirror.com
6868
HF_TOKEN: ${{ secrets.HF_TOKEN }}
69+
VLLM_LOGGING_LEVEL: ERROR
6970
steps:
7071
- name: Check npu and CANN info
7172
run: |
@@ -92,7 +93,7 @@ jobs:
9293
uses: actions/checkout@v4
9394
with:
9495
repository: vllm-project/vllm
95-
ref: ${{ matrix.vllm_verison }}
96+
ref: ${{ matrix.vllm_version }}
9697
path: ./vllm-empty
9798

9899
- name: Install vllm-project/vllm from source
@@ -112,63 +113,26 @@ jobs:
112113
run: |
113114
if [[ "${{ matrix.os }}" == "linux-arm64-npu-1" ]]; then
114115
pytest -sv tests/singlecard/test_offline_inference.py
115-
pytest -sv tests/singlecard/test_ilama_lora.py
116-
pytest -sv tests/ops
117-
pytest -sv tests/compile
116+
# AscendScheduler doesn't work, fix it later
117+
# pytest -sv tests/singlecard/tets_schedule.py
118+
# guided decoding doesn't work, fix it later
119+
# pytest -sv tests/singlecard/test_guided_decoding.py.py
120+
pytest -sv tests/singlecard/ --ignore=tests/singlecard/test_offline_inference.py --ignore=tests/singlecard/test_scheduler.py --ignore=tests/singlecard/test_guided_decoding.py
118121
else
119-
pytest -sv -k "QwQ" tests/multicard/test_offline_inference_distributed.py
120-
pytest -sv tests/multicard/test_ilama_lora_tp2.py
121-
pytest -sv tests/ops
122-
pytest -sv tests/compile
122+
pytest -sv tests/multicard/
123123
fi
124124
125125
- name: Run vllm-project/vllm-ascend test on V0 engine
126126
env:
127127
VLLM_USE_V1: 0
128128
run: |
129129
if [[ "${{ matrix.os }}" == "linux-arm64-npu-1" ]]; then
130-
pytest -sv tests/singlecard/test_ilama_lora.py
131130
pytest -sv tests/singlecard/test_offline_inference.py
132-
pytest -sv tests/ops
131+
# AscendScheduler doesn't work, fix it later
132+
# pytest -sv tests/singlecard/tets_schedule.py
133+
# guided decoding doesn't work, fix it later
134+
# pytest -sv tests/singlecard/test_guided_decoding.py.py
135+
pytest -sv tests/singlecard/ --ignore=tests/singlecard/test_offline_inference.py --ignore=tests/singlecard/test_scheduler.py --ignore=tests/singlecard/test_guided_decoding.py
133136
else
134-
pytest -sv tests/multicard/test_ilama_lora_tp2.py
135-
pytest -sv -k "QwQ" tests/multicard/test_offline_inference_distributed.py
136-
pytest -sv -k "DeepSeek" tests/multicard/test_offline_inference_distributed.py
137-
pytest -sv tests/ops
137+
pytest -sv tests/multicard/
138138
fi
139-
140-
# only run test on spec decode when the related code changed
141-
- name: Check for changes in Speculative Decode
142-
if: github.event_name != 'schedule'
143-
id: filter_spec_decode
144-
uses: dorny/paths-filter@v3
145-
with:
146-
filters: |
147-
speculative_tests_changed:
148-
- ".github/workflows/vllm_ascend_test.yaml"
149-
- "tests/singlecard/spec_decode/**"
150-
- "tests/multicard/spec_decode_e2e/**"
151-
- "vllm_ascend/worker/worker.py"
152-
- "vllm_ascend/worker/model_runner.py"
153-
- "vllm_ascend/worker/multi_step_runner.py"
154-
- "vllm_ascend/worker/multi_step_worker.py"
155-
- "vllm_ascend/worker/draft_model_runner.py"
156-
- "vllm_ascend/patch/worker/patch_common/patch_metrics.py"
157-
- "vllm_ascend/patch/worker/patch_common/patch_spec_decode_worker.py"
158-
- "vllm_ascend/patch/worker/patch_common/patch_multi_step_worker.py"
159-
160-
- name: Run vllm-project/vllm-ascend Speculative Decode test
161-
if: steps.filter_spec_decode.outputs.speculative_tests_changed == 'true' || github.event_name == 'schedule'
162-
run: |
163-
if [[ "${{ matrix.os }}" == "linux-arm64-npu-1" ]]; then
164-
VLLM_USE_MODELSCOPE=true pytest -sv tests/singlecard/spec_decode/e2e/test_v1_spec_decode.py
165-
pytest -sv tests/singlecard/spec_decode/e2e/test_mtp_correctness.py # it needs a clean process
166-
pytest -sv tests/singlecard/spec_decode --ignore=tests/singlecard/spec_decode/e2e/test_mtp_correctness.py --ignore=tests/singlecard/spec_decode/e2e/test_v1_spec_decode.py
167-
fi
168-
169-
- name: Run vllm-project/vllm test for V0 Engine
170-
env:
171-
VLLM_USE_V1: 0
172-
PYTORCH_NPU_ALLOC_CONF: max_split_size_mb:256
173-
run: |
174-
pytest -sv

‎.github/workflows/vllm_ascend_test_long_term.yaml

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
#
2+
# Copyright (c) 2025 Huawei Technologies Co., Ltd. All Rights Reserved.
3+
# This file is a part of the vllm-ascend project.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
name: 'e2e test / long-term-test'
18+
19+
on:
20+
schedule:
21+
# Runs at 23:00 UTC (7:00 AM Beijing) every day
22+
- cron: '0 23 * * *'
23+
pull_request:
24+
types: [ labeled ]
25+
26+
# Bash shells do not use ~/.profile or ~/.bashrc so these shells need to be explicitly
27+
# declared as "shell: bash -el {0}" on steps that need to be properly activated.
28+
# It's used to activate ascend-toolkit environment variables.
29+
defaults:
30+
run:
31+
shell: bash -el {0}
32+
33+
jobs:
34+
long-term-test:
35+
if: ${{ contains(github.event.pull_request.labels.*.name, 'long-term-test') || github.event_name == 'schedule' }}
36+
strategy:
37+
max-parallel: 2
38+
matrix:
39+
vllm_version: [main, v0.8.5.post1]
40+
name: vLLM Ascend long term test
41+
runs-on: linux-arm64-npu-1
42+
container:
43+
# TODO(yikun): Remove m.daocloud.io prefix when infra proxy ready
44+
image: m.daocloud.io/quay.io/ascend/cann:8.1.rc1-910b-ubuntu22.04-py3.10
45+
env:
46+
HF_ENDPOINT: https://hf-mirror.com
47+
HF_TOKEN: ${{ secrets.HF_TOKEN }}
48+
VLLM_LOGGING_LEVEL: ERROR
49+
steps:
50+
- name: Check npu and CANN info
51+
run: |
52+
npu-smi info
53+
cat /usr/local/Ascend/ascend-toolkit/latest/"$(uname -i)"-linux/ascend_toolkit_install.info
54+
55+
- name: Config mirrors
56+
run: |
57+
sed -i 's|ports.ubuntu.com|mirrors.tuna.tsinghua.edu.cn|g' /etc/apt/sources.list
58+
pip config set global.index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
59+
apt-get update -y
60+
apt install git -y
61+
git config --global url."https://gh-proxy.test.osinfra.cn/https://github.com/".insteadOf https://github.com/
62+
63+
- name: Checkout vllm-project/vllm-ascend repo
64+
uses: actions/checkout@v4
65+
66+
- name: Install system dependencies
67+
run: |
68+
apt-get -y install `cat packages.txt`
69+
apt-get -y install gcc g++ cmake libnuma-dev
70+
71+
- name: Checkout vllm-project/vllm repo
72+
uses: actions/checkout@v4
73+
with:
74+
repository: vllm-project/vllm
75+
ref: ${{ matrix.vllm_version }}
76+
path: ./vllm-empty
77+
78+
- name: Install vllm-project/vllm from source
79+
working-directory: ./vllm-empty
80+
run: |
81+
VLLM_TARGET_DEVICE=empty pip install -e .
82+
83+
- name: Install vllm-project/vllm-ascend
84+
run: |
85+
pip install -r requirements-dev.txt
86+
pip install -v -e .
87+
88+
- name: Run vllm-project/vllm-ascend long term test
89+
if: github.event_name == 'schedule'
90+
run: |
91+
# spec decode test
92+
VLLM_USE_MODELSCOPE=true pytest -sv tests/long_term/spec_decode/e2e/test_v1_spec_decode.py
93+
pytest -sv tests/long_term/spec_decode/e2e/test_mtp_correctness.py # it needs a clean process
94+
pytest -sv tests/long_term/spec_decode --ignore=tests/long_term/spec_decode/e2e/test_mtp_correctness.py --ignore=tests/long_term/spec_decode/e2e/test_v1_spec_decode.py

‎.github/workflows/vllm_ascend_test_pd.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ defaults:
3131
shell: bash -el {0}
3232

3333
jobs:
34-
test:
35-
if: ${{ github.event.label.name == 'module:pd' }}
34+
prefilling-decoding-disaggregation:
35+
if: ${{ contains(github.event.pull_request.labels.*.name, 'module:pd') || github.event_name == 'schedule' }}
3636
strategy:
3737
matrix:
38-
vllm_verison: [v0.8.5.post1]
39-
name: vLLM Ascend test
38+
vllm_verison: [main, v0.8.5.post1]
39+
name: vLLM Ascend prefilling decoding disaggregation test
4040
runs-on: linux-arm64-npu-static-8
4141

4242
container:

‎format.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,8 @@ echo 'vllm-ascend isort: Done'
272272

273273
# Clang-format section
274274
# Exclude some files for formatting because they are vendored
275-
# NOTE: Keep up to date with .github/workflows/clang-format.yml
276275
CLANG_FORMAT_EXCLUDES=(
277-
'csrc/kernels/pos_encoding_kernels.cpp'
276+
'csrc/kernels/pos_encoding_kernels.cpp' 'csrc/kernels/advance_step.cpp' 'csrc/torch_binding.cpp' 'csrc/ops.h'
278277
)
279278

280279
# Format specified files with clang-format

‎tests/singlecard/spec_decode/__init__.py renamed to ‎tests/long_term/spec_decode/__init__.py

File renamed without changes.

‎tests/singlecard/spec_decode/conftest.py renamed to ‎tests/long_term/spec_decode/conftest.py

File renamed without changes.

‎tests/compile/__init__.py renamed to ‎tests/long_term/spec_decode/e2e/__init__.py

File renamed without changes.

‎tests/singlecard/spec_decode/e2e/conftest.py renamed to ‎tests/long_term/spec_decode/e2e/conftest.py

Lines changed: 2 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,10 @@
2020
import shutil
2121
from itertools import cycle
2222
from pathlib import Path
23-
from typing import List, Optional, Sequence, Tuple, Union
23+
from typing import Optional, Sequence, Union
2424

25-
import pytest
2625
import torch
27-
from vllm import LLM, SamplingParams
28-
from vllm.distributed import cleanup_dist_env_and_memory
29-
from vllm.model_executor.utils import set_random_seed
26+
from vllm import SamplingParams
3027
from vllm.sequence import PromptLogprobs, SampleLogprobs
3128

3229
from ....model_utils import (TokensTextLogprobs,
@@ -45,65 +42,6 @@
4542
]
4643

4744

48-
@pytest.fixture
49-
def test_llm_generator(common_llm_kwargs, per_test_common_llm_kwargs,
50-
test_llm_kwargs, seed):
51-
52-
def generate():
53-
kwargs = {
54-
**common_llm_kwargs,
55-
**per_test_common_llm_kwargs,
56-
**test_llm_kwargs,
57-
}
58-
59-
llm = LLM(**kwargs)
60-
61-
if seed is not None:
62-
set_random_seed(seed)
63-
64-
yield llm
65-
66-
del llm
67-
cleanup_dist_env_and_memory()
68-
69-
return generate
70-
71-
72-
def maybe_assert_ngram_worker(llm):
73-
# Verify the proposer worker is ngram if ngram is specified.
74-
if (llm.llm_engine.speculative_config is not None
75-
and llm.llm_engine.speculative_config.method == "ngram"):
76-
from vllm.spec_decode.ngram_worker import NGramWorker
77-
assert isinstance(
78-
llm.llm_engine.model_executor.driver_worker.proposer_worker,
79-
NGramWorker)
80-
81-
82-
def get_output_from_llm_generator(
83-
llm_generator, prompts,
84-
sampling_params) -> Tuple[List[str], List[List[int]], float]:
85-
tokens: List[str] = []
86-
token_ids: List[List[int]] = []
87-
acceptance_rate: float = -1.0
88-
for llm in llm_generator():
89-
maybe_assert_ngram_worker(llm)
90-
91-
outputs = llm.generate(prompts, sampling_params, use_tqdm=True)
92-
93-
token_ids = [output.outputs[0].token_ids for output in outputs]
94-
tokens = [output.outputs[0].text for output in outputs]
95-
96-
# Fetch acceptance rate if logging is enabled.
97-
if stat_loggers := getattr(llm.llm_engine, "stat_loggers", None):
98-
stat_logger = stat_loggers["prometheus"]
99-
acceptance_rate = (stat_logger.metrics.
100-
gauge_spec_decode_draft_acceptance_rate.labels(
101-
**stat_logger.labels)._value.get())
102-
del llm
103-
104-
return tokens, token_ids, acceptance_rate
105-
106-
10745
def check_logprobs_correctness(
10846
spec_outputs: Sequence[Union[TokensTextLogprobs,
10947
TokensTextLogprobsPromptLogprobs]],

‎tests/singlecard/spec_decode/e2e/test_medusa_correctness.py renamed to ‎tests/long_term/spec_decode/e2e/test_medusa_correctness.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141

4242
import pytest
4343

44-
from tests.singlecard.spec_decode.e2e.conftest import \
44+
from tests.long_term.spec_decode.e2e.conftest import \
4545
run_equality_correctness_test
46-
from tests.singlecard.spec_decode.utils import maybe_enable_chunked_prefill
46+
from tests.long_term.spec_decode.utils import maybe_enable_chunked_prefill
4747

4848
# main model
4949
# lmsys/vicuna-7b-v1.3 was to be used but it's causing
@@ -443,8 +443,3 @@ def test_mqa_scorer(vllm_runner, common_llm_kwargs, per_test_common_llm_kwargs,
443443
max_output_len=output_len,
444444
seed=seed,
445445
temperature=0.0)
446-
447-
448-
if __name__ == "__main__":
449-
import pytest
450-
pytest.main([__file__])

‎tests/singlecard/spec_decode/e2e/test_mlp_correctness.py renamed to ‎tests/long_term/spec_decode/e2e/test_mlp_correctness.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
from vllm.model_executor.layers.vocab_parallel_embedding import \
4242
pad_vocab_size # noqa: F401
4343

44-
from tests.singlecard.spec_decode.e2e.conftest import \
44+
from tests.long_term.spec_decode.e2e.conftest import \
4545
run_equality_correctness_test
46-
from tests.singlecard.spec_decode.utils import maybe_enable_chunked_prefill
46+
from tests.long_term.spec_decode.utils import maybe_enable_chunked_prefill
4747

4848
# main model
4949
MAIN_MODEL = "JackFram/llama-160m"

‎tests/singlecard/spec_decode/e2e/test_mtp_correctness.py renamed to ‎tests/long_term/spec_decode/e2e/test_mtp_correctness.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,3 @@ def test_mtp_disable_queue(vllm_runner, common_llm_kwargs,
450450
per_test_common_llm_kwargs,
451451
baseline_llm_kwargs, test_llm_kwargs,
452452
batch_size, output_len, seed)
453-
454-
455-
if __name__ == "__main__":
456-
import pytest
457-
pytest.main([__file__])

‎tests/singlecard/spec_decode/e2e/test_ngram_correctness.py renamed to ‎tests/long_term/spec_decode/e2e/test_ngram_correctness.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444

4545
import pytest
4646

47-
from tests.singlecard.spec_decode.e2e.conftest import \
47+
from tests.long_term.spec_decode.e2e.conftest import \
4848
run_equality_correctness_test
49-
from tests.singlecard.spec_decode.utils import maybe_enable_chunked_prefill
49+
from tests.long_term.spec_decode.utils import maybe_enable_chunked_prefill
5050

5151

5252
@pytest.mark.parametrize(

‎tests/singlecard/spec_decode/e2e/test_v1_spec_decode.py renamed to ‎tests/long_term/spec_decode/e2e/test_v1_spec_decode.py

File renamed without changes.

‎tests/singlecard/spec_decode/test_dynamic_spec_decode.py renamed to ‎tests/long_term/spec_decode/test_dynamic_spec_decode.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
from vllm.spec_decode.spec_decode_worker import SpecDecodeWorker
2828
from vllm.spec_decode.top1_proposer import Top1Proposer
2929

30-
from tests.singlecard.spec_decode.test_utils import mock_spec_decode_sampler
31-
from tests.singlecard.spec_decode.utils import create_batch, mock_worker
30+
from tests.long_term.spec_decode.test_utils import mock_spec_decode_sampler
31+
from tests.long_term.spec_decode.utils import create_batch, mock_worker
3232

3333

3434
@pytest.mark.parametrize('queue_size', [4])

‎tests/singlecard/spec_decode/test_multi_step_worker.py renamed to ‎tests/long_term/spec_decode/test_multi_step_worker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from vllm.spec_decode.multi_step_worker import MultiStepWorker
3030
from vllm.spec_decode.top1_proposer import Top1Proposer
3131

32-
from tests.singlecard.spec_decode.utils import (
32+
from tests.long_term.spec_decode.utils import (
3333
assert_logprobs_dict_allclose, create_batch,
3434
create_seq_group_metadata_from_prompts, create_worker,
3535
patch_execute_model_with_seeds, zero_kv_cache)

0 commit comments

Comments
 (0)