From 276d91091dc959f2f327b5816adfd36090b8c8f3 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Wed, 26 Jun 2024 11:51:42 +0800 Subject: [PATCH] fix: fix ubuntu version (#25) * fix: fix ubuntu version --- _static/ascend_actions.js | 3 +- _static/package_info.js | 81 ++++++++++++++++++++++++++------ _static/pytorch_actions.js | 3 +- sources/ascend/quick_install.rst | 2 +- sources/pytorch/install.rst | 1 - 5 files changed, 72 insertions(+), 18 deletions(-) diff --git a/_static/ascend_actions.js b/_static/ascend_actions.js index 7083a7c..1209ae8 100644 --- a/_static/ascend_actions.js +++ b/_static/ascend_actions.js @@ -226,8 +226,9 @@ docker run \\ -v /usr/local/dcmi:/usr/local/dcmi \\ -v /usr/local/bin/npu-smi:/usr/local/bin/npu-smi \\ -v /usr/local/Ascend/driver/lib64/:/usr/local/Ascend/driver/lib64/ \\ - -v /etc/ascend_install.info:/etc/ascend_install.info \\ -v /usr/local/Ascend/driver/version.info:/usr/local/Ascend/driver/version.info \\ + -v /etc/ascend_install.info:/etc/ascend_install.info \\ + -e DRIVER_PATH=/usr/local/Ascend/driver \\ -it ${docker_images[i]} bash `; diff --git a/_static/package_info.js b/_static/package_info.js index e55082d..f531b12 100644 --- a/_static/package_info.js +++ b/_static/package_info.js @@ -1,5 +1,5 @@ const package_info = { - '8.0.RC2': { + '8.0.RC2.alpha002': { x86_64: { url: 'https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/Milan-ASL/Milan-ASL V100R001C18SPC702/Ascend-cann-toolkit_8.0.RC2.alpha002_linux-x86_64.run' }, @@ -49,6 +49,50 @@ const package_info = { aarch64: { driver_url: 'https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/Ascend HDK/Ascend HDK 24.1.RC1/Ascend-hdk-910b-npu-driver_24.1.rc1_linux-aarch64.run', } + }, + '310p': { + driver_version: '24.1.rc1', + firmware_version: '7.1.0.6.220', + firmware_url: ' https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/Ascend HDK/Ascend HDK 24.1.RC1/Ascend-hdk-310p-npu-firmware_7.1.0.6.220.run', + kernel_url: 'https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN 8.0.RC1/Ascend-cann-kernels-310p_8.0.RC1_linux.run', + x86_64: { + driver_url: 'https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/Ascend HDK/Ascend HDK 24.1.RC1/Ascend-hdk-310p-npu-driver_24.1.rc1_linux-x86-64.run', + }, + aarch64: { + driver_url: ' https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/Ascend HDK/Ascend HDK 24.1.RC1/Ascend-hdk-310p-npu-driver_24.1.rc1_linux-aarch64.run', + } + } + }, + '7.0.1': { + x86_64: { + url: 'https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN 7.0.1/Ascend-cann-toolkit_7.0.1_linux-x86_64.run' + }, + aarch64: { + url: 'https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN 7.0.1/Ascend-cann-toolkit_7.0.1_linux-aarch64.run' + }, + '910b': { + driver_version: '23.0.3', + firmware_version: '7.1.0.5.220', + firmware_url: 'https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/Ascend HDK/Ascend HDK 23.0.3/Ascend-hdk-910b-npu-firmware_7.1.0.5.220.run', + kernel_url: 'https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN 7.0.1/Ascend-cann-kernels-910b_7.0.1_linux.run', + x86_64: { + driver_url: 'https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/Ascend HDK/Ascend HDK 23.0.3/Ascend-hdk-910b-npu-driver_23.0.3_linux-x86-64.run', + }, + aarch64: { + driver_url: 'https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/Ascend HDK/Ascend HDK 23.0.3/Ascend-hdk-910b-npu-driver_23.0.3_linux-aarch64.run', + } + }, + '310p': { + driver_version: '23.0.1', + firmware_version: '7.1.0.4.220', + firmware_url: 'https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/Ascend HDK/Ascend HDK 23.0.2.1/Ascend-hdk-310p-npu-firmware_7.1.0.4.220.run', + kernel_url: 'https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/CANN/CANN 7.0.1/Ascend-cann-kernels-310p_7.0.1_linux.run', + x86_64: { + driver_url: 'https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/Ascend HDK/Ascend HDK 23.0.2.1/Ascend-hdk-310p-npu-driver_23.0.1_linux-x86-64.run', + }, + aarch64: { + driver_url: 'https://ascend-repo.obs.cn-east-2.myhuaweicloud.com/Ascend HDK/Ascend HDK 23.0.2.1/Ascend-hdk-310p-npu-driver_23.0.1_linux-aarch64.run', + } } }, '7.0.0': { @@ -177,18 +221,33 @@ const package_info = { const docker_images = [ - 'cosdt/cann:7.0.0-310p-ubuntu20.04', - 'cosdt/cann:7.0.0-310p-ubuntu22.04', - 'cosdt/cann:7.0.0-310p-openeuler20.03', - 'cosdt/cann:7.0.0-910b-ubuntu20.04', - 'cosdt/cann:7.0.0-910b-ubuntu22.04', - 'cosdt/cann:7.0.0-910b-openeuler20.03', + 'cosdt/cann:7.0.1-310p-ubuntu20.04', + 'cosdt/cann:7.0.1-310p-ubuntu22.04', + 'cosdt/cann:7.0.1-310p-openeuler20.03', + 'cosdt/cann:7.0.1-910-ubuntu20.04', + 'cosdt/cann:7.0.1-910-ubuntu22.04', + 'cosdt/cann:7.0.1-910-openeuler20.03', + 'cosdt/cann:7.0.1-910b-ubuntu20.04', + 'cosdt/cann:7.0.1-910b-ubuntu22.04', + 'cosdt/cann:7.0.1-910b-openeuler20.03', 'cosdt/cann:8.0.rc1-310p-ubuntu20.04', 'cosdt/cann:8.0.rc1-310p-ubuntu22.04', 'cosdt/cann:8.0.rc1-310p-openeuler20.03', + 'cosdt/cann:8.0.rc1-910-ubuntu20.04', + 'cosdt/cann:8.0.rc1-910-ubuntu22.04', + 'cosdt/cann:8.0.rc1-910-openeuler20.03', 'cosdt/cann:8.0.rc1-910b-ubuntu20.04', 'cosdt/cann:8.0.rc1-910b-ubuntu22.04', 'cosdt/cann:8.0.rc1-910b-openeuler20.03', + 'cosdt/cann:8.0.rc2.alpha002-310p-ubuntu20.04', + 'cosdt/cann:8.0.rc2.alpha002-310p-ubuntu22.04', + 'cosdt/cann:8.0.rc2.alpha002-310p-openeuler20.03', + 'cosdt/cann:8.0.rc2.alpha002-910-ubuntu20.04', + 'cosdt/cann:8.0.rc2.alpha002-910-ubuntu22.04', + 'cosdt/cann:8.0.rc2.alpha002-910-openeuler20.03', + 'cosdt/cann:8.0.rc2.alpha002-910b-ubuntu20.04', + 'cosdt/cann:8.0.rc2.alpha002-910b-ubuntu22.04', + 'cosdt/cann:8.0.rc2.alpha002-910b-openeuler20.03', ]; const pytorch_versions = { @@ -203,11 +262,5 @@ const pytorch_versions = { npu_branch: 'v2.1.0-6.0.rc1', cann: 'CANN 8.0.RC1', docker: 'cosdt/pytorch:2.1.0' - }, - '2.0.1': { - torch_npu: '2.0.1.post1', - npu_branch: 'v2.1.0-5.0.0', - cann: 'CANN 7.0.0', - docker: 'cosdt/pytorch:2.0.1' } -} \ No newline at end of file +} diff --git a/_static/pytorch_actions.js b/_static/pytorch_actions.js index 6395f7b..98838a4 100644 --- a/_static/pytorch_actions.js +++ b/_static/pytorch_actions.js @@ -57,8 +57,9 @@ docker run \\ -v /usr/local/dcmi:/usr/local/dcmi \\ -v /usr/local/bin/npu-smi:/usr/local/bin/npu-smi \\ -v /usr/local/Ascend/driver/lib64/:/usr/local/Ascend/driver/lib64/ \\ - -v /etc/ascend_install.info:/etc/ascend_install.info \\ -v /usr/local/Ascend/driver/version.info:/usr/local/Ascend/driver/version.info \\ + -v /etc/ascend_install.info:/etc/ascend_install.info \\ + -e DRIVER_PATH=/usr/local/Ascend/driver \\ -it ${match_versions['docker']} bash `; diff --git a/sources/ascend/quick_install.rst b/sources/ascend/quick_install.rst index 6cd03ea..659656a 100644 --- a/sources/ascend/quick_install.rst +++ b/sources/ascend/quick_install.rst @@ -25,7 +25,7 @@ ======== ======================================== 软件 版本 ======== ======================================== -操作系统 openEuler20.03/22.03, Ubuntu 20.04/24.04 +操作系统 openEuler20.03/22.03, Ubuntu 20.04/22.04 Python 3.8, 3.9, 3.10 ======== ======================================== diff --git a/sources/pytorch/install.rst b/sources/pytorch/install.rst index 66e209e..9965fbb 100644 --- a/sources/pytorch/install.rst +++ b/sources/pytorch/install.rst @@ -25,7 +25,6 @@
PyTorch版本
2.2.0
2.1.0
-
2.0.1
PyTorch-NPU版本