Skip to content

Commit c3ac524

Browse files
authored
[CI] Refactor the workspace paths for vllm and vllm-ascend (vllm-project#11367)
### What this PR does / why we need it? Refactor the workspace paths for vllm and vllm-ascend ### Does this PR introduce _any_ user-facing change? ### How was this patch tested? - vLLM version: v0.23.0 - vLLM main: vllm-project/vllm@a30addc Signed-off-by: wjunLu <wjunlu217@gmail.com>
1 parent 5da6e53 commit c3ac524

1 file changed

Lines changed: 26 additions & 27 deletions

File tree

.github/workflows/schedule_main2main.yaml

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ defaults:
3838

3939
env:
4040
UPSTREAM_REPO: vllm-project/vllm-ascend
41-
WORK_REPO_DIR: ${{ github.workspace }}/vllm-ascend
42-
VLLM_DIR: ${{ github.workspace }}/vllm
4341
MAIN2MAIN_MODEL: deepseek/deepseek-v4-pro
4442

4543

@@ -67,7 +65,6 @@ jobs:
6765
defaults:
6866
run:
6967
shell: bash -el {0}
70-
working-directory: ${{ env.WORK_REPO_DIR }}
7168
env:
7269
GH_TOKEN: ${{ secrets.PAT_TOKEN }}
7370
MAIN2MAIN_IMAGE_TAG: 9.0.0-910b-ubuntu22.04-py3.12
@@ -77,7 +74,7 @@ jobs:
7774
HEAD_FORK: vllm-ascend-ci/vllm-ascend
7875
MAIN2MAIN_KEEP_BRANCH: 'true'
7976
MAIN2MAIN_WORKSPACE: /tmp/main2main_flow/workspace
80-
MAIN2MAIN_CASES_FILE: ${{ github.workspace }}/vllm-ascend/.github/workflows/scripts/main2main_tests.json
77+
MAIN2MAIN_CASES_FILE: .github/workflows/scripts/main2main_tests.json
8178
MAIN2MAIN_LOG_HELPERS: |
8279
print_group() {
8380
local title="$1"
@@ -98,7 +95,9 @@ jobs:
9895
with:
9996
fetch-depth: 0
10097
submodules: recursive
101-
path: vllm-ascend
98+
99+
- name: Exclude vllm dir from ascend git
100+
run: echo "vllm-upstream/" >> .git/info/exclude
102101

103102
- name: Load main2main test cases
104103
run: |
@@ -121,7 +120,7 @@ jobs:
121120
with:
122121
repository: vllm-project/vllm
123122
ref: ${{ env.TARGET_COMMIT != '' && env.TARGET_COMMIT || 'main' }}
124-
path: vllm
123+
path: vllm-upstream
125124
fetch-depth: 0
126125

127126
- name: Validate target commit
@@ -140,19 +139,19 @@ jobs:
140139
pip config set global.index-url http://cache-service.nginx-pypi-cache.svc.cluster.local/pypi/simple
141140
pip config set global.trusted-host cache-service.nginx-pypi-cache.svc.cluster.local
142141
apt-get update -y
143-
if [ -s "${WORK_REPO_DIR}/packages.txt" ]; then
144-
xargs -r apt-get -y install < "${WORK_REPO_DIR}/packages.txt"
142+
if [ -s "$GITHUB_WORKSPACE/packages.txt" ]; then
143+
xargs -r apt-get -y install < "$GITHUB_WORKSPACE/packages.txt"
145144
fi
146145
apt-get -y install git curl ca-certificates gcc g++ cmake libnuma-dev clang-15 jq gh
147146
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-15 20
148147
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-15 20
149-
git config --global --add safe.directory "${WORK_REPO_DIR}"
150-
git config --global --add safe.directory "${VLLM_DIR}"
148+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
149+
git config --global --add safe.directory "$GITHUB_WORKSPACE/vllm-upstream"
151150
pip install uv pytest
152151
153152
- name: Configure git identity
154153
if: always()
155-
working-directory: ${{ env.WORK_REPO_DIR }}
154+
working-directory: ${{ github.workspace }}
156155
run: |
157156
set -eu
158157
git config user.name "main2main-bot"
@@ -233,15 +232,15 @@ jobs:
233232
uses: runs-on/cache/restore@v5
234233
with:
235234
path: |
236-
vllm-ascend/vllm_ascend/_cann_ops_custom
237-
vllm-ascend/vllm_ascend/*.so
238-
vllm-ascend/vllm_ascend/lib
239-
vllm-ascend/vllm_ascend/include
235+
vllm_ascend/_cann_ops_custom
236+
vllm_ascend/*.so
237+
vllm_ascend/lib
238+
vllm_ascend/include
240239
key: vllm-ascend-build-v1-${{ steps.get_arch.outputs.arch }}-${{ env.MAIN2MAIN_IMAGE_TAG }}-${{ steps.get_csrc_hash.outputs.CSRC_HASH }}
241240

242241
- name: Create working branch
243242
id: branch
244-
working-directory: ${{ env.WORK_REPO_DIR }}
243+
working-directory: ${{ github.workspace }}
245244
run: |
246245
set -eu
247246
BRANCH="main2main_auto_$(date +%Y-%m-%d_%H-%M)"
@@ -268,18 +267,18 @@ jobs:
268267
"https://vllm-ascend.obs.cn-north-4.myhuaweicloud.com/vllm-ascend/${MOONCAKE_WHEEL}"
269268
270269
- name: Install vllm-project/vllm from source
271-
working-directory: ${{ env.VLLM_DIR }}
270+
working-directory: vllm-upstream
272271
run: |
273272
VLLM_TARGET_DEVICE=empty uv pip install .
274273
pip uninstall -y triton
275274
276275
- name: Install vllm-ascend
277-
working-directory: ${{ env.WORK_REPO_DIR }}
276+
working-directory: ${{ github.workspace }}
278277
run: |
279278
pip install uc-manager
280279
uv pip install -r requirements-dev.txt
281280
uv pip install --force-reinstall --no-deps triton-ascend==3.2.1
282-
if find "${{ env.WORK_REPO_DIR }}/vllm_ascend" -maxdepth 1 -name '*.so' -type f 2>/dev/null | grep -q .; then
281+
if find vllm_ascend -maxdepth 1 -name '*.so' -type f 2>/dev/null | grep -q .; then
283282
echo "CSRC cache hit: .so files found, skip kernel compilation"
284283
COMPILE_CUSTOM_KERNELS=0 uv pip install -e .
285284
else
@@ -292,10 +291,10 @@ jobs:
292291
uses: runs-on/cache/save@v5
293292
with:
294293
path: |
295-
vllm-ascend/vllm_ascend/_cann_ops_custom
296-
vllm-ascend/vllm_ascend/*.so
297-
vllm-ascend/vllm_ascend/lib
298-
vllm-ascend/vllm_ascend/include
294+
vllm_ascend/_cann_ops_custom
295+
vllm_ascend/*.so
296+
vllm_ascend/lib
297+
vllm_ascend/include
299298
key: vllm-ascend-build-v1-${{ steps.get_arch.outputs.arch }}-${{ env.MAIN2MAIN_IMAGE_TAG }}-${{ steps.get_csrc_hash.outputs.CSRC_HASH }}
300299

301300
- name: Run main2main flow
@@ -330,8 +329,8 @@ jobs:
330329
331330
set +e
332331
kickoff \
333-
--vllm-path "${VLLM_DIR}" \
334-
--vllm-ascend-path "${WORK_REPO_DIR}" \
332+
--vllm-path "$GITHUB_WORKSPACE/vllm-upstream" \
333+
--vllm-ascend-path "$GITHUB_WORKSPACE" \
335334
--target-commit "${TARGET_COMMIT}" \
336335
2> /tmp/main2main/kickoff.err \
337336
| tee /tmp/main2main/kickoff.log
@@ -378,7 +377,7 @@ jobs:
378377

379378
- name: Summarize final status
380379
id: final-status
381-
working-directory: ${{ env.WORK_REPO_DIR }}
380+
working-directory: ${{ github.workspace }}
382381
if: always()
383382
run: |
384383
set -eu
@@ -433,7 +432,7 @@ jobs:
433432
434433
- name: Create manual review issue
435434
if: steps.final-status.outputs.manual_review_required == 'true'
436-
working-directory: ${{ env.WORK_REPO_DIR }}
435+
working-directory: ${{ github.workspace }}
437436
run: |
438437
eval "${MAIN2MAIN_LOG_HELPERS}"
439438

0 commit comments

Comments
 (0)