Skip to content

Commit 18a5c20

Browse files
authored
Merge branch 'main' into k2-thinking
Signed-off-by: Ruri <[email protected]>
2 parents a9260a9 + e8e20c0 commit 18a5c20

Some content is hidden

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

67 files changed

+2462
-1855
lines changed

.github/Dockerfile.buildwheel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ARG PY_VERSION=3.11
1818
FROM quay.io/ascend/manylinux:8.3.rc2-910b-manylinux_2_28-py${PY_VERSION}
1919

2020
ARG COMPILE_CUSTOM_KERNELS=1
21-
ARG SOC_VERSION
21+
ARG SOC_VERSION="ascend910b1"
2222

2323
# Define environments
2424
ENV DEBIAN_FRONTEND=noninteractive

.github/workflows/_e2e_test.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ jobs:
271271
tests/e2e/multicard/test_offline_inference_distributed.py::test_models_distributed_DeepSeek_W4A8DYNAMIC
272272
# tests/e2e/multicard/test_qwen3_moe.py::test_models_distributed_Qwen3_MOE_TP2_WITH_EP \
273273
# tests/e2e/multicard/test_qwen3_moe.py::test_models_distributed_Qwen3_MOE_W8A8_WITH_EP
274+
pytest -sv tests/e2e/multicard/test_data_parallel_tp2.py
274275
275276
- name: Install Ascend toolkit & triton_ascend (for Qwen3-Next-80B-A3B-Instruct)
276277
shell: bash -l {0}
@@ -286,4 +287,4 @@ jobs:
286287
VLLM_USE_MODELSCOPE: True
287288
run: |
288289
. /usr/local/Ascend/ascend-toolkit/8.3.RC2/bisheng_toolkit/set_env.sh
289-
pytest -sv tests/e2e/multicard/test_qwen3_next.py
290+
#pytest -sv tests/e2e/multicard/test_qwen3_next.py

.github/workflows/image_310p_openeuler.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,5 +132,4 @@ jobs:
132132
file: Dockerfile.310p.openEuler
133133
build-args: |
134134
PIP_INDEX_URL=https://pypi.org/simple
135-
SOC_VERSION=ascend310p1
136135
provenance: false

.github/workflows/image_310p_ubuntu.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,4 @@ jobs:
128128
tags: ${{ steps.meta.outputs.tags }}
129129
build-args: |
130130
PIP_INDEX_URL=https://pypi.org/simple
131-
SOC_VERSION=ascend310p1
132131
provenance: false

.github/workflows/image_a3_openeuler.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,5 @@ jobs:
131131
file: Dockerfile.a3.openEuler
132132
build-args: |
133133
PIP_INDEX_URL=https://pypi.org/simple
134-
SOC_VERSION=ascend910_9391
135134
provenance: false
136135

.github/workflows/image_a3_ubuntu.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,5 @@ jobs:
127127
tags: ${{ steps.meta.outputs.tags }}
128128
build-args: |
129129
PIP_INDEX_URL=https://pypi.org/simple
130-
SOC_VERSION=ascend910_9391
131130
provenance: false
132131

.github/workflows/image_openeuler.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,5 +131,4 @@ jobs:
131131
file: Dockerfile.openEuler
132132
build-args: |
133133
PIP_INDEX_URL=https://pypi.org/simple
134-
SOC_VERSION=ascend910b1
135134
provenance: false

.github/workflows/image_ubuntu.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,4 @@ jobs:
128128
tags: ${{ steps.meta.outputs.tags }}
129129
build-args: |
130130
PIP_INDEX_URL=https://pypi.org/simple
131-
SOC_VERSION=ascend910b1
132131
provenance: false

.github/workflows/release_whl.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ jobs:
6969
ls
7070
docker build -f ./.github/Dockerfile.buildwheel \
7171
--build-arg PY_VERSION=${{ matrix.python-version }} \
72-
--build-arg SOC_VERSION=ascend910b1 \
7372
-t wheel:v1 .
7473
docker run --rm \
7574
-u $(id -u):$(id -g) \

.github/workflows/vllm_ascend_test_310p.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ jobs:
100100
run: |
101101
export PIP_EXTRA_INDEX_URL=https://mirrors.huaweicloud.com/ascend/repos/pypi
102102
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Ascend/ascend-toolkit/latest/x86_64-linux/devlib
103-
export SOC_VERSION=ASCEND310P3
104103
pip install -r requirements-dev.txt
105104
pip install -v -e .
106105

0 commit comments

Comments
 (0)