From 30abe241f6df740a75b81549ee15c4632859fc09 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Wed, 9 Oct 2024 16:34:43 -0400 Subject: [PATCH 01/11] Add installers for rocm-6.1 and rocm-6.2 --- .github/workflows/cpack.yml | 48 +++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/.github/workflows/cpack.yml b/.github/workflows/cpack.yml index c4753048..f8655581 100644 --- a/.github/workflows/cpack.yml +++ b/.github/workflows/cpack.yml @@ -55,6 +55,12 @@ jobs: - os-distro: "ubuntu" os-version: "20.04" rocm-version: "6.0" + - os-distro: "ubuntu" + os-version: "20.04" + rocm-version: "6.1" + - os-distro: "ubuntu" + os-version: "20.04" + rocm-version: "6.2" # ubuntu 22.04 - os-distro: "ubuntu" os-version: "22.04" @@ -74,6 +80,12 @@ jobs: - os-distro: "ubuntu" os-version: "22.04" rocm-version: "6.0" + - os-distro: "ubuntu" + os-version: "22.04" + rocm-version: "6.1" + - os-distro: "ubuntu" + os-version: "22.04" + rocm-version: "6.2" # opensuse 15.3 - os-distro: "opensuse" os-version: "15.3" @@ -115,6 +127,12 @@ jobs: - os-distro: "opensuse" os-version: "15.4" rocm-version: "6.0" + - os-distro: "opensuse" + os-version: "15.4" + rocm-version: "6.1" + - os-distro: "opensuse" + os-version: "15.4" + rocm-version: "6.2" # opensuse 15.5 - os-distro: "opensuse" os-version: "15.5" @@ -122,6 +140,12 @@ jobs: - os-distro: "opensuse" os-version: "15.5" rocm-version: "6.0" + - os-distro: "opensuse" + os-version: "15.5" + rocm-version: "6.1" + - os-distro: "opensuse" + os-version: "15.5" + rocm-version: "6.2" # RHEL 8.7 - os-distro: "rhel" os-version: "8.7" @@ -154,6 +178,12 @@ jobs: - os-distro: "rhel" os-version: "8.8" rocm-version: "6.0" + - os-distro: "rhel" + os-version: "8.8" + rocm-version: "6.1" + - os-distro: "rhel" + os-version: "8.8" + rocm-version: "6.2" # RHEL 8.9 - os-distro: "rhel" os-version: "8.9" @@ -161,6 +191,12 @@ jobs: - os-distro: "rhel" os-version: "8.9" rocm-version: "6.0" + - os-distro: "rhel" + os-version: "8.9" + rocm-version: "6.1" + - os-distro: "rhel" + os-version: "8.9" + rocm-version: "6.2" # RHEL 9.1 - os-distro: "rhel" os-version: "9.1" @@ -184,6 +220,12 @@ jobs: - os-distro: "rhel" os-version: "9.2" rocm-version: "6.0" + - os-distro: "rhel" + os-version: "9.2" + rocm-version: "6.1" + - os-distro: "rhel" + os-version: "9.2" + rocm-version: "6.2" # RHEL 9.3 - os-distro: "rhel" os-version: "9.3" @@ -191,6 +233,12 @@ jobs: - os-distro: "rhel" os-version: "9.3" rocm-version: "6.0" + - os-distro: "rhel" + os-version: "9.3" + rocm-version: "6.3" + - os-distro: "rhel" + os-version: "9.3" + rocm-version: "6.2" steps: - name: Free Disk Space From a9618215c7c02c08c97dad7c47d0893bbb4faad2 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Wed, 9 Oct 2024 16:35:59 -0400 Subject: [PATCH 02/11] Update release.yml --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 085c884b..60cf7367 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,7 @@ on: push: tags: - v* + - rocm-rel* concurrency: group: ${{ github.workflow }}-${{ github.ref }} From d973b067e1afbd59d8455425be847138b743897f Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Wed, 9 Oct 2024 16:37:50 -0400 Subject: [PATCH 03/11] Update release.yml --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 60cf7367..e3e4be42 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,8 +4,8 @@ on: workflow_dispatch: push: tags: - - v* - - rocm-rel* + - v[1-9].[0-9]+.[0-9]+* + - rocm-[1-9].[0-9]+.[0-9]+* concurrency: group: ${{ github.workflow }}-${{ github.ref }} From 98daad2bce11449ed03fcd2d0eedec5c22a47a39 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Wed, 9 Oct 2024 16:39:40 -0400 Subject: [PATCH 04/11] Update cpack.yml Fix branch name for release/** --- .github/workflows/cpack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cpack.yml b/.github/workflows/cpack.yml index f8655581..a05b22fc 100644 --- a/.github/workflows/cpack.yml +++ b/.github/workflows/cpack.yml @@ -4,7 +4,7 @@ run-name: cpack on: workflow_dispatch: push: - branches: [main, releases/**] + branches: [main, release/**] tags: - "v[1-9].[0-9]+.[0-9]+*" - "rocm-[1-9].[0-9]+.[0-9]+*" From cb74f579253b47b44bf33d98c5cef5b8be1caa60 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Wed, 9 Oct 2024 16:42:11 -0400 Subject: [PATCH 05/11] Update cpack.yml Update branches for pull_request --- .github/workflows/cpack.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cpack.yml b/.github/workflows/cpack.yml index a05b22fc..aa27f677 100644 --- a/.github/workflows/cpack.yml +++ b/.github/workflows/cpack.yml @@ -4,7 +4,7 @@ run-name: cpack on: workflow_dispatch: push: - branches: [main, release/**] + branches: release/** tags: - "v[1-9].[0-9]+.[0-9]+*" - "rocm-[1-9].[0-9]+.[0-9]+*" @@ -12,7 +12,7 @@ on: - '*.md' - 'source/docs/**' pull_request: - branches: [main] + branches: release/** paths: - '.github/workflows/cpack.yml' - 'docker/**' From 44c8c6a90415726b92adbb5126a79041bda87c25 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Thu, 10 Oct 2024 16:19:53 -0400 Subject: [PATCH 06/11] Update build-docker.sh --- docker/build-docker.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/build-docker.sh b/docker/build-docker.sh index beafa2da..c716c187 100755 --- a/docker/build-docker.sh +++ b/docker/build-docker.sh @@ -177,7 +177,7 @@ do 4.1* | 4.0*) ROCM_REPO_DIST="xenial" ;; - 5.3 | 5.3.* | 5.4 | 5.4.* | 5.5 | 5.5.* | 5.6 | 5.6.* | 5.7 | 5.7.* | 6.0 | 6.0.*) + 5.3 | 5.3.* | 5.4 | 5.4.* | 5.5 | 5.5.* | 5.6 | 5.6.* | 5.7 | 5.7.* | 6.*) case "${VERSION}" in 22.04) ROCM_REPO_DIST="ubuntu" @@ -208,7 +208,7 @@ do # set the sub-URL in https://repo.radeon.com/amdgpu-install/ case "${ROCM_VERSION}" in - 5.3 | 5.3.* | 5.4 | 5.4.* | 5.5 | 5.5.* | 5.6 | 5.6.* | 5.7 | 5.7.* | 6.0 | 6.0.*) + 5.3 | 5.3.* | 5.4 | 5.4.* | 5.5 | 5.5.* | 5.6 | 5.6.* | 5.7 | 5.7.* | 6.*) ROCM_RPM=${ROCM_VERSION}/rhel/${RPM_PATH}/amdgpu-install-${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1${RPM_TAG}.noarch.rpm ;; 5.2 | 5.2.* | 5.1 | 5.1.* | 5.0 | 5.0.* | 4.*) @@ -236,7 +236,7 @@ do ;; esac case "${ROCM_VERSION}" in - 5.3 | 5.3.* | 5.4 | 5.4.* | 5.5 | 5.5.* | 5.6 | 5.6.* | 5.7 | 5.7.* | 6.0 | 6.0.*) + 5.3 | 5.3.* | 5.4 | 5.4.* | 5.5 | 5.5.* | 5.6 | 5.6.* | 5.7 | 5.7.* | 6.*) ROCM_RPM=${ROCM_VERSION}/sle/${VERSION}/amdgpu-install-${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1.noarch.rpm ;; 5.2 | 5.2.*) From 942dd1ce079ec835e813b3e6d9db63a91af33454 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Thu, 10 Oct 2024 17:06:38 -0400 Subject: [PATCH 07/11] Fixed a typo in rocm-version for RHEL 9.3 --- .github/workflows/cpack.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/cpack.yml b/.github/workflows/cpack.yml index aa27f677..c2e09d94 100644 --- a/.github/workflows/cpack.yml +++ b/.github/workflows/cpack.yml @@ -32,10 +32,6 @@ jobs: fail-fast: false matrix: include: - # ubuntu 18.04 - - os-distro: "ubuntu" - os-version: "18.04" - rocm-version: "0.0" # ubuntu 20.04 - os-distro: "ubuntu" os-version: "20.04" @@ -235,7 +231,7 @@ jobs: rocm-version: "6.0" - os-distro: "rhel" os-version: "9.3" - rocm-version: "6.3" + rocm-version: "6.1" - os-distro: "rhel" os-version: "9.3" rocm-version: "6.2" From bda4915f8076c75317c2ec06a9d224cc9480e89a Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Thu, 10 Oct 2024 17:19:49 -0400 Subject: [PATCH 08/11] Update Ubuntu docker build --- docker/Dockerfile.ubuntu | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index 49a6b0a0..6374cc8f 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -35,11 +35,7 @@ RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \ echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/${ROCM_REPO_VERSION}/ ${ROCM_REPO_DIST} main" | tee /etc/apt/sources.list.d/rocm.list && \ apt-get update && \ apt-get dist-upgrade -y && \ - apt-get install -y hsa-amd-aqlprofile hsa-rocr-dev hsakmt-roct-dev && \ - apt-get install -y hip-base hip-runtime-amd hip-dev && \ - apt-get install -y rocm-llvm rocm-core rocm-smi-lib rocm-device-libs && \ - apt-get install -y roctracer-dev rocprofiler-dev rccl-dev ${EXTRA_PACKAGES} && \ - if [ "$(echo ${ROCM_VERSION} | awk -F '.' '{print $1}')" -lt "5" ]; then apt-get install -y rocm-dev; fi && \ + apt-get install -y rocm-dev rocm-smi-lib roctracer-dev rocprofiler-dev libpciaccess ${EXTRA_PACKAGES} && \ apt-get autoclean; \ fi From b3e3d5806448a8ac48f800521c1fa5be5d657c23 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Thu, 10 Oct 2024 17:31:49 -0400 Subject: [PATCH 09/11] Update ubuntu docker file --- docker/Dockerfile.ubuntu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index 6374cc8f..f8c588d2 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -35,7 +35,7 @@ RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \ echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/${ROCM_REPO_VERSION}/ ${ROCM_REPO_DIST} main" | tee /etc/apt/sources.list.d/rocm.list && \ apt-get update && \ apt-get dist-upgrade -y && \ - apt-get install -y rocm-dev rocm-smi-lib roctracer-dev rocprofiler-dev libpciaccess ${EXTRA_PACKAGES} && \ + apt-get install -y rocm-dev rocm-smi-lib roctracer-dev rocprofiler-dev rccl-dev libpciaccess0 ${EXTRA_PACKAGES} && \ apt-get autoclean; \ fi From 52d56cdcbb59de04a46641312d11935a6acdc1d9 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Thu, 10 Oct 2024 21:07:02 -0400 Subject: [PATCH 10/11] Update Dockerfile.ubuntu --- docker/Dockerfile.ubuntu | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index f8c588d2..b247c41f 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -23,18 +23,13 @@ ENV PATH ${HOME}/.local/bin:${PATH} RUN apt-get update && \ apt-get dist-upgrade -y && \ - apt-get install -y build-essential cmake libnuma1 wget gnupg2 m4 bash-completion git-core autoconf libtool autotools-dev python3-pip lsb-release libpapi-dev libpfm4-dev libudev1 libopenmpi-dev rpm librpm-dev curl apt-utils && \ + apt-get install -y apt-utils autoconf autotools-dev bash-completion bison build-essential cmake curl git-core gnupg2 libnuma1 libopenmpi-dev libpapi-dev libpfm4-dev librpm-dev libtool libudev1 lsb-release m4 python3-pip rpm texinfo wget && \ python3 -m pip install 'cmake==3.21.4' RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \ - if [ -d /etc/apt/trusted.gpg.d ]; then \ - wget -q -O - https://repo.radeon.com/rocm/rocm.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/rocm.gpg; \ - else \ - wget -q -O - https://repo.radeon.com/rocm/rocm.gpg.key | apt-key add -; \ - fi && \ - echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/${ROCM_REPO_VERSION}/ ${ROCM_REPO_DIST} main" | tee /etc/apt/sources.list.d/rocm.list && \ + wget https://repo.radeon.com/amdgpu-install/${ROCM_VERSION}/ubuntu/${ROCM_REPO_DIST}/${AMDGPU_DEB} && \ + apt-get install -y ./${AMDGPU_DEB} && \ apt-get update && \ - apt-get dist-upgrade -y && \ apt-get install -y rocm-dev rocm-smi-lib roctracer-dev rocprofiler-dev rccl-dev libpciaccess0 ${EXTRA_PACKAGES} && \ apt-get autoclean; \ fi From da4ab3550360193670ff1aeb5843cde5cc7986b6 Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Thu, 10 Oct 2024 23:22:56 -0400 Subject: [PATCH 11/11] Update docker scripts --- docker/Dockerfile.ubuntu | 1 + docker/build-docker.sh | 14 +++----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index b247c41f..48f0cf24 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -19,6 +19,7 @@ ARG ROCM_REPO_VERSION="debian" ARG ROCM_VERSION="0.0" ARG ROCM_REPO_DIST="ubuntu" ARG PYTHON_VERSIONS="6 7 8 9 10 11 12" +ARG AMDGPU_DEB=6.0/ubuntu/focal/amdgpu-install_6.0.60000-1_all.deb ENV PATH ${HOME}/.local/bin:${PATH} RUN apt-get update && \ diff --git a/docker/build-docker.sh b/docker/build-docker.sh index c716c187..3367451c 100755 --- a/docker/build-docker.sh +++ b/docker/build-docker.sh @@ -174,28 +174,23 @@ do ROCM_REPO_DIST="ubuntu" ROCM_REPO_VERSION=${ROCM_VERSION} case "${ROCM_VERSION}" in - 4.1* | 4.0*) - ROCM_REPO_DIST="xenial" - ;; 5.3 | 5.3.* | 5.4 | 5.4.* | 5.5 | 5.5.* | 5.6 | 5.6.* | 5.7 | 5.7.* | 6.*) case "${VERSION}" in 22.04) - ROCM_REPO_DIST="ubuntu" + ROCM_REPO_DIST="jammy" ;; 20.04) ROCM_REPO_DIST="focal" ;; - 18.04) - ROCM_REPO_DIST="bionic" - ;; *) ;; esac + ROCM_DEB=amdgpu-install_${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1_all.deb ;; *) ;; esac - verbose-build docker build . ${PULL} --progress plain -f ${DOCKER_FILE} --tag ${CONTAINER} --build-arg DISTRO=${DISTRO} --build-arg VERSION=${VERSION} --build-arg ROCM_VERSION=${ROCM_VERSION} --build-arg ROCM_REPO_VERSION=${ROCM_REPO_VERSION} --build-arg ROCM_REPO_DIST=${ROCM_REPO_DIST} --build-arg PYTHON_VERSIONS=\"${PYTHON_VERSIONS}\" + verbose-build docker build . ${PULL} --progress plain -f ${DOCKER_FILE} --tag ${CONTAINER} --build-arg DISTRO=${DISTRO} --build-arg VERSION=${VERSION} --build-arg ROCM_VERSION=${ROCM_VERSION} --build-arg ROCM_REPO_VERSION=${ROCM_REPO_VERSION} --build-arg ROCM_REPO_DIST=${ROCM_REPO_DIST} --build-arg AMDGPU_DEB=${ROCM_DEB} --build-arg PYTHON_VERSIONS=\"${PYTHON_VERSIONS}\" elif [ "${DISTRO}" = "rhel" ]; then if [ -z "${VERSION_MINOR}" ]; then send-error "Please provide a major and minor version of the OS. Supported: >= 8.7, <= 9.3" @@ -248,9 +243,6 @@ do 5.0 | 5.0.*) ROCM_RPM=21.50${ROCM_SEP}${ROCM_PATCH}/sle/15/amdgpu-install-21.50${ROCM_SEP}${ROCM_PATCH}.${ROCM_VERSN}-1.noarch.rpm ;; - 4.5 | 4.5.*) - ROCM_RPM=21.40${ROCM_SEP}${ROCM_PATCH}/sle/15/amdgpu-install-21.40${ROCM_SEP}${ROCM_PATCH}.${ROCM_VERSN}-1.noarch.rpm - ;; 0.0) ;; *)