Skip to content

Commit 79538b5

Browse files
YikunMengqingCao
andauthored
Upgrade CANN version to 8.1.rc1 (#747)
### What this PR does / why we need it? Make CANN version bump separately from #708 - Upgrade CANN version to 8.1.rc1 - Add prefix to speed up download `m.daocloud.io/quay.io/ascend/cann:8.1.rc1-910b-ubuntu22.04-py3.10` - Address tail sapce for Dockerfile.openEuler - Add note for `/workspace` and `/vllm-workspace` as followup of #741 ### Does this PR introduce _any_ user-facing change? no ### How was this patch tested? CI passed Co-authored-by: MengqingCao <cmq0113@163.com> Signed-off-by: Yikun Jiang <yikunkero@gmail.com> Co-authored-by: MengqingCao <cmq0113@163.com>
1 parent d7e1110 commit 79538b5

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

.github/workflows/vllm_ascend_test.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ jobs:
6161
name: vLLM Ascend test
6262
runs-on: ${{ matrix.os }}
6363
container:
64-
image: quay.io/ascend/cann:8.0.0-910b-ubuntu22.04-py3.10
64+
# TODO(yikun): Remove m.daocloud.io prefix when infra proxy ready
65+
image: m.daocloud.io/quay.io/ascend/cann:8.1.rc1-910b-ubuntu22.04-py3.10
6566
env:
6667
HF_ENDPOINT: https://hf-mirror.com
6768
HF_TOKEN: ${{ secrets.HF_TOKEN }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# This file is a part of the vllm-ascend project.
1616
#
1717

18-
FROM quay.io/ascend/cann:8.0.0-910b-ubuntu22.04-py3.10
18+
FROM quay.io/ascend/cann:8.1.rc1-910b-ubuntu22.04-py3.10
1919

2020
ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
2121
ARG COMPILE_CUSTOM_KERNELS=1

Dockerfile.openEuler

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# This file is a part of the vllm-ascend project.
1616
#
1717

18-
FROM quay.io/ascend/cann:8.0.0-910b-openeuler22.03-py3.10
18+
FROM quay.io/ascend/cann:8.1.rc1-910b-openeuler22.03-py3.10
1919

2020
ARG PIP_INDEX_URL="https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
2121
ARG COMPILE_CUSTOM_KERNELS=1
@@ -30,7 +30,7 @@ RUN pip config set global.index-url ${PIP_INDEX_URL}
3030

3131
WORKDIR /workspace
3232

33-
COPY . /vllm-workspace/vllm-ascend/
33+
COPY . /vllm-workspace/vllm-ascend/
3434

3535
# Install vLLM
3636
ARG VLLM_REPO=https://github.com/vllm-project/vllm.git
@@ -53,4 +53,4 @@ RUN source /usr/local/Ascend/ascend-toolkit/set_env.sh && \
5353
RUN python3 -m pip install modelscope ray && \
5454
python3 -m pip cache purge
5555

56-
CMD ["/bin/bash"]
56+
CMD ["/bin/bash"]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ By using vLLM Ascend plugin, popular open-source models, including Transformer-l
3737
- OS: Linux
3838
- Software:
3939
* Python >= 3.9, < 3.12
40-
* CANN >= 8.0.0
40+
* CANN >= 8.1.rc1
4141
* PyTorch >= 2.5.1, torch-npu >= 2.5.1
4242
* vLLM (the same version as vllm-ascend)
4343

README.zh.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ vLLM 昇腾插件 (`vllm-ascend`) 是一个由社区维护的让vLLM在Ascend NP
3737
- 硬件:Atlas 800I A2 Inference系列、Atlas A2 Training系列
3838
- 操作系统:Linux
3939
- 软件:
40-
* Python >= 3.9
41-
* CANN >= 8.0.RC2
40+
* Python >= 3.9, < 3.12
41+
* CANN >= 8.1.RC1
4242
* PyTorch >= 2.5.1, torch-npu >= 2.5.1
4343
* vLLM (与vllm-ascend版本一致)
4444

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
'pip_vllm_ascend_version': "0.8.4rc2",
7474
'pip_vllm_version': "0.8.4",
7575
# CANN image tag
76-
'cann_image_tag': "8.0.0-910b-ubuntu22.04-py3.10",
76+
'cann_image_tag': "8.1.rc1-910b-ubuntu22.04-py3.10",
7777
}
7878

7979
# Add any paths that contain templates here, relative to this directory.

docs/source/installation.md

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This document describes how to install vllm-ascend manually.
1111

1212
| Software | Supported version | Note |
1313
|-----------|-------------------|----------------------------------------|
14-
| CANN | >= 8.0.0 | Required for vllm-ascend and torch-npu |
14+
| CANN | >= 8.1.rc1 | Required for vllm-ascend and torch-npu |
1515
| torch-npu | >= 2.5.1 | Required for vllm-ascend |
1616
| torch | >= 2.5.1 | Required for torch-npu and vllm |
1717

@@ -69,10 +69,6 @@ docker run --rm \
6969
:animate: fade-in-slide-down
7070
You can also install CANN manually:
7171

72-
```{note}
73-
This guide takes aarch64 as an example. If you run on x86, you need to replace `aarch64` with `x86_64` for the package name shown below.
74-
```
75-
7672
```bash
7773
# Create a virtual environment
7874
python -m venv vllm-ascend-env
@@ -82,19 +78,19 @@ source vllm-ascend-env/bin/activate
8278
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
8379

8480
# Download and install the CANN package.
85-
wget https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%208.0.0/Ascend-cann-toolkit_8.0.0_linux-aarch64.run
86-
chmod +x ./Ascend-cann-toolkit_8.0.0_linux-aarch64.run
87-
./Ascend-cann-toolkit_8.0.0_linux-aarch64.run --full
81+
wget https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%208.1.RC1/Ascend-cann-toolkit_8.1.RC1_linux-"$(uname -i)".run
82+
chmod +x ./Ascend-cann-toolkit_8.1.RC1_linux-"$(uname -i)".run
83+
./Ascend-cann-toolkit_8.1.RC1_linux-"$(uname -i)".run --full
8884

8985
source /usr/local/Ascend/ascend-toolkit/set_env.sh
9086

91-
wget https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%208.0.0/Ascend-cann-kernels-910b_8.0.0_linux-aarch64.run
92-
chmod +x ./Ascend-cann-kernels-910b_8.0.0_linux-aarch64.run
93-
./Ascend-cann-kernels-910b_8.0.0_linux-aarch64.run --install
87+
wget https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%208.1.RC1/Ascend-cann-kernels-910b_8.1.RC1_linux-"$(uname -i)".run
88+
chmod +x ./Ascend-cann-kernels-910b_8.1.RC1_linux-"$(uname -i)".run
89+
./Ascend-cann-kernels-910b_8.1.RC1_linux-"$(uname -i)".run --install
9490

95-
wget https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%208.0.0/Ascend-cann-nnal_8.0.0_linux-aarch64.run
96-
chmod +x ./Ascend-cann-nnal_8.0.0_linux-aarch64.run
97-
./Ascend-cann-nnal_8.0.0_linux-aarch64.run --install
91+
wget https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN%208.1.RC1/Ascend-cann-nnal_8.1.RC1_linux-"$(uname -i)".run
92+
chmod +x ./Ascend-cann-nnal_8.1.RC1_linux-"$(uname -i)".run
93+
./Ascend-cann-nnal_8.1.RC1_linux-"$(uname -i)".run --install
9894

9995
source /usr/local/Ascend/nnal/atb/set_env.sh
10096
```
@@ -223,6 +219,7 @@ docker run --rm \
223219
-it $IMAGE bash
224220
```
225221

222+
The default workdir is `/workspace`, vLLM and vLLM Ascend code are placed in `/vllm-workspace` and installed in [development mode](https://setuptools.pypa.io/en/latest/userguide/development_mode.html)(`pip install -e`) to help developer immediately take place changes without requiring a new installation.
226223
::::
227224

228225
:::::

docs/source/quick_start.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ docker run --rm \
6262
::::
6363
:::::
6464

65+
The default workdir is `/workspace`, vLLM and vLLM Ascend code are placed in `/vllm-workspace` and installed in [development mode](https://setuptools.pypa.io/en/latest/userguide/development_mode.html)(`pip install -e`) to help developer immediately take place changes without requiring a new installation.
66+
6567
## Usage
6668

6769
You can use Modelscope mirror to speed up download:

0 commit comments

Comments
 (0)