Update default to ROCm 6.1

* Update default to Ubuntu 22.04 and ROCm 5.4 * Drop Ubuntu 18.04 stuffs * Drop hip-libs and opencl-ml variants
ROCm · Jul 30, 2024 · 0e69115 · 0e69115
1 parent 2356df7
commit 0e69115
Show file tree

Hide file tree

Showing 37 changed files with 77 additions and 462 deletions.
diff --git a/.env b/.env
@@ -1,6 +1,7 @@
-OS_VARIANT=ubuntu-20.04
-ROCM_VERSION=5.3
-AMDGPU_VERSION=5.3
+OS_VARIANT=ubuntu-22.04
+ROCM_VERSION=6.1
+AMDGPU_VERSION=6.1
 TERM_FLAVOR=-complete-sdk
+XTERM_FLAVOR=-complete
 UID=
 RENDER_GID=109
diff --git a/README.md b/README.md
@@ -12,10 +12,10 @@ This fork is almost completely re-written as:
 - Use `gpg --dearmor` instead of `apt-key add` for ubuntu-20.04 or later.
 - Add X11 enabled terminal image.
 - Omit CentOS-7 stuff due to its EOL.
-- Ubuntu 18.04 stuffs are still exist, but no longer update.
-- Add many image variants based on latest (5.6) [ROCm Programming Models][].
+- Omit Ubuntu 18.04 stuffs.
+- Add many image variants based on latest (6.1) [ROCm Programming Models][].
 
-[ROCm Programming Models]: https://rocm.docs.amd.com/en/docs-5.6.0/deploy/linux/os-native/package_manager_integration.html#components-of-rocm-programming-models
+[ROCm Programming Models]: https://rocm.docs.amd.com/projects/install-on-linux/en/latest/how-to/native-install/package-manager-integration.html#components-of-rocm-programming-models
 
 ## How to build
 ### Build all images for all OSes

diff --git a/build.sh b/build.sh
@@ -3,17 +3,19 @@
 OS=${OS:-ubuntu}
 OS_VERSION=${OS_VERSION:-22.04}
 OS_VARIANT=${OS_VARIANT:-${OS}-${OS_VERSION}}
-ROCM_VERSION=${ROCM_VERSION:-5.6}
-AMDGPU_VERSION=${AMDGPU_VERSION:-5.6}
+ROCM_VERSION=${ROCM_VERSION:-6.1}
+AMDGPU_VERSION=${AMDGPU_VERSION:-6.1}
 #TERM_FLAVOR=""
 TERM_FLAVOR="-complete-sdk"
+XTERM_FLAVOR="-complete"
 RENDER_GID=$(getent group render | cut --delimiter ':' --fields 3)
 
 cat >.env <<EOF
 OS_VARIANT=${OS_VARIANT}
 ROCM_VERSION=${ROCM_VERSION}
 AMDGPU_VERSION=${AMDGPU_VERSION}
 TERM_FLAVOR=${TERM_FLAVOR}
+XTERM_FLAVOR=${XTERM_FLAVOR}
 UID=${UID:-$(id -u)}
 RENDER_GID=${RENDER_GID}
 EOF
@@ -27,7 +29,7 @@ ${COMPOSE} build base || exit $?
 # docker tag rocm/dev-${OS_VARIANT}:${ROCM_VERSION} rocm/dev-${OS_VARIANT}:latest
 
 # build rocm/dev-${OS_VARIANT}:${ROCM_VERSION}-${FLAVOR}
-FLAVORS="openmp-sdk opencl opencl-sdk hip hip-libs hip-sdk ml ml-sdk complete complete-sdk"
+FLAVORS="openmp-sdk opencl opencl-sdk hip hip-sdk ml ml-sdk complete complete-sdk"
 for flavor in ${FLAVORS}; do
   ${COMPOSE} build ${flavor} || exit $?
   # docker tag rocm/dev-${OS_VARIANT}:${ROCM_VERSION}-${FLAVOR} rocm/dev-${OS_VARIANT}:latest-${FLAVOR}

diff --git a/dev/Dockerfile-ubuntu-18.04 b/dev/Dockerfile-ubuntu-18.04
diff --git a/dev/Dockerfile-ubuntu-18.04-complete b/dev/Dockerfile-ubuntu-18.04-complete
diff --git a/dev/Dockerfile-ubuntu-18.04-complete-sdk b/dev/Dockerfile-ubuntu-18.04-complete-sdk
diff --git a/dev/Dockerfile-ubuntu-18.04-hip b/dev/Dockerfile-ubuntu-18.04-hip
diff --git a/dev/Dockerfile-ubuntu-18.04-hip-libs b/dev/Dockerfile-ubuntu-18.04-hip-libs
diff --git a/dev/Dockerfile-ubuntu-18.04-hip-sdk b/dev/Dockerfile-ubuntu-18.04-hip-sdk
diff --git a/dev/Dockerfile-ubuntu-18.04-ml b/dev/Dockerfile-ubuntu-18.04-ml
diff --git a/dev/Dockerfile-ubuntu-18.04-ml-sdk b/dev/Dockerfile-ubuntu-18.04-ml-sdk
diff --git a/dev/Dockerfile-ubuntu-18.04-opencl b/dev/Dockerfile-ubuntu-18.04-opencl
diff --git a/dev/Dockerfile-ubuntu-18.04-opencl-ml b/dev/Dockerfile-ubuntu-18.04-opencl-ml
diff --git a/dev/Dockerfile-ubuntu-18.04-opencl-sdk b/dev/Dockerfile-ubuntu-18.04-opencl-sdk
diff --git a/dev/Dockerfile-ubuntu-18.04-openmp-sdk b/dev/Dockerfile-ubuntu-18.04-openmp-sdk
diff --git a/dev/Dockerfile-ubuntu-20.04 b/dev/Dockerfile-ubuntu-20.04
@@ -23,7 +23,6 @@ RUN apt-get update \
   kmod \
   file \
   python3 \
-  libnuma1 \
   rocm-language-runtime \
   rocminfo \
   && apt-get clean \

diff --git a/dev/Dockerfile-ubuntu-20.04-complete b/dev/Dockerfile-ubuntu-20.04-complete
@@ -10,5 +10,7 @@ RUN apt-get update \
   && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
   rocm-opencl-runtime \
   clinfo \
+  migraphx \
+  mivisionx \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
diff --git a/dev/Dockerfile-ubuntu-20.04-complete-sdk b/dev/Dockerfile-ubuntu-20.04-complete-sdk
@@ -2,7 +2,7 @@
 # Add rocm-lib package to rocm/dev-ubuntu-20.04 image
 
 ARG OS_VARIANT=ubuntu-20.04
-ARG ROCM_VERSION=5.3
+ARG ROCM_VERSION=6.1
 
 FROM rocm/dev-${OS_VARIANT}:${ROCM_VERSION}-ml-sdk
 
@@ -11,5 +11,7 @@ RUN apt-get update \
   rocm-opencl-sdk \
   clinfo \
   rocm-openmp-sdk \
+  migraphx-dev \
+  mivisionx-dev \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
diff --git a/dev/Dockerfile-ubuntu-20.04-hip b/dev/Dockerfile-ubuntu-20.04-hip
@@ -2,13 +2,13 @@
 # Add rocm-lib package to rocm/dev-ubuntu-20.04 image
 
 ARG OS_VARIANT=ubuntu-20.04
-ARG ROCM_VERSION=5.3
+ARG ROCM_VERSION=6.1
 
 FROM rocm/dev-${OS_VARIANT}:$ROCM_VERSION
 
 RUN apt-get update \
   && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-  rocm-hip-runtime \
+  rocm-hip-libraries \
   && apt-mark auto rocminfo rocm-language-runtime \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
diff --git a/dev/Dockerfile-ubuntu-20.04-hip-libs b/dev/Dockerfile-ubuntu-20.04-hip-libs
diff --git a/dev/Dockerfile-ubuntu-20.04-hip-sdk b/dev/Dockerfile-ubuntu-20.04-hip-sdk
@@ -2,16 +2,15 @@
 # Add rocm-lib package to rocm/dev-ubuntu-20.04 image
 
 ARG OS_VARIANT=ubuntu-20.04
-ARG ROCM_VERSION=5.3
+ARG ROCM_VERSION=6.1
 
-FROM rocm/dev-${OS_VARIANT}:${ROCM_VERSION}-hip-libs
+FROM rocm/dev-${OS_VARIANT}:${ROCM_VERSION}-hip
 
 RUN apt-get update \
   && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
   rocm-hip-sdk \
   python3-dev \
-  libnuma-dev \
   build-essential \
-  && apt-mark auto rocm-hip-libraries libnuma1 \
+  && apt-mark auto rocm-hip-libraries \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
diff --git a/dev/Dockerfile-ubuntu-20.04-ml b/dev/Dockerfile-ubuntu-20.04-ml
@@ -2,9 +2,9 @@
 # Add rocm-lib package to rocm/dev-ubuntu-20.04 image
 
 ARG OS_VARIANT=ubuntu-20.04
-ARG ROCM_VERSION=5.3
+ARG ROCM_VERSION=6.1
 
-FROM rocm/dev-${OS_VARIANT}:${ROCM_VERSION}-hip-libs
+FROM rocm/dev-${OS_VARIANT}:${ROCM_VERSION}-hip
 
 RUN apt-get update \
   && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

diff --git a/dev/Dockerfile-ubuntu-20.04-ml-sdk b/dev/Dockerfile-ubuntu-20.04-ml-sdk
@@ -2,16 +2,15 @@
 # Add rocm-lib package to rocm/dev-ubuntu-20.04 image
 
 ARG OS_VARIANT=ubuntu-20.04
-ARG ROCM_VERSION=5.3
+ARG ROCM_VERSION=6.1
 
 FROM rocm/dev-${OS_VARIANT}:${ROCM_VERSION}-ml
 
 RUN apt-get update \
   && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
   rocm-ml-sdk \
   python3-dev \
-  libnuma-dev \
   build-essential \
-  && apt-mark auto rocm-ml-libraries libnuma1 \
+  && apt-mark auto rocm-ml-libraries \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
diff --git a/dev/Dockerfile-ubuntu-20.04-opencl b/dev/Dockerfile-ubuntu-20.04-opencl
@@ -2,7 +2,7 @@
 # Add rocm-lib package to rocm/dev-ubuntu-20.04 image
 
 ARG OS_VARIANT=ubuntu-20.04
-ARG ROCM_VERSION=5.3
+ARG ROCM_VERSION=6.1
 
 FROM rocm/dev-${OS_VARIANT}:$ROCM_VERSION