Skip to content

Commit a1da111

Browse files
author
offline0806
committed
Merge remote-tracking branch 'upstream_gitee/main'
# Conflicts: # vllm_ascend/ops/common_fused_moe.py # vllm_ascend/worker/model_runner_v1.py
2 parents b63cb82 + e13c4dd commit a1da111

File tree

107 files changed

+3483
-3866
lines changed

Some content is hidden

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

107 files changed

+3483
-3866
lines changed

.github/actionlint.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ self-hosted-runner:
1515
- linux-aarch64-a3-2
1616
- linux-aarch64-a3-4
1717
- linux-aarch64-a3-8
18+
- linux-amd64-cpu-0

.github/workflows/accuracy_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ jobs:
303303
git push -f origin "${{ env.BRANCH_NAME }}"
304304
305305
- name: Create PR in upstream via API
306-
uses: actions/github-script@v7
306+
uses: actions/github-script@v8
307307
with:
308308
github-token: ${{ secrets.PAT_TOKEN }}
309309
script: |

.github/workflows/image_310p_openeuler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ jobs:
5454
}}
5555
steps:
5656
- uses: actions/checkout@v4
57+
with:
58+
fetch-depth: 0
59+
persist-credentials: false
5760

5861
- name: Print
5962
run: |

.github/workflows/image_310p_ubuntu.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ jobs:
5050

5151
steps:
5252
- uses: actions/checkout@v4
53+
with:
54+
fetch-depth: 0
55+
persist-credentials: false
5356

5457
- name: Print
5558
run: |

.github/workflows/image_a3_openeuler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ jobs:
5454
}}
5555
steps:
5656
- uses: actions/checkout@v4
57+
with:
58+
fetch-depth: 0
59+
persist-credentials: false
5760

5861
- name: Print
5962
run: |

.github/workflows/image_a3_ubuntu.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ jobs:
5050

5151
steps:
5252
- uses: actions/checkout@v4
53+
with:
54+
fetch-depth: 0
55+
persist-credentials: false
5356

5457
- name: Print
5558
run: |

.github/workflows/image_openeuler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ jobs:
5353
}}
5454
steps:
5555
- uses: actions/checkout@v4
56+
with:
57+
fetch-depth: 0
58+
persist-credentials: false
5659

5760
- name: Print
5861
run: |

.github/workflows/image_ubuntu.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ jobs:
5050

5151
steps:
5252
- uses: actions/checkout@v4
53+
with:
54+
fetch-depth: 0
55+
persist-credentials: false
5356

5457
- name: Print
5558
run: |

.github/workflows/pre-commit.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,19 @@ permissions:
88

99
jobs:
1010
pre-commit:
11-
runs-on: ubuntu-latest
11+
runs-on: linux-amd64-cpu-0
12+
container:
13+
image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.2.rc1-910b-ubuntu22.04-py3.11
1214
steps:
15+
- name: Config mirrors
16+
run: |
17+
sed -Ei 's@(ports|archive).ubuntu.com@cache-service.nginx-pypi-cache.svc.cluster.local:8081@g' /etc/apt/sources.list
18+
pip config set global.index-url http://cache-service.nginx-pypi-cache.svc.cluster.local/pypi/simple
19+
pip config set global.trusted-host cache-service.nginx-pypi-cache.svc.cluster.local
20+
apt-get update -y
21+
apt install git -y
1322
- name: Checkout vllm-project/vllm-ascend repo
1423
uses: actions/checkout@v4
15-
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
16-
with:
17-
python-version: "3.11"
1824
- run: echo "::add-matcher::.github/workflows/matchers/actionlint.json"
1925
- run: echo "::add-matcher::.github/workflows/matchers/mypy.json"
2026
- name: Checkout vllm-project/vllm repo
@@ -30,8 +36,9 @@ jobs:
3036
- name: Install vllm-ascend dev
3137
run: |
3238
pip install -r requirements-dev.txt --extra-index-url https://download.pytorch.org/whl/cpu
33-
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
39+
git config --global --add safe.directory '*'
40+
- name: Run pre-commit check
3441
env:
35-
SHELLCHECK_OPTS: "--exclude=SC2046,SC2006,SC2086" # Exclude SC2046, SC2006, SC2086 for actionlint
36-
with:
37-
extra_args: --all-files --hook-stage manual
42+
SHELLCHECK_OPTS: "--exclude=SC2046,SC2006,SC2086"
43+
GOPROXY: "https://goproxy.cn,direct"
44+
run: pre-commit run --all-files --hook-stage manual

.github/workflows/reminder_comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Remind to run full CI on PR
12-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
12+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
1313
with:
1414
script: |
1515
github.rest.issues.createComment({

0 commit comments

Comments
 (0)