diff --git a/.github/workflows/cpack.yml b/.github/workflows/cpack.yml index c4753048d..c2e09d94c 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: 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/**' @@ -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" @@ -55,6 +51,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 +76,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 +123,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 +136,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 +174,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 +187,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 +216,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 +229,12 @@ jobs: - os-distro: "rhel" os-version: "9.3" rocm-version: "6.0" + - os-distro: "rhel" + os-version: "9.3" + rocm-version: "6.1" + - os-distro: "rhel" + os-version: "9.3" + rocm-version: "6.2" steps: - name: Free Disk Space diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 085c884b8..e3e4be42b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,8 @@ on: workflow_dispatch: push: tags: - - v* + - v[1-9].[0-9]+.[0-9]+* + - rocm-[1-9].[0-9]+.[0-9]+* concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index 49a6b0a09..48f0cf241 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -19,27 +19,19 @@ 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 && \ 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 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 rccl-dev libpciaccess0 ${EXTRA_PACKAGES} && \ apt-get autoclean; \ fi diff --git a/docker/build-docker.sh b/docker/build-docker.sh index beafa2da3..3367451c9 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.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" + 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" @@ -208,7 +203,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 +231,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.*) @@ -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) ;; *)