From a3fcc3180fea7afd547f8ec68963d248d105ad32 Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Tue, 25 Apr 2023 19:36:04 -0400
Subject: [PATCH] ci,crusher: updating to rocm 5.4

---
 .gitlab/ci/config/kokkos.sh | 2 +-
 .gitlab/ci/crusher.yml      | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab/ci/config/kokkos.sh b/.gitlab/ci/config/kokkos.sh
index ec7650a1c..698f03b6a 100755
--- a/.gitlab/ci/config/kokkos.sh
+++ b/.gitlab/ci/config/kokkos.sh
@@ -19,7 +19,7 @@ curl -L "https://github.com/kokkos/kokkos/archive/refs/tags/$VERSION.tar.gz" \
 cmake -S "$WORKDIR/kokkos-$VERSION" -B "$WORKDIR/kokkos_build" \
   "-DCMAKE_BUILD_TYPE:STRING=release" \
   "-DCMAKE_CXX_COMPILER_LAUNCHER=ccache" \
-  "-DCMAKE_CXX_STANDARD:STRING=14" \
+  "-DCMAKE_CXX_STANDARD:STRING=17" \
   "-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON" \
   "-DKokkos_ENABLE_HIP:BOOL=ON" \
   "-DKokkos_ENABLE_HIP_RELOCATABLE_DEVICE_CODE:BOOL=OFF" \
diff --git a/.gitlab/ci/crusher.yml b/.gitlab/ci/crusher.yml
index 5e5fdbba0..ef3a54d9c 100644
--- a/.gitlab/ci/crusher.yml
+++ b/.gitlab/ci/crusher.yml
@@ -19,15 +19,16 @@
 
     KOKKOS_OPTS: >-
       -DCMAKE_INSTALL_PREFIX:PATH=$CI_BUILDS_DIR/kokkos_install
-      -DCMAKE_CXX_COMPILER:FILEPATH=/opt/rocm-4.5.0/hip/bin/hipcc
+      -DCMAKE_CXX_COMPILER:FILEPATH=/opt/rocm-5.4.3/hip/bin/hipcc
       -DKokkos_ARCH_VEGA90A:BOOL=ON
 
-    # DefApps/default;craype;rocm;gcc should be loaded first
+    # The user default module list should not exist
+    # craype;rocm;gcc should be loaded first
     JOB_MODULES: >-
       craype-accel-amd-gfx90a
-      rocm/4.5.0
       gcc/12
-      cmake/3.23
+      cmake
+      rocm/5.4.3
       git
       git-lfs
       ninja