From 30915533527692bd03b236a0df836cd1582a5f42 Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Fri, 21 Mar 2025 03:00:19 +0000 Subject: [PATCH 01/49] release cann8.1.RC1.alpha001 image --- arg.json | 379 +++------------------------------------------------ cann/cann.sh | 9 +- 2 files changed, 26 insertions(+), 362 deletions(-) diff --git a/arg.json b/arg.json index 5ecc9d5..96f65af 100644 --- a/arg.json +++ b/arg.json @@ -23,407 +23,70 @@ ], "cann": [ { - "cann_version": "7.0.1", + "cann_version": "8.1.RC1.alpha001", "cann_chip": "910b", "os_name": "ubuntu", "os_version": "22.04", - "py_version": "3.8", - "tags": { - "common": [ - "7.0.1-910b-ubuntu22.04-py3.8", - "7.0.1", - "ubuntu-python3.8-cann7.0.1" - ], - "ascendhub": [ - ] - } - }, - { - "cann_version": "7.0.1", - "cann_chip": "910b", - "os_name": "openeuler", - "os_version": "22.03", - "py_version": "3.8", - "tags": { - "common": [ - "7.0.1-910b-openeuler22.03-py3.8", - "openeuler-python3.8-cann7.0.1" - ], - "ascendhub": [ - ] - } - }, - { - "cann_version": "8.0.RC1", - "cann_chip": "910b", - "os_name": "ubuntu", - "os_version": "22.04", - "py_version": "3.8", - "tags": { - "common": [ - "8.0.rc1-910b-ubuntu22.04-py3.8", - "8.0.rc1", - "ubuntu-python3.8-cann8.0.rc1" - ], - "ascendhub": [ - ] - } - }, - { - "cann_version": "8.0.RC1", - "cann_chip": "910b", - "os_name": "openeuler", - "os_version": "22.03", - "py_version": "3.8", - "tags": { - "common": [ - "8.0.rc1-910b-openeuler22.03-py3.8", - "openeuler-python3.8-cann8.0.rc1" - ], - "ascendhub": [ - ] - } - }, - { - "cann_version": "8.0.RC2", - "cann_chip": "910b", - "os_name": "openeuler", - "os_version": "22.03", - "py_version": "3.8", - "tags": { - "common": [ - "8.0.rc2-910b-openeuler22.03-py3.8", - "openeuler-python3.8-cann8.0.rc2" - ], - "ascendhub": [ - ] - } - }, - { - "cann_version": "8.0.RC2", - "cann_chip": "910b", - "os_name": "ubuntu", - "os_version": "22.04", - "py_version": "3.9", - "tags": { - "common": [ - "8.0.rc2-910b-ubuntu22.04-py3.9", - "ubuntu-python3.9-cann8.0.rc2" - ], - "ascendhub": [ - ] - } - }, - { - "cann_version": "8.0.RC2", - "cann_chip": "910b", - "os_name": "openeuler", - "os_version": "22.03", - "py_version": "3.9", - "tags": { - "common": [ - "8.0.rc2-910b-openeuler22.03-py3.9", - "openeuler-python3.9-cann8.0.rc2" - ], - "ascendhub": [ - ] - } - }, - { - "cann_version": "8.0.RC2", - "cann_chip": "910b", - "os_name": "openeuler", - "os_version": "22.03", "py_version": "3.10", "tags": { "common": [ - "8.0.rc2-910b-openeuler22.03-py3.10", - "openeuler-python3.10-cann8.0.rc2" - ], - "ascendhub": [ - ] - } - }, - { - "cann_version": "8.0.RC2", - "cann_chip": "910b", - "os_name": "ubuntu", - "os_version": "22.04", - "py_version": "3.10", - "tags": { - "common": [ - "8.0.rc2-910b-ubuntu22.04-py3.10", - "8.0.rc2", - "ubuntu-python3.10-cann8.0.rc2" - ], - "ascendhub": [ - ] - } - }, - { - "cann_version": "8.0.RC3", - "cann_chip": "910b", - "os_name": "ubuntu", - "os_version": "22.04", - "py_version": "3.10", - "tags": { - "common": [ - "8.0.rc3-910b-ubuntu22.04-py3.10", - "ubuntu-python3.10-cann8.0.rc3" - ], - "ascendhub": [ - ] - } - }, - { - "cann_version": "8.0.RC3", - "cann_chip": "910b", - "os_name": "openeuler", - "os_version": "22.03", - "py_version": "3.10", - "tags": { - "common": [ - "8.0.rc3-910b-openeuler22.03-py3.10", - "openeuler-python3.10-cann8.0.rc3" - ], - "ascendhub": [ - ] - } - }, - { - "cann_version": "8.0.0", - "cann_chip": "910b", - "os_name": "ubuntu", - "os_version": "22.04", - "py_version": "3.10", - "tags": { - "common": [ - "8.0.0-910b-ubuntu22.04-py3.10", - "8.0.0", + "8.1.RC1.alpha001-910b-ubuntu22.04-py3.10", + "8.1.RC1.alpha001", "latest", - "ubuntu-python3.10-cann8.0.0" + "ubuntu-python3.10-cann8.1.RC1.alpha001" ], "ascendhub": [ - "8.0.0-910b-ubuntu22.04-py3.10" + "8.1.RC1.alpha001-910b-ubuntu22.04-py3.10" ] } }, { - "cann_version": "8.0.0", + "cann_version": "8.1.RC1.alpha001", "cann_chip": "910b", "os_name": "openeuler", "os_version": "22.03", "py_version": "3.10", "tags": { "common": [ - "8.0.0-910b-openeuler22.03-py3.10", - "openeuler-python3.10-cann8.0.0" - ], - "ascendhub": [ - "8.0.0-910b-openeuler22.03-py3.10" - ] - } - } - ], - "python": [ - { - "py_version": "3.8", - "os_name": "ubuntu", - "os_version": "22.04", - "tags": { - "common": [ - "3.8-ubuntu22.04", - "3.8" + "8.1.RC1.alpha001-910b-openeuler22.03-py3.10", + "openeuler-python3.10-cann8.1.RC1.alpha001" ], "ascendhub": [ + "8.1.RC1.alpha001-910b-openeuler22.03-py3.10" ] } }, { - "py_version": "3.9", + "cann_version": "8.1.RC1.alpha001", + "cann_chip": "310p", "os_name": "ubuntu", "os_version": "22.04", - "tags": { - "common": [ - "3.9-ubuntu22.04", - "3.9" - ], - "ascendhub": [ - ] - } - }, - { "py_version": "3.10", - "os_name": "ubuntu", - "os_version": "22.04", "tags": { "common": [ - "3.10-ubuntu22.04", - "3.10" - ], - "ascendhub": [ - ] - } - }, - { - "py_version": "3.11", - "os_name": "ubuntu", - "os_version": "22.04", - "tags": { - "common": [ - "3.11-ubuntu22.04", - "3.11" - ], - "ascendhub": [ - ] - } - }, - { - "py_version": "3.12", - "os_name": "ubuntu", - "os_version": "22.04", - "tags": { - "common": [ - "3.12-ubuntu22.04", - "3.12" - ], - "ascendhub": [ - ] - } - }, - { - "py_version": "3.13", - "os_name": "ubuntu", - "os_version": "22.04", - "tags": { - "common": [ - "3.13-ubuntu22.04", - "3.13" - ], - "ascendhub": [ - ] - } - }, - { - "py_version": "3.8", - "os_name": "openeuler", - "os_version": "22.03", - "tags": { - "common": [ - "3.8-openeuler22.03" + "8.1.RC1.alpha001-310p-ubuntu22.04-py3.10", + "8.1.RC1.alpha001", + "latest", + "ubuntu-python3.10-cann8.1.RC1.alpha001" ], "ascendhub": [ + "8.1.RC1.alpha001-310p-ubuntu22.04-py3.10" ] } }, { - "py_version": "3.9", + "cann_version": "8.1.RC1.alpha001", + "cann_chip": "310p", "os_name": "openeuler", "os_version": "22.03", - "tags": { - "common": [ - "3.9-openeuler22.03" - ], - "ascendhub": [ - ] - } - }, - { "py_version": "3.10", - "os_name": "openeuler", - "os_version": "22.03", - "tags": { - "common": [ - "3.10-openeuler22.03" - ], - "ascendhub": [ - ] - } - }, - { - "py_version": "3.11", - "os_name": "openeuler", - "os_version": "22.03", - "tags": { - "common": [ - "3.11-openeuler22.03" - ], - "ascendhub": [ - ] - } - }, - { - "py_version": "3.12", - "os_name": "openeuler", - "os_version": "22.03", - "tags": { - "common": [ - "3.12-openeuler22.03" - ], - "ascendhub": [ - ] - } - }, - { - "py_version": "3.13", - "os_name": "openeuler", - "os_version": "22.03", - "tags": { - "common": [ - "3.13-openeuler22.03" - ], - "ascendhub": [ - ] - } - } - ], - "pytorch": [ - { - "pytorch_version": "2.1.0", - "cann_tag": "8.0.rc1-910b-ubuntu22.04-py3.8", - "tags": { - "common": [ - "2.1.0", - "ubuntu-python3.8-cann8.0.rc1-pytorch2.1.0" - ], - "ascendhub": [ - ] - } - }, - { - "pytorch_version": "2.2.0", - "cann_tag": "8.0.rc1-910b-ubuntu22.04-py3.8", - "tags": { - "common": [ - "2.2.0", - "ubuntu-python3.8-cann8.0.rc1-pytorch2.2.0" - ], - "ascendhub": [ - ] - } - } - ], - "mindspore": [ - { - "mindspore_version": "2.4.0", - "cann_tag": "8.0.rc3-910b-ubuntu22.04-py3.10", - "tags": { - "common": [ - "2.4.0", - "ubuntu-python3.10-cann8.0.rc3-mindspore2.4.0" - ], - "ascendhub": [ - ] - } - }, - { - "mindspore_version": "2.4.0", - "cann_tag": "8.0.rc3-910b-openeuler22.03-py3.10", "tags": { "common": [ - "openeuler-python3.10-cann8.0.rc3-mindspore2.4.0" + "8.1.RC1.alpha001-310p-openeuler22.03-py3.10", + "openeuler-python3.10-cann8.1.RC1.alpha001" ], "ascendhub": [ + "8.1.RC1.alpha001-310p-openeuler22.03-py3.10" ] } } diff --git a/cann/cann.sh b/cann/cann.sh index 62eca7d..71c3b34 100755 --- a/cann/cann.sh +++ b/cann/cann.sh @@ -50,6 +50,7 @@ download_cann() { version_dict["8.0.RC2.alpha002"]="V100R001C18SPC805" version_dict["8.0.RC2.alpha003"]="V100R001C18SPC703" version_dict["8.0.RC3.alpha002"]="V100R001C19SPC702" + version_dict["8.1.RC1.alpha001"]="V100R001C21B800TP034" local url="https://ascend-repo.obs.cn-east-2.myhuaweicloud.com" if [[ ${CANN_VERSION} == *alpha* ]]; then @@ -75,8 +76,8 @@ download_cann() { _download_file "${kernels_url}" "${KERNELS_PATH}" fi - # Download cann-kernels - if [[ ${CANN_VERSION} == "8.0.0" ]]; then + # Download cann-nnals + if [[ ${CANN_VERSION} == "8.1.RC1.alpha001" ]]; then local nnal_url="${url_prefix}/${NNAL_FILE}" _download_file "${nnal_url}" "${NNAL_PATH}" fi @@ -127,7 +128,7 @@ install_cann() { rm -f "${KERNELS_PATH}" # Install CANN NNAL - if [[ ${CANN_VERSION} == "8.0.0" ]]; then + if [[ ${CANN_VERSION} == "8.1.RC1.alpha001" ]]; then _info "Installing ${NNAL_PATH}" chmod +x "${NNAL_PATH}" bash "${NNAL_PATH}" --quiet --install --install-for-all --install-path="${CANN_HOME}" @@ -160,7 +161,7 @@ fi TOOLKIT_FILE="Ascend-cann-toolkit_${CANN_VERSION}_linux-${ARCH}.run" KERNELS_FILE="Ascend-cann-kernels-${CANN_CHIP}_${CANN_VERSION}_${KERNELS_ARCH}.run" -NNAL_FILE="Ascend-cann-nnal_${CANN_VERSION}_linux-${ARCH}.run" +NNAL_FILE="Ascend-cann-nnal_8.0.0_linux-${ARCH}.run" TOOLKIT_PATH="/tmp/${TOOLKIT_FILE}" KERNELS_PATH="/tmp/${KERNELS_FILE}" NNAL_PATH="/tmp/${NNAL_FILE}" From 5466e94036c9637ed1e4a6a489fcdad90e36b0d1 Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Fri, 21 Mar 2025 03:01:59 +0000 Subject: [PATCH 02/49] fix --- .github/workflows/docker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 17b1a24..99a12c5 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -104,7 +104,6 @@ jobs: name: cann needs: - prepare - - python if: | !cancelled() && contains(needs.prepare.outputs.targets, 'cann') && From 25a70e48f2cc5c1a7de365059a907473003d2115 Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Fri, 21 Mar 2025 03:18:45 +0000 Subject: [PATCH 03/49] fix --- cann/cann.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cann/cann.sh b/cann/cann.sh index 71c3b34..dc32508 100755 --- a/cann/cann.sh +++ b/cann/cann.sh @@ -153,7 +153,7 @@ CANN_CHIP=${CANN_CHIP:="910b"} CANN_VERSION=${CANN_VERSION:="8.0.0"} # NOTE: kernels are arch-specific after 8.0.RC3.alpha002 -if [[ ${CANN_VERSION} == "8.0.RC3" || ${CANN_VERSION} == "8.0.0" ]]; then +if [[ ${CANN_VERSION} == "8.1.RC1.alpha001" || ${CANN_VERSION} == "8.0.0" ]]; then KERNELS_ARCH="linux-${ARCH}" else KERNELS_ARCH="linux" From a6b6ef8bbf5e9654de028ef53050980155af5c96 Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Fri, 21 Mar 2025 03:36:35 +0000 Subject: [PATCH 04/49] fix --- cann/cann.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cann/cann.sh b/cann/cann.sh index dc32508..d6bfda7 100755 --- a/cann/cann.sh +++ b/cann/cann.sh @@ -53,6 +53,7 @@ download_cann() { version_dict["8.1.RC1.alpha001"]="V100R001C21B800TP034" local url="https://ascend-repo.obs.cn-east-2.myhuaweicloud.com" + local nnal_url_prefix="${url}/CANN/CANN%208.0.0" if [[ ${CANN_VERSION} == *alpha* ]]; then local version=${version_dict[${CANN_VERSION}]} if [[ ${version} ]]; then @@ -78,7 +79,7 @@ download_cann() { # Download cann-nnals if [[ ${CANN_VERSION} == "8.1.RC1.alpha001" ]]; then - local nnal_url="${url_prefix}/${NNAL_FILE}" + local nnal_url="${nnal_url_prefix}/${NNAL_FILE}" _download_file "${nnal_url}" "${NNAL_PATH}" fi From adbf4d1bbe8e1e504149cfb5ae39d8c9c7ae4df5 Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Fri, 21 Mar 2025 03:54:18 +0000 Subject: [PATCH 05/49] fix --- arg.json | 4 ++++ cann/cann.sh | 6 ++++-- cann/openeuler.Dockerfile | 1 + cann/ubuntu.Dockerfile | 1 + docker-bake.hcl | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/arg.json b/arg.json index 96f65af..5715078 100644 --- a/arg.json +++ b/arg.json @@ -28,6 +28,7 @@ "os_name": "ubuntu", "os_version": "22.04", "py_version": "3.10", + "nnal_version": "8.0.0", "tags": { "common": [ "8.1.RC1.alpha001-910b-ubuntu22.04-py3.10", @@ -46,6 +47,7 @@ "os_name": "openeuler", "os_version": "22.03", "py_version": "3.10", + "nnal_version": "8.0.0", "tags": { "common": [ "8.1.RC1.alpha001-910b-openeuler22.03-py3.10", @@ -62,6 +64,7 @@ "os_name": "ubuntu", "os_version": "22.04", "py_version": "3.10", + "nnal_version": "8.0.0", "tags": { "common": [ "8.1.RC1.alpha001-310p-ubuntu22.04-py3.10", @@ -80,6 +83,7 @@ "os_name": "openeuler", "os_version": "22.03", "py_version": "3.10", + "nnal_version": "8.0.0", "tags": { "common": [ "8.1.RC1.alpha001-310p-openeuler22.03-py3.10", diff --git a/cann/cann.sh b/cann/cann.sh index d6bfda7..2f4c18b 100755 --- a/cann/cann.sh +++ b/cann/cann.sh @@ -53,7 +53,7 @@ download_cann() { version_dict["8.1.RC1.alpha001"]="V100R001C21B800TP034" local url="https://ascend-repo.obs.cn-east-2.myhuaweicloud.com" - local nnal_url_prefix="${url}/CANN/CANN%208.0.0" + if [[ ${CANN_VERSION} == *alpha* ]]; then local version=${version_dict[${CANN_VERSION}]} if [[ ${version} ]]; then @@ -65,6 +65,8 @@ download_cann() { local url_prefix="${url}/CANN/CANN%20${CANN_VERSION}" fi + local nnal_url_prefix="${url}/CANN/CANN%20${NNAL_VERSION}" + # Download cann-toolkit if [ ! -f "${TOOLKIT_PATH}" ]; then local toolkit_url="${url_prefix}/${TOOLKIT_FILE}" @@ -162,7 +164,7 @@ fi TOOLKIT_FILE="Ascend-cann-toolkit_${CANN_VERSION}_linux-${ARCH}.run" KERNELS_FILE="Ascend-cann-kernels-${CANN_CHIP}_${CANN_VERSION}_${KERNELS_ARCH}.run" -NNAL_FILE="Ascend-cann-nnal_8.0.0_linux-${ARCH}.run" +NNAL_FILE="Ascend-cann-nnal_${NNAL_VERSION}_linux-${ARCH}.run" TOOLKIT_PATH="/tmp/${TOOLKIT_FILE}" KERNELS_PATH="/tmp/${KERNELS_FILE}" NNAL_PATH="/tmp/${NNAL_FILE}" diff --git a/cann/openeuler.Dockerfile b/cann/openeuler.Dockerfile index 339aad7..c59d58e 100644 --- a/cann/openeuler.Dockerfile +++ b/cann/openeuler.Dockerfile @@ -9,6 +9,7 @@ FROM ascendai/python:${PY_VERSION}-openeuler${BASE_VERSION} AS cann-installer ARG PLATFORM=${TARGETPLATFORM} ARG CANN_CHIP=910b ARG CANN_VERSION=8.0.0 +ARG NNAL_VERSION=8.0.0 # Install dependencies RUN yum update -y && \ diff --git a/cann/ubuntu.Dockerfile b/cann/ubuntu.Dockerfile index cefd1c4..cd9b971 100644 --- a/cann/ubuntu.Dockerfile +++ b/cann/ubuntu.Dockerfile @@ -9,6 +9,7 @@ FROM ascendai/python:${PY_VERSION}-ubuntu${BASE_VERSION} AS cann-installer ARG PLATFORM=${TARGETPLATFORM} ARG CANN_CHIP=910b ARG CANN_VERSION=8.0.0 +ARG NNAL_VERSION=8.0.0 # Install dependencies RUN apt-get update \ diff --git a/docker-bake.hcl b/docker-bake.hcl index f9f9325..213c641 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -58,6 +58,7 @@ target "cann" { PY_VERSION = "${item.py_version}" CANN_CHIP = "${item.cann_chip}" CANN_VERSION = "${item.cann_version}" + NNAL_VERSION = "${item.nnal_version}" } tags = generate_tags("cann", "${item.tags}") } From af4268f4fc99944b72cf46c482a93c4d5fc0f638 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 21 Mar 2025 07:00:56 +0000 Subject: [PATCH 06/49] self runner --- .github/workflows/_docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 9f89e6b..e38d7f4 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -98,7 +98,7 @@ jobs: docker: name: build ${{ matrix.target }} - runs-on: ubuntu-24.04-arm # TODO: Use ubuntu-latest + runs-on: linux-arm64-npu-0 needs: - prepare strategy: From 1d62de6865c90efeb4fb2ec7554dc80bbc6c5368 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 21 Mar 2025 07:34:26 +0000 Subject: [PATCH 07/49] tmp --- .github/workflows/_docker-build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index e38d7f4..5cdc64a 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -115,6 +115,11 @@ jobs: continue-on-error: true uses: ./.github/actions/clean-up + - name: Test + shell: bash + run: | + docker build -t test -f ubuntu.Dockerfile ./cann + - name: Set up QEMU uses: docker/setup-qemu-action@v3 From 3fdffa5d20b89efa22a57c771df9e15e880a503e Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 21 Mar 2025 07:36:40 +0000 Subject: [PATCH 08/49] tmp --- .github/workflows/_docker-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 5cdc64a..8071252 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -118,6 +118,8 @@ jobs: - name: Test shell: bash run: | + set -e + docker --version docker build -t test -f ubuntu.Dockerfile ./cann - name: Set up QEMU From e0888e37a3bb5350f806b67659ed45ffc7723273 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 21 Mar 2025 07:39:23 +0000 Subject: [PATCH 09/49] tmp --- .github/workflows/_docker-build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 8071252..a7b8416 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -118,8 +118,12 @@ jobs: - name: Test shell: bash run: | - set -e + set -x docker --version + docker info + systemctl start docker + systemctl status docker + docker info docker build -t test -f ubuntu.Dockerfile ./cann - name: Set up QEMU From 3f94daafd0f534c0a5011500944552d08fd751ec Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 21 Mar 2025 07:44:54 +0000 Subject: [PATCH 10/49] tmp --- .github/workflows/_docker-build.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index a7b8416..eafdb24 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -34,7 +34,7 @@ on: ascendhub-registry: description: "Server address of AscendHub registry" required: false - type: string + type: string default: "swr.cn-east-3.myhuaweicloud.com" secrets: DOCKERHUB_OWNER: @@ -107,6 +107,23 @@ jobs: matrix: target: ${{ fromJson(needs.prepare.outputs.targets) }} steps: + - name: Config mirrors + run: | + sed -i 's|ports.ubuntu.com|mirrors.tuna.tsinghua.edu.cn|g' /etc/apt/sources.list + pip config set global.index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple + + - name: Install system dependencies + run: | + apt-get update + apt-get install -y git gcc g++ make cmake ninja-build + + # See: https://github.com/actions/checkout/issues/363#issuecomment-1915075699 + # See: https://github.com/hunshcn/gh-proxy/issues/28#issuecomment-773769630 + - name: Config git + run: | + git config --global --add safe.directory "$GITHUB_WORKSPACE" + git config --global url."https://gh-proxy.test.osinfra.cn/https://github.com/".insteadOf https://github.com/ + - name: Checkout uses: actions/checkout@v4 From 96bdfea2759c0deb0c40b2ec4abbac307a536f74 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 21 Mar 2025 07:46:22 +0000 Subject: [PATCH 11/49] tmp --- .github/workflows/_docker-build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index eafdb24..d0942bb 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -107,11 +107,6 @@ jobs: matrix: target: ${{ fromJson(needs.prepare.outputs.targets) }} steps: - - name: Config mirrors - run: | - sed -i 's|ports.ubuntu.com|mirrors.tuna.tsinghua.edu.cn|g' /etc/apt/sources.list - pip config set global.index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple - - name: Install system dependencies run: | apt-get update From 9ec340cd88344b771fc8d9809675fef8a7efa718 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 21 Mar 2025 07:47:45 +0000 Subject: [PATCH 12/49] tmp --- .github/workflows/_docker-build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index d0942bb..8ac76cd 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -107,11 +107,6 @@ jobs: matrix: target: ${{ fromJson(needs.prepare.outputs.targets) }} steps: - - name: Install system dependencies - run: | - apt-get update - apt-get install -y git gcc g++ make cmake ninja-build - # See: https://github.com/actions/checkout/issues/363#issuecomment-1915075699 # See: https://github.com/hunshcn/gh-proxy/issues/28#issuecomment-773769630 - name: Config git From b9e62de811bb7a3e46e26ca1cf680c05c0c19601 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 21 Mar 2025 07:49:32 +0000 Subject: [PATCH 13/49] tmp --- .github/workflows/_docker-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 8ac76cd..3f4ca59 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -127,9 +127,9 @@ jobs: run: | set -x docker --version + sudo systemctl start docker + sudo systemctl status docker docker info - systemctl start docker - systemctl status docker docker info docker build -t test -f ubuntu.Dockerfile ./cann From 4f676d83cf18a2373c68aa17f85753f3c34de495 Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Tue, 25 Mar 2025 12:30:44 +0000 Subject: [PATCH 14/49] fix --- .github/workflows/_docker-build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 3f4ca59..dc078d0 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -98,7 +98,7 @@ jobs: docker: name: build ${{ matrix.target }} - runs-on: linux-arm64-npu-0 + runs-on: dind needs: - prepare strategy: @@ -127,8 +127,6 @@ jobs: run: | set -x docker --version - sudo systemctl start docker - sudo systemctl status docker docker info docker info docker build -t test -f ubuntu.Dockerfile ./cann From acac526c5476b97f03f59d9e52f75222e8fc87e0 Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Tue, 25 Mar 2025 12:34:29 +0000 Subject: [PATCH 15/49] fix --- .github/workflows/_docker-build.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index dc078d0..6312bf9 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -122,15 +122,6 @@ jobs: continue-on-error: true uses: ./.github/actions/clean-up - - name: Test - shell: bash - run: | - set -x - docker --version - docker info - docker info - docker build -t test -f ubuntu.Dockerfile ./cann - - name: Set up QEMU uses: docker/setup-qemu-action@v3 From ed01b4e613d7f53bf56323370a279b9955bdfc04 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 03:38:55 +0000 Subject: [PATCH 16/49] hk --- .github/workflows/_docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 6312bf9..49f00a7 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -98,7 +98,7 @@ jobs: docker: name: build ${{ matrix.target }} - runs-on: dind + runs-on: linux-x64-hk needs: - prepare strategy: From 595f5c3e5333ef5c47ebd323ac1bdd25ba817ae7 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 03:42:26 +0000 Subject: [PATCH 17/49] hk --- .github/workflows/_docker-build.yml | 2 +- .github/workflows/docker.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 49f00a7..8c66264 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -112,7 +112,7 @@ jobs: - name: Config git run: | git config --global --add safe.directory "$GITHUB_WORKSPACE" - git config --global url."https://gh-proxy.test.osinfra.cn/https://github.com/".insteadOf https://github.com/ + # git config --global url."https://gh-proxy.test.osinfra.cn/https://github.com/".insteadOf https://github.com/ - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 99a12c5..f6e8a7e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -115,6 +115,7 @@ jobs: with: target: 'cann' push: ${{ github.event_name == 'release' }} + clean-up: false secrets: inherit pytorch: @@ -133,6 +134,7 @@ jobs: with: target: 'pytorch' push: ${{ github.event_name == 'release' }} + clean-up: false secrets: inherit mindspore: @@ -151,4 +153,5 @@ jobs: with: target: 'mindspore' push: ${{ github.event_name == 'release' }} + clean-up: false secrets: inherit From 744a2ec83e1787fead4ed0780dddf8fbc734b6a6 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 03:45:03 +0000 Subject: [PATCH 18/49] hk --- .github/workflows/_docker-build.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 8c66264..afa8b14 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -107,13 +107,6 @@ jobs: matrix: target: ${{ fromJson(needs.prepare.outputs.targets) }} steps: - # See: https://github.com/actions/checkout/issues/363#issuecomment-1915075699 - # See: https://github.com/hunshcn/gh-proxy/issues/28#issuecomment-773769630 - - name: Config git - run: | - git config --global --add safe.directory "$GITHUB_WORKSPACE" - # git config --global url."https://gh-proxy.test.osinfra.cn/https://github.com/".insteadOf https://github.com/ - - name: Checkout uses: actions/checkout@v4 From 136a71aed5c8ea9af79a5516a5d5becdba38ac1d Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Fri, 28 Mar 2025 04:58:43 +0000 Subject: [PATCH 19/49] fix --- cann/cann.sh | 14 ++++++++++++-- cann/openeuler.Dockerfile | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cann/cann.sh b/cann/cann.sh index 2f4c18b..3e0c53e 100755 --- a/cann/cann.sh +++ b/cann/cann.sh @@ -40,8 +40,18 @@ _retry() { } _download_file() { - _info "Downloading file from $1" - _retry curl -fsSL -o "$2" "$1" + local url="$1" + local output="$2" + + _info "Downloading file from $url" + + if wget --tries=5 --waitretry=30 --retry-connrefused -O "$output" "$url"; then + _info "Download completed successfully" + return 0 + else + _error "Failed to download file" + return 1 + fi } download_cann() { diff --git a/cann/openeuler.Dockerfile b/cann/openeuler.Dockerfile index c59d58e..d4e25e8 100644 --- a/cann/openeuler.Dockerfile +++ b/cann/openeuler.Dockerfile @@ -30,6 +30,7 @@ RUN yum update -y && \ util-linux \ findutils \ curl \ + wget \ && yum clean all \ && rm -rf /var/cache/yum \ && rm -rf /tmp/* From b2b6382ce6d842aeca742f9de267bc6f7cf30a99 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 08:54:23 +0000 Subject: [PATCH 20/49] no ci --- .github/workflows/_docker-build.yml | 2 +- cann/cann.sh | 28 +++++++++------------------- cann/openeuler.Dockerfile | 4 ++-- cann/ubuntu.Dockerfile | 3 ++- 4 files changed, 14 insertions(+), 23 deletions(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index afa8b14..f089404 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -182,5 +182,5 @@ jobs: shell: bash run: | set -x - sudo df -h + df -h docker images -a diff --git a/cann/cann.sh b/cann/cann.sh index 3e0c53e..e4f1a4f 100755 --- a/cann/cann.sh +++ b/cann/cann.sh @@ -40,17 +40,11 @@ _retry() { } _download_file() { - local url="$1" - local output="$2" - - _info "Downloading file from $url" - - if wget --tries=5 --waitretry=30 --retry-connrefused -O "$output" "$url"; then - _info "Download completed successfully" - return 0 + if [ -f "$2" ]; then + _info "$2 already exists" else - _error "Failed to download file" - return 1 + _info "Downloading file from $1" + _retry curl -fsSL -o "$2" "$1" fi } @@ -76,18 +70,14 @@ download_cann() { fi local nnal_url_prefix="${url}/CANN/CANN%20${NNAL_VERSION}" - + # Download cann-toolkit - if [ ! -f "${TOOLKIT_PATH}" ]; then - local toolkit_url="${url_prefix}/${TOOLKIT_FILE}" - _download_file "${toolkit_url}" "${TOOLKIT_PATH}" - fi + local toolkit_url="${url_prefix}/${TOOLKIT_FILE}" + _download_file "${toolkit_url}" "${TOOLKIT_PATH}" # Download cann-kernels - if [ ! -f "${KERNELS_PATH}" ]; then - local kernels_url="${url_prefix}/${KERNELS_FILE}" - _download_file "${kernels_url}" "${KERNELS_PATH}" - fi + local kernels_url="${url_prefix}/${KERNELS_FILE}" + _download_file "${kernels_url}" "${KERNELS_PATH}" # Download cann-nnals if [[ ${CANN_VERSION} == "8.1.RC1.alpha001" ]]; then diff --git a/cann/openeuler.Dockerfile b/cann/openeuler.Dockerfile index d4e25e8..52d7f1a 100644 --- a/cann/openeuler.Dockerfile +++ b/cann/openeuler.Dockerfile @@ -30,12 +30,12 @@ RUN yum update -y && \ util-linux \ findutils \ curl \ - wget \ && yum clean all \ && rm -rf /var/cache/yum \ && rm -rf /tmp/* -COPY ./cann.sh /tmp/cann.sh +COPY ./cann.sh /tmp +COPY ./*.run /tmp RUN bash /tmp/cann.sh --download RUN bash /tmp/cann.sh --install diff --git a/cann/ubuntu.Dockerfile b/cann/ubuntu.Dockerfile index cd9b971..82efd97 100644 --- a/cann/ubuntu.Dockerfile +++ b/cann/ubuntu.Dockerfile @@ -42,7 +42,8 @@ RUN apt-get update \ && rm -rf /var/tmp/* \ && rm -rf /tmp/* -COPY ./cann.sh /tmp/cann.sh +COPY ./cann.sh /tmp +COPY ./*.run /tmp RUN bash /tmp/cann.sh --download RUN bash /tmp/cann.sh --install From e600dca6e8670cb0b5b324b6b6d1acc30f72e507 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 08:59:00 +0000 Subject: [PATCH 21/49] skip ci --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f6e8a7e..804e7b3 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -104,6 +104,7 @@ jobs: name: cann needs: - prepare + - python if: | !cancelled() && contains(needs.prepare.outputs.targets, 'cann') && From 78cfb43bfce175e0f5167b79378d96c8300a6113 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 09:06:12 +0000 Subject: [PATCH 22/49] skip ci --- .github/workflows/docker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 804e7b3..cd6de36 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -108,6 +108,7 @@ jobs: if: | !cancelled() && contains(needs.prepare.outputs.targets, 'cann') && + (needs.python.result == 'success' || needs.python.result == 'skipped') && ( (github.event_name != 'pull_request' && success()) || (github.event_name == 'pull_request' && contains(needs.prepare.outputs.pr-labels, 'cann')) @@ -127,6 +128,7 @@ jobs: if: | !cancelled() && contains(needs.prepare.outputs.targets, 'pytorch') && + (needs.cann.result == 'success' || needs.cann.result == 'skipped') && ( (github.event_name != 'pull_request' && success()) || (github.event_name == 'pull_request' && contains(needs.prepare.outputs.pr-labels, 'pytorch')) @@ -146,6 +148,7 @@ jobs: if: | !cancelled() && contains(needs.prepare.outputs.targets, 'mindspore') && + (needs.cann.result == 'success' || needs.cann.result == 'skipped') && ( (github.event_name != 'pull_request' && success()) || (github.event_name == 'pull_request' && contains(needs.prepare.outputs.pr-labels, 'mindspore')) From 45bb6144de5df57cbad817c2c1c84614bf4e8e01 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 09:24:11 +0000 Subject: [PATCH 23/49] skip ci --- .github/workflows/docker.yml | 8 ++++---- cann/cann.sh | 3 --- cann/openeuler.Dockerfile | 5 +++-- cann/ubuntu.Dockerfile | 5 +++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cd6de36..f3d8b7f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -87,7 +87,7 @@ jobs: !cancelled() && contains(needs.prepare.outputs.targets, 'python') && ( - (github.event_name != 'pull_request' && success()) || + (github.event_name != 'pull_request') || (github.event_name == 'pull_request' && contains(needs.prepare.outputs.pr-labels, 'python')) ) uses: ./.github/workflows/_docker-build.yml @@ -110,7 +110,7 @@ jobs: contains(needs.prepare.outputs.targets, 'cann') && (needs.python.result == 'success' || needs.python.result == 'skipped') && ( - (github.event_name != 'pull_request' && success()) || + (github.event_name != 'pull_request') || (github.event_name == 'pull_request' && contains(needs.prepare.outputs.pr-labels, 'cann')) ) uses: ./.github/workflows/_docker-build.yml @@ -130,7 +130,7 @@ jobs: contains(needs.prepare.outputs.targets, 'pytorch') && (needs.cann.result == 'success' || needs.cann.result == 'skipped') && ( - (github.event_name != 'pull_request' && success()) || + (github.event_name != 'pull_request') || (github.event_name == 'pull_request' && contains(needs.prepare.outputs.pr-labels, 'pytorch')) ) uses: ./.github/workflows/_docker-build.yml @@ -150,7 +150,7 @@ jobs: contains(needs.prepare.outputs.targets, 'mindspore') && (needs.cann.result == 'success' || needs.cann.result == 'skipped') && ( - (github.event_name != 'pull_request' && success()) || + (github.event_name != 'pull_request') || (github.event_name == 'pull_request' && contains(needs.prepare.outputs.pr-labels, 'mindspore')) ) uses: ./.github/workflows/_docker-build.yml diff --git a/cann/cann.sh b/cann/cann.sh index e4f1a4f..af811eb 100755 --- a/cann/cann.sh +++ b/cann/cann.sh @@ -119,7 +119,6 @@ install_cann() { _info "Installing ${TOOLKIT_FILE}" chmod +x "${TOOLKIT_PATH}" bash "${TOOLKIT_PATH}" --quiet --install --install-for-all --install-path="${CANN_HOME}" - rm -f "${TOOLKIT_PATH}" # Set environment variables set_env @@ -128,14 +127,12 @@ install_cann() { _info "Installing ${KERNELS_FILE}" chmod +x "${KERNELS_PATH}" bash "${KERNELS_PATH}" --quiet --install --install-for-all --install-path="${CANN_HOME}" - rm -f "${KERNELS_PATH}" # Install CANN NNAL if [[ ${CANN_VERSION} == "8.1.RC1.alpha001" ]]; then _info "Installing ${NNAL_PATH}" chmod +x "${NNAL_PATH}" bash "${NNAL_PATH}" --quiet --install --install-for-all --install-path="${CANN_HOME}" - rm -f "${NNAL_PATH}" # Set environment variables local cann_nnal_env_file="${CANN_HOME}/nnal/atb/set_env.sh" diff --git a/cann/openeuler.Dockerfile b/cann/openeuler.Dockerfile index 52d7f1a..7ff2204 100644 --- a/cann/openeuler.Dockerfile +++ b/cann/openeuler.Dockerfile @@ -34,8 +34,9 @@ RUN yum update -y && \ && rm -rf /var/cache/yum \ && rm -rf /tmp/* -COPY ./cann.sh /tmp -COPY ./*.run /tmp +# Note: If you put your installers here, they won't be downloaded again. +COPY ./*.run /tmp/ +COPY ./cann.sh /tmp/ RUN bash /tmp/cann.sh --download RUN bash /tmp/cann.sh --install diff --git a/cann/ubuntu.Dockerfile b/cann/ubuntu.Dockerfile index 82efd97..7d3f4cb 100644 --- a/cann/ubuntu.Dockerfile +++ b/cann/ubuntu.Dockerfile @@ -42,8 +42,9 @@ RUN apt-get update \ && rm -rf /var/tmp/* \ && rm -rf /tmp/* -COPY ./cann.sh /tmp -COPY ./*.run /tmp +# Note: If you put your installers here, they won't be downloaded again. +COPY ./*.run /tmp/ +COPY ./cann.sh /tmp/ RUN bash /tmp/cann.sh --download RUN bash /tmp/cann.sh --install From b106dfaf5e3f3a491266f8498333fc63413df25f Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 09:29:10 +0000 Subject: [PATCH 24/49] skip ci --- cann/cann.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cann/cann.sh b/cann/cann.sh index af811eb..0d4bc48 100755 --- a/cann/cann.sh +++ b/cann/cann.sh @@ -110,8 +110,9 @@ install_cann() { fi # Install dependencies - pip install --no-cache-dir --upgrade pip - pip install --no-cache-dir \ + pip install \ + --no-cache-dir \ + --index-url https://repo.huaweicloud.com/repository/pypi/simple \ attrs cython numpy==1.24.0 decorator sympy cffi pyyaml pathlib2 \ psutil protobuf==3.20 scipy requests absl-py From bf5f32595caeda8246728b5a1da5e4638bd52218 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 09:31:12 +0000 Subject: [PATCH 25/49] skip ci --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 293b497..b6c98d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea .secrets +**/*.run From c6f395b4b878f50c47f244700b798e544a9c152d Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 09:56:03 +0000 Subject: [PATCH 26/49] skip ci --- .github/workflows/_docker-build.yml | 4 ++++ cann/openeuler.Dockerfile | 2 +- cann/ubuntu.Dockerfile | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index f089404..871b3e2 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -110,6 +110,10 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Prepare CANN installers + run: | + cp /data/cann/*.run ./cann/ + - name: Clean up if: ${{ inputs.clean-up }} continue-on-error: true diff --git a/cann/openeuler.Dockerfile b/cann/openeuler.Dockerfile index 7ff2204..f3e120f 100644 --- a/cann/openeuler.Dockerfile +++ b/cann/openeuler.Dockerfile @@ -9,7 +9,7 @@ FROM ascendai/python:${PY_VERSION}-openeuler${BASE_VERSION} AS cann-installer ARG PLATFORM=${TARGETPLATFORM} ARG CANN_CHIP=910b ARG CANN_VERSION=8.0.0 -ARG NNAL_VERSION=8.0.0 +ARG NNAL_VERSION=${CANN_VERSION} # Install dependencies RUN yum update -y && \ diff --git a/cann/ubuntu.Dockerfile b/cann/ubuntu.Dockerfile index 7d3f4cb..302b3ca 100644 --- a/cann/ubuntu.Dockerfile +++ b/cann/ubuntu.Dockerfile @@ -9,7 +9,7 @@ FROM ascendai/python:${PY_VERSION}-ubuntu${BASE_VERSION} AS cann-installer ARG PLATFORM=${TARGETPLATFORM} ARG CANN_CHIP=910b ARG CANN_VERSION=8.0.0 -ARG NNAL_VERSION=8.0.0 +ARG NNAL_VERSION=${CANN_VERSION} # Install dependencies RUN apt-get update \ From 53e4aa86bb41a5bbfee2213155af68950001ff3b Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Fri, 28 Mar 2025 10:46:15 +0000 Subject: [PATCH 27/49] Change env variables --- arg.json | 36 ------------------ cann/openeuler.Dockerfile | 79 ++++++++++++++++++++++++--------------- cann/ubuntu.Dockerfile | 78 +++++++++++++++++++++++--------------- 3 files changed, 96 insertions(+), 97 deletions(-) diff --git a/arg.json b/arg.json index 5715078..d813e0d 100644 --- a/arg.json +++ b/arg.json @@ -57,42 +57,6 @@ "8.1.RC1.alpha001-910b-openeuler22.03-py3.10" ] } - }, - { - "cann_version": "8.1.RC1.alpha001", - "cann_chip": "310p", - "os_name": "ubuntu", - "os_version": "22.04", - "py_version": "3.10", - "nnal_version": "8.0.0", - "tags": { - "common": [ - "8.1.RC1.alpha001-310p-ubuntu22.04-py3.10", - "8.1.RC1.alpha001", - "latest", - "ubuntu-python3.10-cann8.1.RC1.alpha001" - ], - "ascendhub": [ - "8.1.RC1.alpha001-310p-ubuntu22.04-py3.10" - ] - } - }, - { - "cann_version": "8.1.RC1.alpha001", - "cann_chip": "310p", - "os_name": "openeuler", - "os_version": "22.03", - "py_version": "3.10", - "nnal_version": "8.0.0", - "tags": { - "common": [ - "8.1.RC1.alpha001-310p-openeuler22.03-py3.10", - "openeuler-python3.10-cann8.1.RC1.alpha001" - ], - "ascendhub": [ - "8.1.RC1.alpha001-310p-openeuler22.03-py3.10" - ] - } } ] } \ No newline at end of file diff --git a/cann/openeuler.Dockerfile b/cann/openeuler.Dockerfile index f3e120f..779ad55 100644 --- a/cann/openeuler.Dockerfile +++ b/cann/openeuler.Dockerfile @@ -46,9 +46,53 @@ FROM openeuler/openeuler:${BASE_VERSION} AS official # Arguments ARG PY_VERSION -# Environment variables -ENV PATH=/usr/local/python${PY_VERSION}/bin:${PATH} -ENV LD_LIBRARY_PATH=/usr/local/Ascend/driver/lib64/common:/usr/local/Ascend/driver/lib64/driver:${LD_LIBRARY_PATH} +# Toolkit Environment variables +ENV ASCEND_TOOLKIT_HOME=/usr/local/Ascend/ascend-toolkit/latest +ENV LD_LIBRARY_PATH=/usr/local/Ascend/driver/lib64/common/:/usr/local/Ascend/driver/lib64/driver/:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH=${ASCEND_TOOLKIT_HOME}/lib64:${ASCEND_TOOLKIT_HOME}/lib64/plugin/opskernel:${ASCEND_TOOLKIT_HOME}/lib64/plugin/nnengine:${ASCEND_TOOLKIT_HOME}/opp/built-in/op_impl/ai_core/tbe/op_tiling:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH=${ASCEND_TOOLKIT_HOME}/tools/aml/lib64:${ASCEND_TOOLKIT_HOME}/tools/aml/lib64/plugin:$LD_LIBRARY_PATH +ENV PYTHONPATH=${ASCEND_TOOLKIT_HOME}/python/site-packages:${ASCEND_TOOLKIT_HOME}/opp/built-in/op_impl/ai_core/tbe:$PYTHONPATH +ENV PATH=${ASCEND_TOOLKIT_HOME}/bin:${ASCEND_TOOLKIT_HOME}/compiler/ccec_compiler/bin:${ASCEND_TOOLKIT_HOME}/tools/ccec_compiler/bin:$PATH +ENV ASCEND_AICPU_PATH=${ASCEND_TOOLKIT_HOME} +ENV ASCEND_OPP_PATH=${ASCEND_TOOLKIT_HOME}/opp +ENV TOOLCHAIN_HOME=${ASCEND_TOOLKIT_HOME}/toolkit +ENV ASCEND_HOME_PATH=${ASCEND_TOOLKIT_HOME} + +# Nnal Environment variables +ENV ATB_HOME_PATH=/usr/local/Ascend/nnal/atb/latest/atb/cxx_abi_1 +ENV LD_LIBRARY_PATH=${ATB_HOME_PATH}/lib:${ATB_HOME_PATH}/examples:${ATB_HOME_PATH}/tests/atbopstest:${LD_LIBRARY_PATH} +ENV PATH=${ATB_HOME_PATH}/bin:$PATH + +# Acceleration Library Environment variables +ENV ATB_STREAM_SYNC_EVERY_KERNEL_ENABLE=0 +ENV ATB_STREAM_SYNC_EVERY_RUNNER_ENABLE=0 +ENV ATB_STREAM_SYNC_EVERY_OPERATION_ENABLE=0 +ENV ATB_OPSRUNNER_SETUP_CACHE_ENABLE=1 +ENV ATB_OPSRUNNER_KERNEL_CACHE_TYPE=3 +ENV ATB_OPSRUNNER_KERNEL_CACHE_LOCAL_COUNT=1 +ENV ATB_OPSRUNNER_KERNEL_CACHE_GLOABL_COUNT=5 +ENV ATB_OPSRUNNER_KERNEL_CACHE_TILING_SIZE=10240 +ENV ATB_WORKSPACE_MEM_ALLOC_ALG_TYPE=1 +ENV ATB_WORKSPACE_MEM_ALLOC_GLOBAL=0 +ENV ATB_COMPARE_TILING_EVERY_KERNEL=0 +ENV ATB_HOST_TILING_BUFFER_BLOCK_NUM=128 +ENV ATB_DEVICE_TILING_BUFFER_BLOCK_NUM=32 +ENV ATB_SHARE_MEMORY_NAME_SUFFIX="" +ENV ATB_LAUNCH_KERNEL_WITH_TILING=1 +ENV ATB_MATMUL_SHUFFLE_K_ENABLE=1 +ENV ATB_RUNNER_POOL_SIZE=64 + +# Operator Library Environment variables +ENV ASDOPS_HOME_PATH=${ATB_HOME_PATH} +ENV ASDOPS_MATMUL_PP_FLAG=1 +ENV ASDOPS_LOG_LEVEL=ERROR +ENV ASDOPS_LOG_TO_STDOUT=0 +ENV ASDOPS_LOG_TO_FILE=1 +ENV ASDOPS_LOG_TO_FILE_FLUSH=0 +ENV ASDOPS_LOG_TO_BOOST_TYPE=atb +ENV ASDOPS_LOG_PATH=/root +ENV ASDOPS_TILING_PARSE_CACHE_DISABLE=0 +ENV LCCL_DETERMINISTIC=0 # Change the default shell SHELL [ "/bin/bash", "-c" ] @@ -67,31 +111,4 @@ RUN yum update -y && \ # Copy files COPY --from=cann-installer /usr/local/python${PY_VERSION} /usr/local/python${PY_VERSION} COPY --from=cann-installer /usr/local/Ascend /usr/local/Ascend -COPY --from=cann-installer /etc/Ascend /etc/Ascend - -# Set environment variables -RUN \ - # Set environment variables for Python \ - PY_PATH="PATH=/usr/local/python${PY_VERSION}/bin:\${PATH}" && \ - echo "export ${PY_PATH}" >> /etc/profile && \ - echo "export ${PY_PATH}" >> ~/.bashrc && \ - # Set environment variables for CANN \ - CANN_TOOLKIT_ENV_FILE="/usr/local/Ascend/ascend-toolkit/set_env.sh" && \ - DRIVER_LIBRARY_PATH="LD_LIBRARY_PATH=/usr/local/Ascend/driver/lib64/common:/usr/local/Ascend/driver/lib64/driver:\${LD_LIBRARY_PATH}" && \ - echo "export ${DRIVER_LIBRARY_PATH}" >> /etc/profile && \ - echo "export ${DRIVER_LIBRARY_PATH}" >> ~/.bashrc && \ - echo "source ${CANN_TOOLKIT_ENV_FILE}" >> /etc/profile && \ - echo "source ${CANN_TOOLKIT_ENV_FILE}" >> ~/.bashrc && \ - echo "source ${CANN_TOOLKIT_ENV_FILE}" >> ~/.bashrc && \ - CANN_NNAL_ENV_FILE="/usr/local/Ascend/nnal/atb/set_env.sh" && \ - if [ -f "${CANN_NNAL_ENV_FILE}" ]; then \ - echo "source ${CANN_NNAL_ENV_FILE}" >> /etc/profile && \ - echo "source ${CANN_NNAL_ENV_FILE}" >> ~/.bashrc; \ - fi - -ENTRYPOINT ["/bin/bash", "-c", "\ - source /usr/local/Ascend/ascend-toolkit/set_env.sh && \ - if [ -f /usr/local/Ascend/nnal/atb/set_env.sh ]; then \ - source /usr/local/Ascend/nnal/atb/set_env.sh; \ - fi && \ - exec \"$@\"", "--"] +COPY --from=cann-installer /etc/Ascend /etc/Ascend \ No newline at end of file diff --git a/cann/ubuntu.Dockerfile b/cann/ubuntu.Dockerfile index 302b3ca..a5cd23b 100644 --- a/cann/ubuntu.Dockerfile +++ b/cann/ubuntu.Dockerfile @@ -54,9 +54,53 @@ FROM ubuntu:${BASE_VERSION} AS official # Arguments ARG PY_VERSION -# Environment variables -ENV PATH=/usr/local/python${PY_VERSION}/bin:${PATH} -ENV LD_LIBRARY_PATH=/usr/local/Ascend/driver/lib64/common:/usr/local/Ascend/driver/lib64/driver:${LD_LIBRARY_PATH} +# Toolkit Environment variables +ENV ASCEND_TOOLKIT_HOME=/usr/local/Ascend/ascend-toolkit/latest +ENV LD_LIBRARY_PATH=/usr/local/Ascend/driver/lib64/common/:/usr/local/Ascend/driver/lib64/driver/:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH=${ASCEND_TOOLKIT_HOME}/lib64:${ASCEND_TOOLKIT_HOME}/lib64/plugin/opskernel:${ASCEND_TOOLKIT_HOME}/lib64/plugin/nnengine:${ASCEND_TOOLKIT_HOME}/opp/built-in/op_impl/ai_core/tbe/op_tiling:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH=${ASCEND_TOOLKIT_HOME}/tools/aml/lib64:${ASCEND_TOOLKIT_HOME}/tools/aml/lib64/plugin:$LD_LIBRARY_PATH +ENV PYTHONPATH=${ASCEND_TOOLKIT_HOME}/python/site-packages:${ASCEND_TOOLKIT_HOME}/opp/built-in/op_impl/ai_core/tbe:$PYTHONPATH +ENV PATH=${ASCEND_TOOLKIT_HOME}/bin:${ASCEND_TOOLKIT_HOME}/compiler/ccec_compiler/bin:${ASCEND_TOOLKIT_HOME}/tools/ccec_compiler/bin:$PATH +ENV ASCEND_AICPU_PATH=${ASCEND_TOOLKIT_HOME} +ENV ASCEND_OPP_PATH=${ASCEND_TOOLKIT_HOME}/opp +ENV TOOLCHAIN_HOME=${ASCEND_TOOLKIT_HOME}/toolkit +ENV ASCEND_HOME_PATH=${ASCEND_TOOLKIT_HOME} + +# Nnal Environment variables +ENV ATB_HOME_PATH=/usr/local/Ascend/nnal/atb/latest/atb/cxx_abi_1 +ENV LD_LIBRARY_PATH=${ATB_HOME_PATH}/lib:${ATB_HOME_PATH}/examples:${ATB_HOME_PATH}/tests/atbopstest:${LD_LIBRARY_PATH} +ENV PATH=${ATB_HOME_PATH}/bin:$PATH + +# Acceleration Library Environment variables +ENV ATB_STREAM_SYNC_EVERY_KERNEL_ENABLE=0 +ENV ATB_STREAM_SYNC_EVERY_RUNNER_ENABLE=0 +ENV ATB_STREAM_SYNC_EVERY_OPERATION_ENABLE=0 +ENV ATB_OPSRUNNER_SETUP_CACHE_ENABLE=1 +ENV ATB_OPSRUNNER_KERNEL_CACHE_TYPE=3 +ENV ATB_OPSRUNNER_KERNEL_CACHE_LOCAL_COUNT=1 +ENV ATB_OPSRUNNER_KERNEL_CACHE_GLOABL_COUNT=5 +ENV ATB_OPSRUNNER_KERNEL_CACHE_TILING_SIZE=10240 +ENV ATB_WORKSPACE_MEM_ALLOC_ALG_TYPE=1 +ENV ATB_WORKSPACE_MEM_ALLOC_GLOBAL=0 +ENV ATB_COMPARE_TILING_EVERY_KERNEL=0 +ENV ATB_HOST_TILING_BUFFER_BLOCK_NUM=128 +ENV ATB_DEVICE_TILING_BUFFER_BLOCK_NUM=32 +ENV ATB_SHARE_MEMORY_NAME_SUFFIX="" +ENV ATB_LAUNCH_KERNEL_WITH_TILING=1 +ENV ATB_MATMUL_SHUFFLE_K_ENABLE=1 +ENV ATB_RUNNER_POOL_SIZE=64 + +# Operator Library Environment variables +ENV ASDOPS_HOME_PATH=${ATB_HOME_PATH} +ENV ASDOPS_MATMUL_PP_FLAG=1 +ENV ASDOPS_LOG_LEVEL=ERROR +ENV ASDOPS_LOG_TO_STDOUT=0 +ENV ASDOPS_LOG_TO_FILE=1 +ENV ASDOPS_LOG_TO_FILE_FLUSH=0 +ENV ASDOPS_LOG_TO_BOOST_TYPE=atb +ENV ASDOPS_LOG_PATH=/root +ENV ASDOPS_TILING_PARSE_CACHE_DISABLE=0 +ENV LCCL_DETERMINISTIC=0 # Change the default shell SHELL [ "/bin/bash", "-c" ] @@ -77,30 +121,4 @@ RUN apt-get update \ # Copy files COPY --from=cann-installer /usr/local/python${PY_VERSION} /usr/local/python${PY_VERSION} COPY --from=cann-installer /usr/local/Ascend /usr/local/Ascend -COPY --from=cann-installer /etc/Ascend /etc/Ascend - -# Set environment variables -RUN \ - # Set environment variables for Python \ - PY_PATH="PATH=/usr/local/python${PY_VERSION}/bin:\${PATH}" && \ - echo "export ${PY_PATH}" >> /etc/profile && \ - echo "export ${PY_PATH}" >> ~/.bashrc && \ - # Set environment variables for CANN \ - CANN_TOOLKIT_ENV_FILE="/usr/local/Ascend/ascend-toolkit/set_env.sh" && \ - DRIVER_LIBRARY_PATH="LD_LIBRARY_PATH=/usr/local/Ascend/driver/lib64/common:/usr/local/Ascend/driver/lib64/driver:\${LD_LIBRARY_PATH}" && \ - echo "export ${DRIVER_LIBRARY_PATH}" >> /etc/profile && \ - echo "export ${DRIVER_LIBRARY_PATH}" >> ~/.bashrc && \ - echo "source ${CANN_TOOLKIT_ENV_FILE}" >> /etc/profile && \ - echo "source ${CANN_TOOLKIT_ENV_FILE}" >> ~/.bashrc && \ - CANN_NNAL_ENV_FILE="/usr/local/Ascend/nnal/atb/set_env.sh" && \ - if [ -f "${CANN_NNAL_ENV_FILE}" ]; then \ - echo "source ${CANN_NNAL_ENV_FILE}" >> /etc/profile && \ - echo "source ${CANN_NNAL_ENV_FILE}" >> ~/.bashrc; \ - fi - -ENTRYPOINT ["/bin/bash", "-c", "\ - source /usr/local/Ascend/ascend-toolkit/set_env.sh && \ - if [ -f /usr/local/Ascend/nnal/atb/set_env.sh ]; then \ - source /usr/local/Ascend/nnal/atb/set_env.sh; \ - fi && \ - exec \"$@\"", "--"] +COPY --from=cann-installer /etc/Ascend /etc/Ascend \ No newline at end of file From 4a8084b9f8e4dc90c0f09fdc4890a0d779163a20 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 10:48:40 +0000 Subject: [PATCH 28/49] skip ci --- .github/actions/init-env/action.yml | 14 ++++++++++++++ .github/workflows/_docker-build.yml | 5 ++--- .github/workflows/docker.yml | 2 ++ 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 .github/actions/init-env/action.yml diff --git a/.github/actions/init-env/action.yml b/.github/actions/init-env/action.yml new file mode 100644 index 0000000..fb2b5a6 --- /dev/null +++ b/.github/actions/init-env/action.yml @@ -0,0 +1,14 @@ +name: "Init environment" +description: "Initialize working environment" +runs: + using: "composite" + steps: + - name: Prepare CANN installers + shell: bash + run: | + cp -nv /data/cann/*.run ./cann/ + post: + - name: Clean CANN installers + shell: bash + run: | + # rm ./cann/*.run diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 871b3e2..8e22334 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -110,9 +110,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Prepare CANN installers - run: | - cp /data/cann/*.run ./cann/ + - name: Init environment + uses: ./.github/actions/init-env - name: Clean up if: ${{ inputs.clean-up }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f3d8b7f..19a4006 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -7,6 +7,7 @@ on: - 'main' - 'releases/**' paths: + - '.github/actions/init-env/action.yml' - '.github/actions/clean-up/action.yml' - '.github/actions/docker-login/action.yml' - '.github/workflows/_docker-build.yml' @@ -27,6 +28,7 @@ on: - 'labeled' paths: - '.github/actions/list-labels/action.yml' + - '.github/actions/init-env/action.yml' - '.github/actions/clean-up/action.yml' - '.github/actions/docker-login/action.yml' - '.github/workflows/_docker-build.yml' From 8432217630e91a6fd9af9ffd56df5fefc1b2c60d Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 10:51:08 +0000 Subject: [PATCH 29/49] skip ci --- cann/openeuler.Dockerfile | 2 +- cann/ubuntu.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cann/openeuler.Dockerfile b/cann/openeuler.Dockerfile index 779ad55..74f9bac 100644 --- a/cann/openeuler.Dockerfile +++ b/cann/openeuler.Dockerfile @@ -111,4 +111,4 @@ RUN yum update -y && \ # Copy files COPY --from=cann-installer /usr/local/python${PY_VERSION} /usr/local/python${PY_VERSION} COPY --from=cann-installer /usr/local/Ascend /usr/local/Ascend -COPY --from=cann-installer /etc/Ascend /etc/Ascend \ No newline at end of file +COPY --from=cann-installer /etc/Ascend /etc/Ascend diff --git a/cann/ubuntu.Dockerfile b/cann/ubuntu.Dockerfile index a5cd23b..98dfe49 100644 --- a/cann/ubuntu.Dockerfile +++ b/cann/ubuntu.Dockerfile @@ -121,4 +121,4 @@ RUN apt-get update \ # Copy files COPY --from=cann-installer /usr/local/python${PY_VERSION} /usr/local/python${PY_VERSION} COPY --from=cann-installer /usr/local/Ascend /usr/local/Ascend -COPY --from=cann-installer /etc/Ascend /etc/Ascend \ No newline at end of file +COPY --from=cann-installer /etc/Ascend /etc/Ascend From 26abaf93e5f5fda5c2050b5d2ed3398e645cf61f Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 10:52:07 +0000 Subject: [PATCH 30/49] skip ci --- .github/actions/init-env/action.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/actions/init-env/action.yml b/.github/actions/init-env/action.yml index fb2b5a6..a66f13f 100644 --- a/.github/actions/init-env/action.yml +++ b/.github/actions/init-env/action.yml @@ -7,8 +7,3 @@ runs: shell: bash run: | cp -nv /data/cann/*.run ./cann/ - post: - - name: Clean CANN installers - shell: bash - run: | - # rm ./cann/*.run From 3ce5803b855f1ae1a2ca2b4e35485fe936055db7 Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Fri, 28 Mar 2025 19:06:14 +0800 Subject: [PATCH 31/49] add 310p --- arg.json | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/arg.json b/arg.json index d813e0d..5715078 100644 --- a/arg.json +++ b/arg.json @@ -57,6 +57,42 @@ "8.1.RC1.alpha001-910b-openeuler22.03-py3.10" ] } + }, + { + "cann_version": "8.1.RC1.alpha001", + "cann_chip": "310p", + "os_name": "ubuntu", + "os_version": "22.04", + "py_version": "3.10", + "nnal_version": "8.0.0", + "tags": { + "common": [ + "8.1.RC1.alpha001-310p-ubuntu22.04-py3.10", + "8.1.RC1.alpha001", + "latest", + "ubuntu-python3.10-cann8.1.RC1.alpha001" + ], + "ascendhub": [ + "8.1.RC1.alpha001-310p-ubuntu22.04-py3.10" + ] + } + }, + { + "cann_version": "8.1.RC1.alpha001", + "cann_chip": "310p", + "os_name": "openeuler", + "os_version": "22.03", + "py_version": "3.10", + "nnal_version": "8.0.0", + "tags": { + "common": [ + "8.1.RC1.alpha001-310p-openeuler22.03-py3.10", + "openeuler-python3.10-cann8.1.RC1.alpha001" + ], + "ascendhub": [ + "8.1.RC1.alpha001-310p-openeuler22.03-py3.10" + ] + } } ] } \ No newline at end of file From 70ea555d8341ba85923d67b765e8707eb9ac2e84 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 11:31:18 +0000 Subject: [PATCH 32/49] skip ci --- cann/openeuler.Dockerfile | 2 +- cann/ubuntu.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cann/openeuler.Dockerfile b/cann/openeuler.Dockerfile index 74f9bac..3f926ba 100644 --- a/cann/openeuler.Dockerfile +++ b/cann/openeuler.Dockerfile @@ -35,8 +35,8 @@ RUN yum update -y && \ && rm -rf /tmp/* # Note: If you put your installers here, they won't be downloaded again. -COPY ./*.run /tmp/ COPY ./cann.sh /tmp/ +RUN cp -nv ./*.run /tmp/ || true RUN bash /tmp/cann.sh --download RUN bash /tmp/cann.sh --install diff --git a/cann/ubuntu.Dockerfile b/cann/ubuntu.Dockerfile index 98dfe49..6476d40 100644 --- a/cann/ubuntu.Dockerfile +++ b/cann/ubuntu.Dockerfile @@ -43,8 +43,8 @@ RUN apt-get update \ && rm -rf /tmp/* # Note: If you put your installers here, they won't be downloaded again. -COPY ./*.run /tmp/ COPY ./cann.sh /tmp/ +RUN cp -nv ./*.run /tmp/ || true RUN bash /tmp/cann.sh --download RUN bash /tmp/cann.sh --install From cda069c7ef59e70606c6da1d6453ab1e62c9f0b6 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 11:44:11 +0000 Subject: [PATCH 33/49] skip ci --- cann/openeuler.Dockerfile | 3 +++ cann/ubuntu.Dockerfile | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cann/openeuler.Dockerfile b/cann/openeuler.Dockerfile index 3f926ba..9dc404e 100644 --- a/cann/openeuler.Dockerfile +++ b/cann/openeuler.Dockerfile @@ -11,6 +11,9 @@ ARG CANN_CHIP=910b ARG CANN_VERSION=8.0.0 ARG NNAL_VERSION=${CANN_VERSION} +# Change the default shell +SHELL [ "/bin/bash", "-c" ] + # Install dependencies RUN yum update -y && \ yum install -y \ diff --git a/cann/ubuntu.Dockerfile b/cann/ubuntu.Dockerfile index 6476d40..9bc1b43 100644 --- a/cann/ubuntu.Dockerfile +++ b/cann/ubuntu.Dockerfile @@ -11,6 +11,9 @@ ARG CANN_CHIP=910b ARG CANN_VERSION=8.0.0 ARG NNAL_VERSION=${CANN_VERSION} +# Change the default shell +SHELL [ "/bin/bash", "-c" ] + # Install dependencies RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ From cbd056893ab3f3c1407a5c97c287c12d5173fcfd Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 11:50:30 +0000 Subject: [PATCH 34/49] rm 310p --- arg.json | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/arg.json b/arg.json index 5715078..d813e0d 100644 --- a/arg.json +++ b/arg.json @@ -57,42 +57,6 @@ "8.1.RC1.alpha001-910b-openeuler22.03-py3.10" ] } - }, - { - "cann_version": "8.1.RC1.alpha001", - "cann_chip": "310p", - "os_name": "ubuntu", - "os_version": "22.04", - "py_version": "3.10", - "nnal_version": "8.0.0", - "tags": { - "common": [ - "8.1.RC1.alpha001-310p-ubuntu22.04-py3.10", - "8.1.RC1.alpha001", - "latest", - "ubuntu-python3.10-cann8.1.RC1.alpha001" - ], - "ascendhub": [ - "8.1.RC1.alpha001-310p-ubuntu22.04-py3.10" - ] - } - }, - { - "cann_version": "8.1.RC1.alpha001", - "cann_chip": "310p", - "os_name": "openeuler", - "os_version": "22.03", - "py_version": "3.10", - "nnal_version": "8.0.0", - "tags": { - "common": [ - "8.1.RC1.alpha001-310p-openeuler22.03-py3.10", - "openeuler-python3.10-cann8.1.RC1.alpha001" - ], - "ascendhub": [ - "8.1.RC1.alpha001-310p-openeuler22.03-py3.10" - ] - } } ] } \ No newline at end of file From a7001dbe5644739363f03174b7cd91353abd16b3 Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 12:03:02 +0000 Subject: [PATCH 35/49] skip ci --- .github/actions/init-env/action.yml | 2 ++ cann/openeuler.Dockerfile | 2 +- cann/ubuntu.Dockerfile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/actions/init-env/action.yml b/.github/actions/init-env/action.yml index a66f13f..f8e69eb 100644 --- a/.github/actions/init-env/action.yml +++ b/.github/actions/init-env/action.yml @@ -6,4 +6,6 @@ runs: - name: Prepare CANN installers shell: bash run: | + set -x cp -nv /data/cann/*.run ./cann/ + ls -alh ./cann/ diff --git a/cann/openeuler.Dockerfile b/cann/openeuler.Dockerfile index 9dc404e..d7a307e 100644 --- a/cann/openeuler.Dockerfile +++ b/cann/openeuler.Dockerfile @@ -39,7 +39,7 @@ RUN yum update -y && \ # Note: If you put your installers here, they won't be downloaded again. COPY ./cann.sh /tmp/ -RUN cp -nv ./*.run /tmp/ || true +RUN cp -nv *.run /tmp/ || true RUN bash /tmp/cann.sh --download RUN bash /tmp/cann.sh --install diff --git a/cann/ubuntu.Dockerfile b/cann/ubuntu.Dockerfile index 9bc1b43..531844b 100644 --- a/cann/ubuntu.Dockerfile +++ b/cann/ubuntu.Dockerfile @@ -47,7 +47,7 @@ RUN apt-get update \ # Note: If you put your installers here, they won't be downloaded again. COPY ./cann.sh /tmp/ -RUN cp -nv ./*.run /tmp/ || true +RUN cp -nv *.run /tmp/ || true RUN bash /tmp/cann.sh --download RUN bash /tmp/cann.sh --install From c25b4c703c3c4fa3cac148889405ff01a761e0bd Mon Sep 17 00:00:00 2001 From: Yuanhao Ji Date: Fri, 28 Mar 2025 12:15:50 +0000 Subject: [PATCH 36/49] skip ci --- cann/openeuler.Dockerfile | 3 ++- cann/ubuntu.Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cann/openeuler.Dockerfile b/cann/openeuler.Dockerfile index d7a307e..fd9643f 100644 --- a/cann/openeuler.Dockerfile +++ b/cann/openeuler.Dockerfile @@ -39,7 +39,8 @@ RUN yum update -y && \ # Note: If you put your installers here, they won't be downloaded again. COPY ./cann.sh /tmp/ -RUN cp -nv *.run /tmp/ || true +COPY ./*.run /tmp/ +# RUN cp -nv *.run /tmp/ || true RUN bash /tmp/cann.sh --download RUN bash /tmp/cann.sh --install diff --git a/cann/ubuntu.Dockerfile b/cann/ubuntu.Dockerfile index 531844b..1b5deab 100644 --- a/cann/ubuntu.Dockerfile +++ b/cann/ubuntu.Dockerfile @@ -47,7 +47,8 @@ RUN apt-get update \ # Note: If you put your installers here, they won't be downloaded again. COPY ./cann.sh /tmp/ -RUN cp -nv *.run /tmp/ || true +COPY ./*.run /tmp/ +# RUN cp -nv *.run /tmp/ || true RUN bash /tmp/cann.sh --download RUN bash /tmp/cann.sh --install From d92a6d21fe38d869ee5ba5225faa0a711402905f Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Sat, 29 Mar 2025 10:21:23 +0800 Subject: [PATCH 37/49] push image to swr --- arg.json | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/arg.json b/arg.json index d813e0d..3691503 100644 --- a/arg.json +++ b/arg.json @@ -1,46 +1,17 @@ { "registry": [ { - "name": "dockerhub", - "url": "docker.io", - "owner": "ascendai" - }, - { - "name": "quay", - "url": "quay.io", - "owner": "ascend" + "name": "ascendhub", + "url": "swr.cn-east-3.myhuaweicloud.com", + "owner": "ascendhub-test" }, { "name": "huawei-swr", "url": "swr.cn-southwest-2.myhuaweicloud.com", "owner": "base_image" - }, - { - "name": "ascendhub", - "url": "swr.cn-east-3.myhuaweicloud.com", - "owner": "ascendhub-test" } ], "cann": [ - { - "cann_version": "8.1.RC1.alpha001", - "cann_chip": "910b", - "os_name": "ubuntu", - "os_version": "22.04", - "py_version": "3.10", - "nnal_version": "8.0.0", - "tags": { - "common": [ - "8.1.RC1.alpha001-910b-ubuntu22.04-py3.10", - "8.1.RC1.alpha001", - "latest", - "ubuntu-python3.10-cann8.1.RC1.alpha001" - ], - "ascendhub": [ - "8.1.RC1.alpha001-910b-ubuntu22.04-py3.10" - ] - } - }, { "cann_version": "8.1.RC1.alpha001", "cann_chip": "910b", From c5407f6eb99af118a82564c1acf17b93ef0c93bb Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Sat, 29 Mar 2025 14:29:42 +0800 Subject: [PATCH 38/49] test AZURE --- arg.json | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/arg.json b/arg.json index 3691503..a5de616 100644 --- a/arg.json +++ b/arg.json @@ -1,14 +1,24 @@ { "registry": [ + { + "name": "huawei-swr", + "url": "swr.cn-southwest-2.myhuaweicloud.com", + "owner": "base_image" + }, { "name": "ascendhub", "url": "swr.cn-east-3.myhuaweicloud.com", "owner": "ascendhub-test" }, { - "name": "huawei-swr", - "url": "swr.cn-southwest-2.myhuaweicloud.com", - "owner": "base_image" + "name": "dockerhub", + "url": "docker.io", + "owner": "ascendai" + }, + { + "name": "quay", + "url": "quay.io", + "owner": "ascend" } ], "cann": [ From d55d165bb5b425f20c2afebaa925f65bf08178ba Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Sat, 29 Mar 2025 14:59:59 +0800 Subject: [PATCH 39/49] change runner --- .github/workflows/_docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 8e22334..31ed75f 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -98,7 +98,7 @@ jobs: docker: name: build ${{ matrix.target }} - runs-on: linux-x64-hk + runs-on: linux-x86-azure needs: - prepare strategy: From e0ed12988ae21d35ed30c9426e7e6af69c6b4674 Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Sat, 29 Mar 2025 15:02:05 +0800 Subject: [PATCH 40/49] fix --- arg.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arg.json b/arg.json index a5de616..b06f60e 100644 --- a/arg.json +++ b/arg.json @@ -38,6 +38,25 @@ "8.1.RC1.alpha001-910b-openeuler22.03-py3.10" ] } + }, + { + "cann_version": "8.1.RC1.alpha001", + "cann_chip": "910b", + "os_name": "ubuntu", + "os_version": "22.04", + "py_version": "3.10", + "nnal_version": "8.0.0", + "tags": { + "common": [ + "8.1.RC1.alpha001-910b-ubuntu22.04-py3.10", + "8.1.RC1.alpha001", + "latest", + "ubuntu-python3.10-cann8.1.RC1.alpha001" + ], + "ascendhub": [ + "8.1.RC1.alpha001-910b-ubuntu22.04-py3.10" + ] + } } ] } \ No newline at end of file From 6a511ea8ed89f7aab17388fa58d938a6d340cfef Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Sat, 29 Mar 2025 15:22:36 +0800 Subject: [PATCH 41/49] fix --- .github/workflows/_docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 31ed75f..08d8cac 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -80,7 +80,7 @@ permissions: jobs: prepare: name: prepare - runs-on: ubuntu-latest + runs-on: linux-x86-azure outputs: targets: ${{ steps.list-target.outputs.targets }} steps: From 79f5a1924150256ccbe2f80d6748d2fb0b04c9f2 Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Sat, 29 Mar 2025 15:31:26 +0800 Subject: [PATCH 42/49] fix --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 19a4006..89451a4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -57,7 +57,7 @@ permissions: jobs: prepare: name: prepare - runs-on: ubuntu-latest + runs-on: linux-x86-azure outputs: pr-labels: ${{ steps.list-labels.outputs.labels }} targets: ${{ steps.list-targets.outputs.targets }} From 92b12e67b3792fe5f7b87d2319edb70c21e7f383 Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Sat, 29 Mar 2025 16:00:46 +0800 Subject: [PATCH 43/49] fix --- .github/workflows/_docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 08d8cac..31ed75f 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -80,7 +80,7 @@ permissions: jobs: prepare: name: prepare - runs-on: linux-x86-azure + runs-on: ubuntu-latest outputs: targets: ${{ steps.list-target.outputs.targets }} steps: From 1c38c72afb4da829141731de2425e87e62f18560 Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Sat, 29 Mar 2025 16:05:36 +0800 Subject: [PATCH 44/49] fix --- .github/workflows/_docker-build.yml | 2 +- .github/workflows/labeler.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 31ed75f..08d8cac 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -80,7 +80,7 @@ permissions: jobs: prepare: name: prepare - runs-on: ubuntu-latest + runs-on: linux-x86-azure outputs: targets: ${{ steps.list-target.outputs.targets }} steps: diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index ba00065..3919e18 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -5,7 +5,7 @@ on: pull_request_target jobs: label: name: Label - runs-on: ubuntu-latest + runs-on: linux-x86-azure permissions: contents: read pull-requests: write From 31a016180cc54a8f435c8701ef97d3c7358c393f Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Sat, 29 Mar 2025 16:22:42 +0800 Subject: [PATCH 45/49] fix --- .github/workflows/_docker-build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 08d8cac..19e8366 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -110,9 +110,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Init environment - uses: ./.github/actions/init-env - - name: Clean up if: ${{ inputs.clean-up }} continue-on-error: true From c0b8e5e7b2274d73d4e48b021242f8eafaa601d3 Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Sat, 29 Mar 2025 16:29:13 +0800 Subject: [PATCH 46/49] fix --- .github/workflows/docker.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 89451a4..56b9cea 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -7,7 +7,6 @@ on: - 'main' - 'releases/**' paths: - - '.github/actions/init-env/action.yml' - '.github/actions/clean-up/action.yml' - '.github/actions/docker-login/action.yml' - '.github/workflows/_docker-build.yml' @@ -28,7 +27,6 @@ on: - 'labeled' paths: - '.github/actions/list-labels/action.yml' - - '.github/actions/init-env/action.yml' - '.github/actions/clean-up/action.yml' - '.github/actions/docker-login/action.yml' - '.github/workflows/_docker-build.yml' From 41c1926ced35fbcc32a0d4ba78dddf16386cbc35 Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Sat, 29 Mar 2025 16:32:37 +0800 Subject: [PATCH 47/49] fix --- .github/workflows/_docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 19e8366..54dd8bf 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -182,5 +182,5 @@ jobs: shell: bash run: | set -x - df -h + sudo df -h docker images -a From e66e5ca2c14f53387a6cfeca94fea6b3f79f4c57 Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Wed, 2 Apr 2025 01:56:49 +0000 Subject: [PATCH 48/49] fix --- cann/openeuler.Dockerfile | 5 ++++- cann/ubuntu.Dockerfile | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cann/openeuler.Dockerfile b/cann/openeuler.Dockerfile index fd9643f..30f2211 100644 --- a/cann/openeuler.Dockerfile +++ b/cann/openeuler.Dockerfile @@ -50,6 +50,9 @@ FROM openeuler/openeuler:${BASE_VERSION} AS official # Arguments ARG PY_VERSION +# Set Python Environment variables +ENV PATH=/usr/local/python${PY_VERSION}/bin:${PATH} + # Toolkit Environment variables ENV ASCEND_TOOLKIT_HOME=/usr/local/Ascend/ascend-toolkit/latest ENV LD_LIBRARY_PATH=/usr/local/Ascend/driver/lib64/common/:/usr/local/Ascend/driver/lib64/driver/:$LD_LIBRARY_PATH @@ -115,4 +118,4 @@ RUN yum update -y && \ # Copy files COPY --from=cann-installer /usr/local/python${PY_VERSION} /usr/local/python${PY_VERSION} COPY --from=cann-installer /usr/local/Ascend /usr/local/Ascend -COPY --from=cann-installer /etc/Ascend /etc/Ascend +COPY --from=cann-installer /etc/Ascend /etc/Ascend \ No newline at end of file diff --git a/cann/ubuntu.Dockerfile b/cann/ubuntu.Dockerfile index 1b5deab..7a783e1 100644 --- a/cann/ubuntu.Dockerfile +++ b/cann/ubuntu.Dockerfile @@ -58,6 +58,9 @@ FROM ubuntu:${BASE_VERSION} AS official # Arguments ARG PY_VERSION +# Set Python Environment variables +ENV PATH=/usr/local/python${PY_VERSION}/bin:${PATH} + # Toolkit Environment variables ENV ASCEND_TOOLKIT_HOME=/usr/local/Ascend/ascend-toolkit/latest ENV LD_LIBRARY_PATH=/usr/local/Ascend/driver/lib64/common/:/usr/local/Ascend/driver/lib64/driver/:$LD_LIBRARY_PATH From ee88afed86909ac7a7178300de85ae75ac55db3f Mon Sep 17 00:00:00 2001 From: Icey <1790571317@qq.com> Date: Wed, 2 Apr 2025 03:10:13 +0000 Subject: [PATCH 49/49] fix --- .github/workflows/_docker-build.yml | 4 ++-- .github/workflows/docker.yml | 2 +- .github/workflows/labeler.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml index 54dd8bf..4a3d6e6 100644 --- a/.github/workflows/_docker-build.yml +++ b/.github/workflows/_docker-build.yml @@ -80,7 +80,7 @@ permissions: jobs: prepare: name: prepare - runs-on: linux-x86-azure + runs-on: linux-x64-azure outputs: targets: ${{ steps.list-target.outputs.targets }} steps: @@ -98,7 +98,7 @@ jobs: docker: name: build ${{ matrix.target }} - runs-on: linux-x86-azure + runs-on: linux-x64-azure needs: - prepare strategy: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 56b9cea..1f3f2c1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -55,7 +55,7 @@ permissions: jobs: prepare: name: prepare - runs-on: linux-x86-azure + runs-on: linux-x64-azure outputs: pr-labels: ${{ steps.list-labels.outputs.labels }} targets: ${{ steps.list-targets.outputs.targets }} diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 3919e18..ddacf1b 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -5,7 +5,7 @@ on: pull_request_target jobs: label: name: Label - runs-on: linux-x86-azure + runs-on: linux-x64-azure permissions: contents: read pull-requests: write