From f7a8befc2023ead05c5e5a9b767a4cce2ba30aac Mon Sep 17 00:00:00 2001 From: Xiaoshuang Wang <1790571317@qq.com> Date: Tue, 3 Mar 2026 09:02:42 +0800 Subject: [PATCH] [CI] Upgrade CANN to 8.5.1 (#6897) ### What this PR does / why we need it? [CI] Upgrade CANN to 8.5.1 ### Does this PR introduce _any_ user-facing change? N/A ### How was this patch tested? CI passed with existing test. - vLLM version: v0.16.0 - vLLM main: https://github.com/vllm-project/vllm/commit/15d76f74e2fdb12a95ea00f0ca283acf6219a2b7 Signed-off-by: wxsIcey <1790571317@qq.com> --- .../workflows/_e2e_nightly_multi_node.yaml | 2 +- .../workflows/_e2e_nightly_single_node.yaml | 2 +- .github/workflows/_e2e_test.yaml | 10 ++++----- .../dockerfiles/Dockerfile.buildwheel | 2 +- .github/workflows/pr_test_full.yaml | 2 +- .github/workflows/pr_test_light.yaml | 4 ++-- .../schedule_nightly_image_build.yaml | 2 +- .../workflows/schedule_nightly_test_a2.yaml | 2 +- .../workflows/schedule_test_benchmarks.yaml | 2 +- .../workflows/schedule_test_vllm_main.yaml | 2 +- Dockerfile | 2 +- Dockerfile.310p | 2 +- Dockerfile.310p.openEuler | 2 +- Dockerfile.a3 | 2 +- Dockerfile.a3.openEuler | 2 +- Dockerfile.openEuler | 2 +- docs/source/installation.md | 22 +++++++++---------- tests/e2e/nightly/multi_node/scripts/run.sh | 2 +- tests/e2e/vllm_interface/vllm_test.cfg | 2 +- 19 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/_e2e_nightly_multi_node.yaml b/.github/workflows/_e2e_nightly_multi_node.yaml index c3f2bb4c..e080141c 100644 --- a/.github/workflows/_e2e_nightly_multi_node.yaml +++ b/.github/workflows/_e2e_nightly_multi_node.yaml @@ -15,7 +15,7 @@ on: required: false type: string description: base image for pods - default: "swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.0-910b-ubuntu22.04-py3.11" + default: "swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.1-910b-ubuntu22.04-py3.11" config_file_path: required: true type: string diff --git a/.github/workflows/_e2e_nightly_single_node.yaml b/.github/workflows/_e2e_nightly_single_node.yaml index 202bed21..40cb9d64 100644 --- a/.github/workflows/_e2e_nightly_single_node.yaml +++ b/.github/workflows/_e2e_nightly_single_node.yaml @@ -26,7 +26,7 @@ on: image: required: false type: string - default: "swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.0-910b-ubuntu22.04-py3.11" + default: "swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.1-910b-ubuntu22.04-py3.11" tests: required: true type: string diff --git a/.github/workflows/_e2e_test.yaml b/.github/workflows/_e2e_test.yaml index da0849b5..38184006 100644 --- a/.github/workflows/_e2e_test.yaml +++ b/.github/workflows/_e2e_test.yaml @@ -157,7 +157,7 @@ jobs: matrix: part: [0] container: - image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.0-a3-ubuntu22.04-py3.11 + image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.1-a3-ubuntu22.04-py3.11 env: VLLM_LOGGING_LEVEL: ERROR VLLM_USE_MODELSCOPE: True @@ -221,7 +221,7 @@ jobs: matrix: part: [0] container: - image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.0-a3-ubuntu22.04-py3.11 + image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.1-a3-ubuntu22.04-py3.11 env: VLLM_LOGGING_LEVEL: ERROR VLLM_USE_MODELSCOPE: True @@ -293,7 +293,7 @@ jobs: matrix: part: [0] container: - image: m.daocloud.io/quay.io/ascend/cann:8.5.0-a3-ubuntu22.04-py3.11 + image: m.daocloud.io/quay.io/ascend/cann:8.5.1-a3-ubuntu22.04-py3.11 env: VLLM_LOGGING_LEVEL: ERROR VLLM_USE_MODELSCOPE: True @@ -353,7 +353,7 @@ jobs: runs-on: linux-aarch64-310p-1 if: ${{ inputs.contains_310 }} container: - image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.0-310p-ubuntu22.04-py3.11 + image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.1-310p-ubuntu22.04-py3.11 env: VLLM_LOGGING_LEVEL: ERROR VLLM_USE_MODELSCOPE: True @@ -411,7 +411,7 @@ jobs: runs-on: linux-aarch64-310p-4 if: ${{ inputs.contains_310 }} container: - image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.0-310p-ubuntu22.04-py3.11 + image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.1-310p-ubuntu22.04-py3.11 env: VLLM_LOGGING_LEVEL: ERROR VLLM_USE_MODELSCOPE: True diff --git a/.github/workflows/dockerfiles/Dockerfile.buildwheel b/.github/workflows/dockerfiles/Dockerfile.buildwheel index 5e757977..f2f61d70 100644 --- a/.github/workflows/dockerfiles/Dockerfile.buildwheel +++ b/.github/workflows/dockerfiles/Dockerfile.buildwheel @@ -15,7 +15,7 @@ # This file is a part of the vllm-ascend project. # ARG PY_VERSION=3.11 -FROM quay.io/ascend/manylinux:8.5.0-910b-manylinux_2_28-py${PY_VERSION} +FROM quay.io/ascend/manylinux:8.5.1-910b-manylinux_2_28-py${PY_VERSION} ARG SOC_VERSION="ascend910b1" diff --git a/.github/workflows/pr_test_full.yaml b/.github/workflows/pr_test_full.yaml index 925106c9..2e9f78ce 100644 --- a/.github/workflows/pr_test_full.yaml +++ b/.github/workflows/pr_test_full.yaml @@ -81,6 +81,6 @@ jobs: uses: ./.github/workflows/_e2e_test.yaml with: vllm: ${{ matrix.vllm_version }} - image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.0-910b-ubuntu22.04-py3.11 + image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.1-910b-ubuntu22.04-py3.11 contains_310: false type: full diff --git a/.github/workflows/pr_test_light.yaml b/.github/workflows/pr_test_light.yaml index faf3cb62..a95ffec4 100644 --- a/.github/workflows/pr_test_light.yaml +++ b/.github/workflows/pr_test_light.yaml @@ -94,7 +94,7 @@ jobs: with: vllm: ${{ matrix.vllm_version }} runner: linux-amd64-cpu-8-hk - image: quay.nju.edu.cn/ascend/cann:8.5.0-910b-ubuntu22.04-py3.11 + image: quay.nju.edu.cn/ascend/cann:8.5.1-910b-ubuntu22.04-py3.11 type: pr e2e-light: @@ -109,6 +109,6 @@ jobs: uses: ./.github/workflows/_e2e_test.yaml with: vllm: ${{ matrix.vllm_version }} - image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.0-910b-ubuntu22.04-py3.11 + image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.1-910b-ubuntu22.04-py3.11 contains_310: ${{ needs.changes.outputs._310_tracker == 'true' }} type: light diff --git a/.github/workflows/schedule_nightly_image_build.yaml b/.github/workflows/schedule_nightly_image_build.yaml index aaf56074..b4e1aac8 100644 --- a/.github/workflows/schedule_nightly_image_build.yaml +++ b/.github/workflows/schedule_nightly_image_build.yaml @@ -47,7 +47,7 @@ jobs: --network host \ --platform linux/arm64 \ -f .github/workflows/dockerfiles/Dockerfile.nightly.${TARGET} \ - --build-arg CANN_VERSION="8.5.0" \ + --build-arg CANN_VERSION="8.5.1" \ --build-arg UBUNTU_VERSION="22.04" \ --build-arg PYTHON_VERSION="3.11" \ -t "$IMAGE_TAG" . diff --git a/.github/workflows/schedule_nightly_test_a2.yaml b/.github/workflows/schedule_nightly_test_a2.yaml index 3e555557..abd2c23b 100644 --- a/.github/workflows/schedule_nightly_test_a2.yaml +++ b/.github/workflows/schedule_nightly_test_a2.yaml @@ -136,7 +136,7 @@ jobs: vllm: v0.16.0 runner: ${{ matrix.test_config.os }} model_list: ${{ toJson(matrix.test_config.model_list) }} - image: 'swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.0-910b-ubuntu22.04-py3.11' + image: 'swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.1-910b-ubuntu22.04-py3.11' upload: false doc-test: diff --git a/.github/workflows/schedule_test_benchmarks.yaml b/.github/workflows/schedule_test_benchmarks.yaml index 18238094..0fa63fad 100644 --- a/.github/workflows/schedule_test_benchmarks.yaml +++ b/.github/workflows/schedule_test_benchmarks.yaml @@ -55,7 +55,7 @@ jobs: vllm_ascend_branch: main max-parallel: 1 container: - image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.0-910b-ubuntu22.04-py3.11 + image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.1-910b-ubuntu22.04-py3.11 volumes: - /usr/local/dcmi:/usr/local/dcmi - /usr/local/bin/npu-smi:/usr/local/bin/npu-smi diff --git a/.github/workflows/schedule_test_vllm_main.yaml b/.github/workflows/schedule_test_vllm_main.yaml index b60fbb0c..3cd0e109 100644 --- a/.github/workflows/schedule_test_vllm_main.yaml +++ b/.github/workflows/schedule_test_vllm_main.yaml @@ -34,6 +34,6 @@ jobs: uses: ./.github/workflows/_e2e_test.yaml with: vllm: main - image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.0-910b-ubuntu22.04-py3.11 + image: swr.cn-southwest-2.myhuaweicloud.com/base_image/ascend-ci/cann:8.5.1-910b-ubuntu22.04-py3.11 contains_310: false type: full diff --git a/Dockerfile b/Dockerfile index b04ae9e1..f5c563fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # This file is a part of the vllm-ascend project. # -FROM quay.io/ascend/cann:8.5.0-910b-ubuntu22.04-py3.11 +FROM quay.io/ascend/cann:8.5.1-910b-ubuntu22.04-py3.11 ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" ARG MOONCAKE_TAG="v0.3.8.post1" diff --git a/Dockerfile.310p b/Dockerfile.310p index ec5772a2..11a32e63 100644 --- a/Dockerfile.310p +++ b/Dockerfile.310p @@ -15,7 +15,7 @@ # This file is a part of the vllm-ascend project. # -FROM quay.io/ascend/cann:8.5.0-310p-ubuntu22.04-py3.11 +FROM quay.io/ascend/cann:8.5.1-310p-ubuntu22.04-py3.11 ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" ARG SOC_VERSION="ascend310p1" diff --git a/Dockerfile.310p.openEuler b/Dockerfile.310p.openEuler index 92f94199..d71c885c 100644 --- a/Dockerfile.310p.openEuler +++ b/Dockerfile.310p.openEuler @@ -15,7 +15,7 @@ # This file is a part of the vllm-ascend project. # -FROM quay.io/ascend/cann:8.5.0-310p-openeuler24.03-py3.11 +FROM quay.io/ascend/cann:8.5.1-310p-openeuler24.03-py3.11 ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" ARG SOC_VERSION="ascend310p1" diff --git a/Dockerfile.a3 b/Dockerfile.a3 index 17bd077b..e9bf3a24 100644 --- a/Dockerfile.a3 +++ b/Dockerfile.a3 @@ -15,7 +15,7 @@ # This file is a part of the vllm-ascend project. # -FROM quay.io/ascend/cann:8.5.0-a3-ubuntu22.04-py3.11 +FROM quay.io/ascend/cann:8.5.1-a3-ubuntu22.04-py3.11 ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" ARG MOONCAKE_TAG=v0.3.8.post1 diff --git a/Dockerfile.a3.openEuler b/Dockerfile.a3.openEuler index 4e5b3838..39509407 100644 --- a/Dockerfile.a3.openEuler +++ b/Dockerfile.a3.openEuler @@ -15,7 +15,7 @@ # This file is a part of the vllm-ascend project. # -FROM quay.io/ascend/cann:8.5.0-a3-openeuler24.03-py3.11 +FROM quay.io/ascend/cann:8.5.1-a3-openeuler24.03-py3.11 ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" ARG MOONCAKE_TAG="v0.3.8.post1" diff --git a/Dockerfile.openEuler b/Dockerfile.openEuler index 825b8a24..35437865 100644 --- a/Dockerfile.openEuler +++ b/Dockerfile.openEuler @@ -15,7 +15,7 @@ # This file is a part of the vllm-ascend project. # -FROM quay.io/ascend/cann:8.5.0-910b-openeuler24.03-py3.11 +FROM quay.io/ascend/cann:8.5.1-910b-openeuler24.03-py3.11 ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" ARG MOONCAKE_TAG="v0.3.8.post1" diff --git a/docs/source/installation.md b/docs/source/installation.md index 95c1fd00..eb01cad2 100644 --- a/docs/source/installation.md +++ b/docs/source/installation.md @@ -12,10 +12,10 @@ This document describes how to install vllm-ascend manually. | Software | Supported version | Note | |---------------|----------------------------------|-------------------------------------------| | Ascend HDK | Refer to the documentation [here](https://www.hiascend.com/document/detail/zh/canncommercial/83RC1/releasenote/releasenote_0000.html) | Required for CANN | - | CANN | == 8.5.0 | Required for vllm-ascend and torch-npu | + | CANN | == 8.5.1 | Required for vllm-ascend and torch-npu | | torch-npu | == 2.9.0 | Required for vllm-ascend, No need to install manually, it will be auto installed in below steps | | torch | == 2.9.0 | Required for torch-npu and vllm | - | NNAL | == 8.5.0 | Required for libatb.so, enables advanced tensor operations | + | NNAL | == 8.5.1 | Required for libatb.so, enables advanced tensor operations | There are two installation methods: @@ -90,18 +90,18 @@ source vllm-ascend-env/bin/activate pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple attrs 'numpy<2.0.0' decorator sympy cffi pyyaml pathlib2 psutil protobuf scipy requests absl-py wheel typing_extensions # Download and install the CANN package. -wget --header="Referer: https://www.hiascend.com/" https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%208.5.0/Ascend-cann-toolkit_8.5.0_linux-"$(uname -i)".run -chmod +x ./Ascend-cann-toolkit_8.5.0_linux-"$(uname -i)".run -./Ascend-cann-toolkit_8.5.0_linux-"$(uname -i)".run --full +wget --header="Referer: https://www.hiascend.com/" https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%208.5.1/Ascend-cann-toolkit_8.5.1_linux-"$(uname -i)".run +chmod +x ./Ascend-cann-toolkit_8.5.1_linux-"$(uname -i)".run +./Ascend-cann-toolkit_8.5.1_linux-"$(uname -i)".run --full source /usr/local/Ascend/ascend-toolkit/set_env.sh -wget --header="Referer: https://www.hiascend.com/" https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%208.5.0/Ascend-cann-910b-ops_8.5.0_linux-"$(uname -i)".run -chmod +x ./Ascend-cann-910b-ops_8.5.0_linux-"$(uname -i)".run -./Ascend-cann-910b-ops_8.5.0_linux-"$(uname -i)".run --install +wget --header="Referer: https://www.hiascend.com/" https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%208.5.1/Ascend-cann-910b-ops_8.5.1_linux-"$(uname -i)".run +chmod +x ./Ascend-cann-910b-ops_8.5.1_linux-"$(uname -i)".run +./Ascend-cann-910b-ops_8.5.1_linux-"$(uname -i)".run --install -wget --header="Referer: https://www.hiascend.com/" https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%208.5.0/Ascend-cann-nnal_8.5.0_linux-"$(uname -i)".run -chmod +x ./Ascend-cann-nnal_8.5.0_linux-"$(uname -i)".run -./Ascend-cann-nnal_8.5.0_linux-"$(uname -i)".run --install +wget --header="Referer: https://www.hiascend.com/" https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%208.5.1/Ascend-cann-nnal_8.5.1_linux-"$(uname -i)".run +chmod +x ./Ascend-cann-nnal_8.5.1_linux-"$(uname -i)".run +./Ascend-cann-nnal_8.5.1_linux-"$(uname -i)".run --install source /usr/local/Ascend/nnal/atb/set_env.sh ``` diff --git a/tests/e2e/nightly/multi_node/scripts/run.sh b/tests/e2e/nightly/multi_node/scripts/run.sh index 0aced732..2456d9a5 100644 --- a/tests/e2e/nightly/multi_node/scripts/run.sh +++ b/tests/e2e/nightly/multi_node/scripts/run.sh @@ -13,7 +13,7 @@ export LD_LIBRARY_PATH=/usr/local/Ascend/ascend-toolkit/latest/python/site-packa export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH # cann and atb environment setup source /usr/local/Ascend/ascend-toolkit/set_env.sh -source /usr/local/Ascend/cann-8.5.0/share/info/ascendnpu-ir/bin/set_env.sh +source /usr/local/Ascend/cann-8.5.1/share/info/ascendnpu-ir/bin/set_env.sh set +eu source /usr/local/Ascend/nnal/atb/set_env.sh diff --git a/tests/e2e/vllm_interface/vllm_test.cfg b/tests/e2e/vllm_interface/vllm_test.cfg index 204101b6..485efb22 100644 --- a/tests/e2e/vllm_interface/vllm_test.cfg +++ b/tests/e2e/vllm_interface/vllm_test.cfg @@ -1,2 +1,2 @@ # Base docker image used to build the vllm-ascend e2e test image, which is built in the vLLM repository -BASE_IMAGE_NAME="quay.io/ascend/cann:8.5.0-910b-ubuntu22.04-py3.11" +BASE_IMAGE_NAME="quay.io/ascend/cann:8.5.1-910b-ubuntu22.04-py3.11"