[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:
15d76f74e2
Signed-off-by: wxsIcey <1790571317@qq.com>
This commit is contained in:
@@ -15,7 +15,7 @@ on:
|
|||||||
required: false
|
required: false
|
||||||
type: string
|
type: string
|
||||||
description: base image for pods
|
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:
|
config_file_path:
|
||||||
required: true
|
required: true
|
||||||
type: string
|
type: string
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ on:
|
|||||||
image:
|
image:
|
||||||
required: false
|
required: false
|
||||||
type: string
|
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:
|
tests:
|
||||||
required: true
|
required: true
|
||||||
type: string
|
type: string
|
||||||
|
|||||||
10
.github/workflows/_e2e_test.yaml
vendored
10
.github/workflows/_e2e_test.yaml
vendored
@@ -157,7 +157,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
part: [0]
|
part: [0]
|
||||||
container:
|
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:
|
env:
|
||||||
VLLM_LOGGING_LEVEL: ERROR
|
VLLM_LOGGING_LEVEL: ERROR
|
||||||
VLLM_USE_MODELSCOPE: True
|
VLLM_USE_MODELSCOPE: True
|
||||||
@@ -221,7 +221,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
part: [0]
|
part: [0]
|
||||||
container:
|
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:
|
env:
|
||||||
VLLM_LOGGING_LEVEL: ERROR
|
VLLM_LOGGING_LEVEL: ERROR
|
||||||
VLLM_USE_MODELSCOPE: True
|
VLLM_USE_MODELSCOPE: True
|
||||||
@@ -293,7 +293,7 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
part: [0]
|
part: [0]
|
||||||
container:
|
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:
|
env:
|
||||||
VLLM_LOGGING_LEVEL: ERROR
|
VLLM_LOGGING_LEVEL: ERROR
|
||||||
VLLM_USE_MODELSCOPE: True
|
VLLM_USE_MODELSCOPE: True
|
||||||
@@ -353,7 +353,7 @@ jobs:
|
|||||||
runs-on: linux-aarch64-310p-1
|
runs-on: linux-aarch64-310p-1
|
||||||
if: ${{ inputs.contains_310 }}
|
if: ${{ inputs.contains_310 }}
|
||||||
container:
|
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:
|
env:
|
||||||
VLLM_LOGGING_LEVEL: ERROR
|
VLLM_LOGGING_LEVEL: ERROR
|
||||||
VLLM_USE_MODELSCOPE: True
|
VLLM_USE_MODELSCOPE: True
|
||||||
@@ -411,7 +411,7 @@ jobs:
|
|||||||
runs-on: linux-aarch64-310p-4
|
runs-on: linux-aarch64-310p-4
|
||||||
if: ${{ inputs.contains_310 }}
|
if: ${{ inputs.contains_310 }}
|
||||||
container:
|
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:
|
env:
|
||||||
VLLM_LOGGING_LEVEL: ERROR
|
VLLM_LOGGING_LEVEL: ERROR
|
||||||
VLLM_USE_MODELSCOPE: True
|
VLLM_USE_MODELSCOPE: True
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
# This file is a part of the vllm-ascend project.
|
# This file is a part of the vllm-ascend project.
|
||||||
#
|
#
|
||||||
ARG PY_VERSION=3.11
|
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"
|
ARG SOC_VERSION="ascend910b1"
|
||||||
|
|
||||||
|
|||||||
2
.github/workflows/pr_test_full.yaml
vendored
2
.github/workflows/pr_test_full.yaml
vendored
@@ -81,6 +81,6 @@ jobs:
|
|||||||
uses: ./.github/workflows/_e2e_test.yaml
|
uses: ./.github/workflows/_e2e_test.yaml
|
||||||
with:
|
with:
|
||||||
vllm: ${{ matrix.vllm_version }}
|
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
|
contains_310: false
|
||||||
type: full
|
type: full
|
||||||
|
|||||||
4
.github/workflows/pr_test_light.yaml
vendored
4
.github/workflows/pr_test_light.yaml
vendored
@@ -94,7 +94,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
vllm: ${{ matrix.vllm_version }}
|
vllm: ${{ matrix.vllm_version }}
|
||||||
runner: linux-amd64-cpu-8-hk
|
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
|
type: pr
|
||||||
|
|
||||||
e2e-light:
|
e2e-light:
|
||||||
@@ -109,6 +109,6 @@ jobs:
|
|||||||
uses: ./.github/workflows/_e2e_test.yaml
|
uses: ./.github/workflows/_e2e_test.yaml
|
||||||
with:
|
with:
|
||||||
vllm: ${{ matrix.vllm_version }}
|
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' }}
|
contains_310: ${{ needs.changes.outputs._310_tracker == 'true' }}
|
||||||
type: light
|
type: light
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ jobs:
|
|||||||
--network host \
|
--network host \
|
||||||
--platform linux/arm64 \
|
--platform linux/arm64 \
|
||||||
-f .github/workflows/dockerfiles/Dockerfile.nightly.${TARGET} \
|
-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 UBUNTU_VERSION="22.04" \
|
||||||
--build-arg PYTHON_VERSION="3.11" \
|
--build-arg PYTHON_VERSION="3.11" \
|
||||||
-t "$IMAGE_TAG" .
|
-t "$IMAGE_TAG" .
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ jobs:
|
|||||||
vllm: v0.16.0
|
vllm: v0.16.0
|
||||||
runner: ${{ matrix.test_config.os }}
|
runner: ${{ matrix.test_config.os }}
|
||||||
model_list: ${{ toJson(matrix.test_config.model_list) }}
|
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
|
upload: false
|
||||||
|
|
||||||
doc-test:
|
doc-test:
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ jobs:
|
|||||||
vllm_ascend_branch: main
|
vllm_ascend_branch: main
|
||||||
max-parallel: 1
|
max-parallel: 1
|
||||||
container:
|
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:
|
volumes:
|
||||||
- /usr/local/dcmi:/usr/local/dcmi
|
- /usr/local/dcmi:/usr/local/dcmi
|
||||||
- /usr/local/bin/npu-smi:/usr/local/bin/npu-smi
|
- /usr/local/bin/npu-smi:/usr/local/bin/npu-smi
|
||||||
|
|||||||
@@ -34,6 +34,6 @@ jobs:
|
|||||||
uses: ./.github/workflows/_e2e_test.yaml
|
uses: ./.github/workflows/_e2e_test.yaml
|
||||||
with:
|
with:
|
||||||
vllm: main
|
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
|
contains_310: false
|
||||||
type: full
|
type: full
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
# This file is a part of the vllm-ascend project.
|
# 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 PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
|
||||||
ARG MOONCAKE_TAG="v0.3.8.post1"
|
ARG MOONCAKE_TAG="v0.3.8.post1"
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
# This file is a part of the vllm-ascend project.
|
# 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 PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
|
||||||
ARG SOC_VERSION="ascend310p1"
|
ARG SOC_VERSION="ascend310p1"
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
# This file is a part of the vllm-ascend project.
|
# 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 PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
|
||||||
ARG SOC_VERSION="ascend310p1"
|
ARG SOC_VERSION="ascend310p1"
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
# This file is a part of the vllm-ascend project.
|
# 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 PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
|
||||||
ARG MOONCAKE_TAG=v0.3.8.post1
|
ARG MOONCAKE_TAG=v0.3.8.post1
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
# This file is a part of the vllm-ascend project.
|
# 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 PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
|
||||||
ARG MOONCAKE_TAG="v0.3.8.post1"
|
ARG MOONCAKE_TAG="v0.3.8.post1"
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
# This file is a part of the vllm-ascend project.
|
# 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 PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
|
||||||
ARG MOONCAKE_TAG="v0.3.8.post1"
|
ARG MOONCAKE_TAG="v0.3.8.post1"
|
||||||
|
|||||||
@@ -12,10 +12,10 @@ This document describes how to install vllm-ascend manually.
|
|||||||
| Software | Supported version | Note |
|
| 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 |
|
| 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-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 |
|
| 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:
|
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
|
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.
|
# 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
|
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.0_linux-"$(uname -i)".run
|
chmod +x ./Ascend-cann-toolkit_8.5.1_linux-"$(uname -i)".run
|
||||||
./Ascend-cann-toolkit_8.5.0_linux-"$(uname -i)".run --full
|
./Ascend-cann-toolkit_8.5.1_linux-"$(uname -i)".run --full
|
||||||
source /usr/local/Ascend/ascend-toolkit/set_env.sh
|
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
|
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.0_linux-"$(uname -i)".run
|
chmod +x ./Ascend-cann-910b-ops_8.5.1_linux-"$(uname -i)".run
|
||||||
./Ascend-cann-910b-ops_8.5.0_linux-"$(uname -i)".run --install
|
./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
|
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.0_linux-"$(uname -i)".run
|
chmod +x ./Ascend-cann-nnal_8.5.1_linux-"$(uname -i)".run
|
||||||
./Ascend-cann-nnal_8.5.0_linux-"$(uname -i)".run --install
|
./Ascend-cann-nnal_8.5.1_linux-"$(uname -i)".run --install
|
||||||
|
|
||||||
source /usr/local/Ascend/nnal/atb/set_env.sh
|
source /usr/local/Ascend/nnal/atb/set_env.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
|
export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
|
||||||
# cann and atb environment setup
|
# cann and atb environment setup
|
||||||
source /usr/local/Ascend/ascend-toolkit/set_env.sh
|
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
|
set +eu
|
||||||
source /usr/local/Ascend/nnal/atb/set_env.sh
|
source /usr/local/Ascend/nnal/atb/set_env.sh
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
# Base docker image used to build the vllm-ascend e2e test image, which is built in the vLLM repository
|
# 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"
|
||||||
|
|||||||
Reference in New Issue
Block a user