Merge pull request tensorflow#2076 from ROCmSoftwarePlatform/develop-…

…upstream-55-updates ROCM 5.5 updates
fsx950223 · May 4, 2023 · 836598d · 836598d
2 parents 1137a1f + 4744f20
commit 836598d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 9 deletions.
diff --git a/build_rocm_python3 b/build_rocm_python3
@@ -26,7 +26,7 @@ done
 shift "$((OPTIND-1))"
 
 # First positional argument (if any) specifies the ROCM_INSTALL_DIR
-ROCM_INSTALL_DIR=/opt/rocm-5.4.0
+ROCM_INSTALL_DIR=/opt/rocm-5.5.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,10 +3,10 @@
 FROM ubuntu:focal
 MAINTAINER Jeff Poznanovic <jeffrey.poznanovic@amd.com>
 
-ARG ROCM_DEB_REPO=https://repo.radeon.com/rocm/apt/5.4/
+ARG ROCM_DEB_REPO=https://repo.radeon.com/rocm/apt/5.5/
 ARG ROCM_BUILD_NAME=ubuntu
 ARG ROCM_BUILD_NUM=main
-ARG ROCM_PATH=/opt/rocm-5.4.0
+ARG ROCM_PATH=/opt/rocm-5.5.0
 ARG GPU_DEVICE_TARGETS="gfx900 gfx906 gfx908 gfx90a gfx1030"
 
 ARG DEBIAN_FRONTEND=noninteractive
@@ -70,7 +70,7 @@ RUN apt-get install -y software-properties-common
 # For precompiled miopen kernels search for all unversioned packages
 # if search fails it will abort so use true to avoid case where search fails
 RUN MIOPENKERNELS=$( \
-                    apt-cache search --names-only miopenkernels | \
+                    apt-cache search --names-only miopen-hip-gfx | \
                     awk '{print $1}' | \
                     grep -F -v . || \
                     true \

diff --git a/tensorflow/tools/ci_build/linux/rocm/run_gpu_multi.sh b/tensorflow/tools/ci_build/linux/rocm/run_gpu_multi.sh
@@ -25,7 +25,7 @@ echo "Bazel will use ${N_BUILD_JOBS} concurrent build job(s) and ${N_TEST_JOBS}
 echo ""
 
 # First positional argument (if any) specifies the ROCM_INSTALL_DIR
-ROCM_INSTALL_DIR=/opt/rocm-5.4.0
+ROCM_INSTALL_DIR=/opt/rocm-5.5.0
 if [[ -n $1 ]]; then
     ROCM_INSTALL_DIR=$1
 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
@@ -27,7 +27,7 @@ echo "Bazel will use ${N_BUILD_JOBS} concurrent build job(s) and ${N_TEST_JOBS}
 echo ""
 
 # First positional argument (if any) specifies the ROCM_INSTALL_DIR
-ROCM_INSTALL_DIR=/opt/rocm-5.4.0
+ROCM_INSTALL_DIR=/opt/rocm-5.5.0
 if [[ -n $1 ]]; then
     ROCM_INSTALL_DIR=$1
 fi

diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile.rocm.rt b/tensorflow/tools/tf_sig_build_dockerfiles/Dockerfile.rocm.rt
@@ -8,7 +8,7 @@ COPY setup.packages.sh setup.packages.sh
 # Install ROCM
 ARG TF_PKGS_DIR=tmp/packages
 ARG TENSORFLOW_PACKAGE=tf_nightly_rocm
-ARG ROCM_VERSION=5.4.0
+ARG ROCM_VERSION=5.5.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=5.4.0
+ARG ROCM_VERSION=5.5.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=5.4.0 --build-arg PYTHON_VERSION=3.9 -t my-tf-devel . 
+  --build-arg ROCM_VERSION=5.5.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/setup.rocm.sh b/tensorflow/tools/tf_sig_build_dockerfiles/setup.rocm.sh
@@ -61,6 +61,14 @@ echo $GPU_DEVICE_TARGETS
 # install rocm
 /setup.packages.sh /devel.packages.rocm.txt
 
+apt-get update --allow-insecure-repositories
+MIOPENKERNELS=$( \
+                    apt-cache search --names-only miopen-hip-gfx | \
+                    awk '{print $1}' | \
+                    grep -F -v . || \
+		    true )
+DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated ${MIOPENKERNELS}
+
 # Ensure the ROCm target list is set up
 printf '%s\n' ${GPU_DEVICE_TARGETS} | tee -a "$ROCM_PATH/bin/target.lst"
 touch "${ROCM_PATH}/.info/version"