Make hipcc part of install prereqs and cleanup commented line (#3469)

ROCm · Sep 25, 2024 · 2c2085d · 2c2085d
1 parent 9f01876
commit 2c2085d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/hip-clang.docker b/hip-clang.docker
@@ -28,7 +28,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-
     wget \
     rocm-device-libs \
     hip-dev \
-    hipcc \
     libnuma-dev \
     miopen-hip \
     rocblas \
@@ -45,9 +44,6 @@ RUN ldconfig
 # Workaround broken miopen cmake files
 RUN sed -i 's,;/usr/lib/x86_64-linux-gnu/librt.so,,g' /opt/rocm/lib/cmake/miopen/miopen-targets.cmake
 
-# Workaround for broken hip-clang
-# RUN sed -i -e '/if(WIN32)/, /endif()/d' /opt/rocm/lib/cmake/hip/hip-config.cmake && sed -i -n 5p /opt/rocm/lib/cmake/hip/hip-config.cmake
-
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 

diff --git a/tools/docker/sles.docker b/tools/docker/sles.docker
@@ -31,9 +31,6 @@ RUN echo "/opt/rocm/lib" > /etc/ld.so.conf.d/rocm.conf
 RUN echo "/opt/rocm/llvm/lib" > /etc/ld.so.conf.d/rocm-llvm.conf
 RUN ldconfig
 
-# Workaround for broken hip-clang
-RUN sed -i '/if(WIN32)/, /endif()/d' /opt/rocm/lib/cmake/hip/hip-config.cmake || true
-
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 

diff --git a/tools/install_prereqs.sh b/tools/install_prereqs.sh
@@ -33,6 +33,7 @@ export LANG=C.UTF-8
 
 source /etc/os-release
 
+# hipcc added as workaround for broken hip-dev package
 if [[ ("${ID}" == "sles") ]]; then
   zypper -n --gpg-auto-import-keys install -y \
     cmake \
@@ -60,6 +61,7 @@ else
     libgfortran5 \
     hipblas-dev \
     hipblaslt-dev \
+    hipcc \
     rocm-cmake \
     rocm-llvm-dev \
     libtbb-dev