Change default ROCM to 6.2 (#2631)

* Change default ROCM to 6.2 * Some addition ROCM6.2 defaults * Reset runtime dockerfile link to ub20; install python3-pip
ROCm · Aug 27, 2024 · 71a8fc1 · 71a8fc1
1 parent d40d974
commit 71a8fc1
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 15 deletions.
diff --git a/build_rocm_python3 b/build_rocm_python3
@@ -30,7 +30,7 @@ shift "$((OPTIND-1))"
 nightly=true
 
 # First positional argument (if any) specifies the ROCM_INSTALL_DIR
-ROCM_INSTALL_DIR=/opt/rocm-6.1.2
+ROCM_INSTALL_DIR=/opt/rocm-6.2.0
 if [[ -n $1 ]]; then
     ROCM_INSTALL_DIR=$1
 fi

diff --git a/tensorflow/tools/ci_build/Dockerfile.rocm b/tensorflow/tools/ci_build/Dockerfile.rocm
@@ -3,11 +3,11 @@
 FROM ubuntu:focal
 MAINTAINER Jeff Poznanovic <[email protected]>
 
-ARG ROCM_DEB_REPO=https://repo.radeon.com/rocm/apt/6.1.2/
+ARG ROCM_DEB_REPO=https://repo.radeon.com/rocm/apt/6.2/
 ARG ROCM_BUILD_NAME=ubuntu
 ARG ROCM_BUILD_NUM=main
-ARG ROCM_PATH=/opt/rocm-6.1.2
-ARG GPU_DEVICE_TARGETS="gfx900 gfx906 gfx908 gfx90a gfx940 gfx941 gfx942 gfx1030 gfx1100"
+ARG ROCM_PATH=/opt/rocm-6.2.0
+ARG GPU_DEVICE_TARGETS="gfx908 gfx90a gfx940 gfx941 gfx942 gfx1030 gfx1100"
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV TF_NEED_ROCM 1

diff --git a/tensorflow/tools/ci_build/linux/rocm/run_gpu_multi.sh b/tensorflow/tools/ci_build/linux/rocm/run_gpu_multi.sh
@@ -29,7 +29,7 @@ if [[ -n $1 ]]; then
     ROCM_INSTALL_DIR=$1
 else
     if [[ -z "${ROCM_PATH}" ]]; then
-        ROCM_INSTALL_DIR=/opt/rocm-6.1.2
+        ROCM_INSTALL_DIR=/opt/rocm-6.2.0
     else
         ROCM_INSTALL_DIR=$ROCM_PATH
     fi

diff --git a/tensorflow/tools/ci_build/linux/rocm/run_gpu_single.sh b/tensorflow/tools/ci_build/linux/rocm/run_gpu_single.sh
@@ -37,7 +37,7 @@ if [[ -n $1 ]]; then
     ROCM_INSTALL_DIR=$1
 else
     if [[ -z "${ROCM_PATH}" ]]; then
-        ROCM_INSTALL_DIR=/opt/rocm-6.1.2
+        ROCM_INSTALL_DIR=/opt/rocm-6.2.0
     else
         ROCM_INSTALL_DIR=$ROCM_PATH
     fi

diff --git a/tensorflow/tools/ci_build/linux/rocm/run_xla.sh b/tensorflow/tools/ci_build/linux/rocm/run_xla.sh
@@ -38,7 +38,7 @@ if [[ -n $1 ]]; then
     ROCM_INSTALL_DIR=$1
 else
     if [[ -z "${ROCM_PATH}" ]]; then
-        ROCM_INSTALL_DIR=/opt/rocm-6.1.1
+        ROCM_INSTALL_DIR=/opt/rocm-6.2.0
     else
         ROCM_INSTALL_DIR=$ROCM_PATH
     fi

diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile.rocm.rt.ub20 b/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile.rocm.rt.ub20
@@ -12,7 +12,7 @@ RUN /setup.packages.sh /runtime.packages.txt
 # Install ROCM
 ARG TF_PKGS_DIR=tmp/packages
 ARG TENSORFLOW_PACKAGE=tf_nightly_rocm
-ARG ROCM_VERSION=6.1.2
+ARG ROCM_VERSION=6.2.0
 ARG CUSTOM_INSTALL
 ARG ROCM_PATH=/opt/rocm-${ROCM_VERSION}
 ENV ROCM_PATH=${ROCM_PATH}

diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile.rocm.rt.ub22 b/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile.rocm.rt.ub22
@@ -14,7 +14,7 @@ RUN /setup.packages.sh /runtime.packages.txt
 # Install ROCM
 ARG TF_PKGS_DIR=tmp/packages
 ARG TENSORFLOW_PACKAGE=tf_nightly_rocm
-ARG ROCM_VERSION=6.1.2
+ARG ROCM_VERSION=6.2.0
 ARG CUSTOM_INSTALL
 ARG ROCM_PATH=/opt/rocm-${ROCM_VERSION}
 ENV ROCM_PATH=${ROCM_PATH}

diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile.rocm.rt.ub24 b/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile.rocm.rt.ub24
@@ -14,7 +14,7 @@ RUN /setup.packages.sh /runtime.packages.txt
 # Install ROCM
 ARG TF_PKGS_DIR=tmp/packages
 ARG TENSORFLOW_PACKAGE=tf_nightly_rocm
-ARG ROCM_VERSION=6.1.2
+ARG ROCM_VERSION=6.2.0
 ARG CUSTOM_INSTALL
 ARG ROCM_PATH=/opt/rocm-${ROCM_VERSION}
 ENV ROCM_PATH=${ROCM_PATH}

diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile.rocm.ub20 b/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile.rocm.ub20
@@ -11,7 +11,7 @@ COPY builder.packages.txt builder.packages.txt
 RUN /setup.packages.sh /builder.packages.txt
 
 # Install ROCM
-ARG ROCM_VERSION=6.1.2
+ARG ROCM_VERSION=6.2.0
 ARG CUSTOM_INSTALL
 ARG ROCM_PATH=/opt/rocm-${ROCM_VERSION}
 ENV ROCM_PATH=${ROCM_PATH}

diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile.rocm.ub22 b/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile.rocm.ub22
@@ -11,7 +11,7 @@ COPY builder.packages.txt builder.packages.txt
 RUN /setup.packages.sh /builder.packages.txt
 
 # Install ROCM
-ARG ROCM_VERSION=6.1.2
+ARG ROCM_VERSION=6.2.0
 ARG CUSTOM_INSTALL
 ARG ROCM_PATH=/opt/rocm-${ROCM_VERSION}
 ENV ROCM_PATH=${ROCM_PATH}

diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile.rocm.ub24 b/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile.rocm.ub24
@@ -11,7 +11,7 @@ COPY builder.packages.txt builder.packages.txt
 RUN /setup.packages.sh /builder.packages.txt
 
 # Install ROCM
-ARG ROCM_VERSION=6.1.2
+ARG ROCM_VERSION=6.2.0
 ARG CUSTOM_INSTALL
 ARG ROCM_PATH=/opt/rocm-${ROCM_VERSION}
 ENV ROCM_PATH=${ROCM_PATH}

diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/README.md b/tensorflow/tools/tf_sig_build_dockerfiles/README.md
@@ -50,7 +50,7 @@ DOCKER_BUILDKIT=1 docker build \
 For ROCM
 ```
 DOCKER_BUILDKIT=1 docker build -f Dockerfile.rocm \
-  --build-arg ROCM_VERSION=6.1.0 --build-arg PYTHON_VERSION=3.9 -t my-tf-devel . 
+  --build-arg ROCM_VERSION=6.2.0 --build-arg PYTHON_VERSION=3.9 -t my-tf-devel . 
 ```
 It will take a long time to build devtoolset and install packages. After
 it's done, you can use the commands below to test your changes. Just replace

diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/devel.packages.rocm.txt b/tensorflow/tools/tf_sig_build_dockerfiles/devel.packages.rocm.txt
@@ -45,6 +45,7 @@ patchelf
 pkg-config
 python3-dev
 python3-setuptools
+python3-pip
 rsync
 software-properties-common
 sudo

diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/setup.rocm.sh b/tensorflow/tools/tf_sig_build_dockerfiles/setup.rocm.sh
@@ -25,7 +25,7 @@
 set -x
 
 # Get arguments (or defaults)
-ROCM_VERSION=6.1.0
+ROCM_VERSION=6.2.0
 DISTRO=focal
 if [[ -n $1 ]]; then
     ROCM_VERSION=$1