Re-enable jenkins HIP with MI100

streeve · Jan 29, 2024 · cd41fa6 · cd41fa6
1 parent 9ef42d2
commit cd41fa6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.jenkins b/.jenkins
@@ -63,7 +63,7 @@ pipeline {
                             dir 'docker'
                             additionalBuildArgs '--build-arg BASE=rocm/dev-ubuntu-20.04:4.5-complete'
                             args '-v /tmp/ccache.kokkos:/tmp/ccache --device=/dev/kfd --device=/dev/dri --security-opt seccomp=unconfined --group-add video --env HIP_VISIBLE_DEVICES=$HIP_VISIBLE_DEVICES'
-                            label 'rocm-docker && vega && AMD_Radeon_Instinct_MI60'
+                            label 'rocm-docker && AMD_Radeon_Instinct_MI100'
                         }
                     }
                     steps {

diff --git a/docker/Dockerfile.hipcc b/docker/Dockerfile.hipcc
@@ -72,7 +72,7 @@ ENV PATH=${OPENMPI_DIR}/bin:$PATH
 
 # Install Kokkos
 ARG KOKKOS_VERSION=3.7.02
-ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_HIP=ON -DKokkos_ENABLE_LIBDL=OFF -DKokkos_ARCH_VEGA906=ON"
+ARG KOKKOS_OPTIONS="-DKokkos_ENABLE_HIP=ON -DKokkos_ENABLE_LIBDL=OFF -DKokkos_ARCH_VEGA908=ON"
 ENV KOKKOS_DIR=/opt/kokkos
 RUN KOKKOS_URL=https://github.com/kokkos/kokkos/archive/${KOKKOS_VERSION}.tar.gz && \
     KOKKOS_ARCHIVE=kokkos-${KOKKOS_HASH}.tar.gz && \
@@ -100,7 +100,7 @@ RUN ARBORX_VERSION=4834bff44c23c9510c6ed93366638dcdf85ab217 && \
       -D CMAKE_INSTALL_PREFIX=${ARBORX_DIR} \
       -D CMAKE_BUILD_TYPE=Debug \
       -D CMAKE_CXX_COMPILER=hipcc \
-      -D CMAKE_CXX_FLAGS=-amdgpu-target=gfx906 \
+      -D CMAKE_CXX_FLAGS=-amdgpu-target=gfx908 \
       -D CMAKE_CXX_EXTENSIONS=OFF \
       -D CMAKE_PREFIX_PATH=${KOKKOS_DIR} \
     .. && \
@@ -149,7 +149,7 @@ RUN HEFFTE_URL=https://github.com/icl-utk-edu/heffte/archive/v${HEFFTE_VERSION}.
       -D CMAKE_BUILD_TYPE=Debug \
       -D CMAKE_CXX_COMPILER=hipcc \
       -D CMAKE_CXX_STANDARD=14 \
-      -D CMAKE_CXX_FLAGS="--amdgpu-target=gfx906" \
+      -D CMAKE_CXX_FLAGS="--amdgpu-target=gfx908" \
       -D Heffte_ENABLE_ROCM=ON \
       -D Heffte_ENABLE_FFTW=ON \
     .. && \