Skip to content

Commit

Permalink
Create ROCm 6.2 Installers (#369)
Browse files Browse the repository at this point in the history
* Add ROCm 6.2 to CPACK workflow.

* Update APT-Get packages

  - hipcc is no longer included in hip-runtime-amd meta packages. This change standardizes the installs with the other OSes.

* Bump version to 1.11.4

---------

Signed-off-by: David Galiffi <[email protected]>
  • Loading branch information
dgaliffiAMD authored Aug 7, 2024
1 parent d0d9749 commit 6b0627f
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 21 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/cpack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ jobs:
- 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"
Expand All @@ -76,6 +79,9 @@ jobs:
- 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"
Expand Down Expand Up @@ -130,6 +136,9 @@ jobs:
- 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"
Expand Down Expand Up @@ -175,6 +184,9 @@ jobs:
- 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"
Expand Down Expand Up @@ -211,6 +223,9 @@ jobs:
- 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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.11.3
1.11.4
16 changes: 4 additions & 12 deletions docker/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand All @@ -27,19 +28,10 @@ RUN apt-get update && \
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

Expand Down
11 changes: 3 additions & 8 deletions docker/build-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 6b0627f

Please sign in to comment.