From efb2a21c406997005dac5b9d57776c913a9b732c Mon Sep 17 00:00:00 2001
From: "Victor A. P. Magri" <paludettomag1@llnl.gov>
Date: Sat, 14 Dec 2024 18:01:55 -0800
Subject: [PATCH 01/14] Add tioga-cce-18-rocm-6.2.1 host config

---
 host-configs/LLNL/tioga-base.cmake            | 18 +++++-----
 .../LLNL/tioga-cce-18-rocm-6.2.1.cmake        | 36 +++++++++++++++++++
 2 files changed, 45 insertions(+), 9 deletions(-)
 create mode 100644 host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake

diff --git a/host-configs/LLNL/tioga-base.cmake b/host-configs/LLNL/tioga-base.cmake
index 411cc676..871b7a9f 100644
--- a/host-configs/LLNL/tioga-base.cmake
+++ b/host-configs/LLNL/tioga-base.cmake
@@ -1,4 +1,4 @@
-set(CMAKE_CXX_STANDARD 14 CACHE STRING "")
+set( CMAKE_CXX_STANDARD 14 CACHE STRING "" )
 
 set( ENABLE_MPI ON CACHE BOOL "" FORCE )
 set( ENABLE_FIND_MPI ON CACHE BOOL "" FORCE )
@@ -10,15 +10,15 @@ set( ENABLE_HIP ON CACHE BOOL "" FORCE )
 set( ENABLE_WARNINGS_AS_ERRORS FALSE CACHE BOOL "" FORCE )
 
 # GTEST
-set(ENABLE_GTEST_DEATH_TESTS OFF CACHE BOOL "")
-set(gtest_disable_pthreads ON CACHE BOOL "")
+set( ENABLE_GTEST_DEATH_TESTS OFF CACHE BOOL "" )
+set( gtest_disable_pthreads ON CACHE BOOL "" )
 
 # disable most binaries and doc generation
-set(ENABLE_TESTS OFF CACHE BOOL "" FORCE)
-set(DISABLE_UNIT_TESTS ON CACHE BOOL "" FORCE)
-set(ENABLE_EXAMPLES OFF CACHE BOOL "" FORCE)
-set(ENABLE_BENCHMARKS OFF CACHE BOOL "" FORCE)
-set(ENABLE_DOCS OFF CACHE BOOL "" FORCE)
+set( ENABLE_TESTS OFF CACHE BOOL "" FORCE )
+set( DISABLE_UNIT_TESTS ON CACHE BOOL "" FORCE )
+set( ENABLE_EXAMPLES OFF CACHE BOOL "" FORCE )
+set( ENABLE_BENCHMARKS OFF CACHE BOOL "" FORCE )
+set( ENABLE_DOCS OFF CACHE BOOL "" FORCE )
 
 # BLT trying to find MPI fails on cray with cce
-set(ENABLE_FIND_MPI FALSE CACHE BOOL "")
+set( ENABLE_FIND_MPI FALSE CACHE BOOL "" )
diff --git a/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake b/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake
new file mode 100644
index 00000000..7ea00947
--- /dev/null
+++ b/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake
@@ -0,0 +1,36 @@
+set( CCE_VERSION_STRING "18.0.1" )
+set( HIP_VERSION_STRING "6.2.1" )
+set( CONFIG_NAME "tioga-cce-${CCE_VERSION_STRING}-rocm-${HIP_VERSION_STRING}" CACHE PATH "" )
+include( ${CMAKE_CURRENT_LIST_DIR}/tioga-base.cmake )
+
+# TODO: Set up the tpls
+#set(TPL_INSTALL_DATE 2023-05-17)
+#set(GEOS_TPL_DIR "/usr/WS1/GEOS/GEOSX/TPLs_${TPL_INSTALL_DATE}/install-${CONFIG_NAME}" CACHE PATH "")
+
+set( ENABLE_UMPIRE ON CACHE BOOL "" )
+set( ENABLE_CHAI ON CACHE BOOL "" )
+set( ENABLE_CALIPER ON CACHE BOOL "" )
+set( ENABLE_ADIAK ON CACHE BOOL "" )
+
+set( CAMP_DIR ${GEOS_TPL_DIR}/raja CACHE PATH "" )
+set( RAJA_DIR ${GEOS_TPL_DIR}/raja CACHE PATH "" )
+set( UMPIRE_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "" )
+set( CHAI_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "" )
+set( CALIPER_DIR ${GEOS_TPL_DIR}/caliper CACHE PATH "" )
+
+# C++ options
+set( CRAYPE_VERSION "2.7.33")
+set( CMAKE_C_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/cc" CACHE PATH "" )
+set( CMAKE_CXX_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/CC" CACHE PATH "" )
+set( CMAKE_Fortran_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/ftn" CACHE PATH "" )
+
+if( ENABLE_HIP )
+  set( ENABLE_CLANG_HIP ON CACHE BOOL "" FORCE )
+
+  set( HIP_ROOT "/opt/rocm-${HIP_VERSION_STRING}" CACHE PATH "" )
+  set( ROCM_PATH ${HIP_ROOT} CACHE PATH "" )
+
+  set( CMAKE_HIP_ARCHITECTURES "gfx90a" CACHE STRING "" FORCE )
+  set( CMAKE_CXX_FLAGS "-munsafe-fp-atomics -fgpu-rdc" CACHE STRING "" FORCE )
+  set( CMAKE_CXX_LINK_FLAGS "-fgpu-rdc --hip-link" CACHE STRING "" FORCE )
+endif()

From 0d032f89f27de9d5b4077ac24a4cbeaeee983f47 Mon Sep 17 00:00:00 2001
From: "Victor A. P. Magri" <paludettomag1@llnl.gov>
Date: Sat, 14 Dec 2024 19:03:23 -0800
Subject: [PATCH 02/14] tioga-base: enable HIP on hypre by default

---
 host-configs/LLNL/tioga-base.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/host-configs/LLNL/tioga-base.cmake b/host-configs/LLNL/tioga-base.cmake
index 871b7a9f..f9c704da 100644
--- a/host-configs/LLNL/tioga-base.cmake
+++ b/host-configs/LLNL/tioga-base.cmake
@@ -2,6 +2,8 @@ set( CMAKE_CXX_STANDARD 14 CACHE STRING "" )
 
 set( ENABLE_MPI ON CACHE BOOL "" FORCE )
 set( ENABLE_FIND_MPI ON CACHE BOOL "" FORCE )
+set( ENABLE_HYPRE ON CACHE BOOL "" FORCE )
+set( ENABLE_HYPRE_DEVICE "HIP" CACHE STRING "" FORCE )
 
 # HIP Options
 set( ENABLE_HIP ON CACHE BOOL "" FORCE )

From 8121214ab27f2386b20da55deda57514a0965f7e Mon Sep 17 00:00:00 2001
From: "Victor A. P. Magri" <paludettomag1@llnl.gov>
Date: Sat, 14 Dec 2024 19:10:19 -0800
Subject: [PATCH 03/14] tioga-base: force CUDA off

---
 host-configs/LLNL/tioga-base.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/host-configs/LLNL/tioga-base.cmake b/host-configs/LLNL/tioga-base.cmake
index f9c704da..6598fe4c 100644
--- a/host-configs/LLNL/tioga-base.cmake
+++ b/host-configs/LLNL/tioga-base.cmake
@@ -2,6 +2,7 @@ set( CMAKE_CXX_STANDARD 14 CACHE STRING "" )
 
 set( ENABLE_MPI ON CACHE BOOL "" FORCE )
 set( ENABLE_FIND_MPI ON CACHE BOOL "" FORCE )
+set( ENABLE_CUDA OFF CACHE BOOL "" FORCE )
 set( ENABLE_HYPRE ON CACHE BOOL "" FORCE )
 set( ENABLE_HYPRE_DEVICE "HIP" CACHE STRING "" FORCE )
 

From 0f0101946ce6d5698e8ac0bff44714b596af5757 Mon Sep 17 00:00:00 2001
From: "Victor A. P. Magri" <paludettomag1@llnl.gov>
Date: Sat, 14 Dec 2024 19:48:18 -0800
Subject: [PATCH 04/14] Add MPI_INCLUDE_DIR

---
 host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake b/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake
index 7ea00947..d7f9da7e 100644
--- a/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake
+++ b/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake
@@ -18,6 +18,10 @@ set( UMPIRE_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "" )
 set( CHAI_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "" )
 set( CALIPER_DIR ${GEOS_TPL_DIR}/caliper CACHE PATH "" )
 
+# MPI options
+set(MPI_HOME /opt/cray/pe/mpich/8.1.31/ofi/crayclang/18.0 CACHE PATH "")
+set(MPI_INCLUDE_DIR ${MPI_HOME}/include CACHE PATH "") # Needed by hypre
+
 # C++ options
 set( CRAYPE_VERSION "2.7.33")
 set( CMAKE_C_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/cc" CACHE PATH "" )

From 7e624fb182362b719c93d1bfef41261c150a0c04 Mon Sep 17 00:00:00 2001
From: "Victor A. P. Magri" <paludettomag1@llnl.gov>
Date: Sat, 14 Dec 2024 21:03:41 -0800
Subject: [PATCH 05/14] tioga-base -> amdgpu-base

---
 host-configs/LLNL/{tioga-base.cmake => amdgpu-base.cmake} | 0
 host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake           | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename host-configs/LLNL/{tioga-base.cmake => amdgpu-base.cmake} (100%)

diff --git a/host-configs/LLNL/tioga-base.cmake b/host-configs/LLNL/amdgpu-base.cmake
similarity index 100%
rename from host-configs/LLNL/tioga-base.cmake
rename to host-configs/LLNL/amdgpu-base.cmake
diff --git a/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake b/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake
index d7f9da7e..bd1a2974 100644
--- a/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake
+++ b/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake
@@ -1,7 +1,7 @@
 set( CCE_VERSION_STRING "18.0.1" )
 set( HIP_VERSION_STRING "6.2.1" )
 set( CONFIG_NAME "tioga-cce-${CCE_VERSION_STRING}-rocm-${HIP_VERSION_STRING}" CACHE PATH "" )
-include( ${CMAKE_CURRENT_LIST_DIR}/tioga-base.cmake )
+include( ${CMAKE_CURRENT_LIST_DIR}/amdgpu-base.cmake )
 
 # TODO: Set up the tpls
 #set(TPL_INSTALL_DATE 2023-05-17)

From a6d24fcc82f2f7ed6b2e79cad5e9ac8813088732 Mon Sep 17 00:00:00 2001
From: "Victor A. P. Magri" <paludettomag1@llnl.gov>
Date: Sat, 14 Dec 2024 23:41:30 -0800
Subject: [PATCH 06/14] Remove fgpu-rdc

---
 host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake b/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake
index bd1a2974..8a18213b 100644
--- a/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake
+++ b/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake
@@ -35,6 +35,15 @@ if( ENABLE_HIP )
   set( ROCM_PATH ${HIP_ROOT} CACHE PATH "" )
 
   set( CMAKE_HIP_ARCHITECTURES "gfx90a" CACHE STRING "" FORCE )
-  set( CMAKE_CXX_FLAGS "-munsafe-fp-atomics -fgpu-rdc" CACHE STRING "" FORCE )
-  set( CMAKE_CXX_LINK_FLAGS "-fgpu-rdc --hip-link" CACHE STRING "" FORCE )
+  set( CMAKE_CXX_FLAGS "-munsafe-fp-atomics -fno-gpu-rdc" CACHE STRING "" FORCE )
+  set( CMAKE_CXX_LINK_FLAGS "-fno-gpu-rdc --hip-link" CACHE STRING "" FORCE )
+
+  ##############################################################################
+  # The flag "fgpu-rdc" causes link issues when using cce-18
+  # lld: /workspace/llvm/lib/Analysis/LoopAccessAnalysis.cpp:430:
+  #      bool llvm::RuntimeCheckingPtrGroup::addPointer(unsigned int, const llvm::SCEV*, const llvm::SCEV*, unsigned int, bool, llvm::ScalarEvolution&):
+  # Assertion `AddressSpace == AS && "all pointers in a checking group must be in the same address space"' failed.
+  ##############################################################################
+  #set( CMAKE_CXX_FLAGS "-munsafe-fp-atomics -fgpu-rdc" CACHE STRING "" FORCE )
+  #set( CMAKE_CXX_LINK_FLAGS "-fgpu-rdc --hip-link" CACHE STRING "" FORCE )
 endif()

From c0b7da835b04080305a20c114224f0c8710ff983 Mon Sep 17 00:00:00 2001
From: "Victor A. P. Magri" <paludettomag1@llnl.gov>
Date: Wed, 18 Dec 2024 22:44:15 -0800
Subject: [PATCH 07/14] Add tuo host configs

---
 host-configs/LLNL/tuo-base.cmake              | 27 +++++++++++++
 host-configs/LLNL/tuo-cce-18-rocm-6.2.1.cmake | 40 +++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 host-configs/LLNL/tuo-base.cmake
 create mode 100644 host-configs/LLNL/tuo-cce-18-rocm-6.2.1.cmake

diff --git a/host-configs/LLNL/tuo-base.cmake b/host-configs/LLNL/tuo-base.cmake
new file mode 100644
index 00000000..6598fe4c
--- /dev/null
+++ b/host-configs/LLNL/tuo-base.cmake
@@ -0,0 +1,27 @@
+set( CMAKE_CXX_STANDARD 14 CACHE STRING "" )
+
+set( ENABLE_MPI ON CACHE BOOL "" FORCE )
+set( ENABLE_FIND_MPI ON CACHE BOOL "" FORCE )
+set( ENABLE_CUDA OFF CACHE BOOL "" FORCE )
+set( ENABLE_HYPRE ON CACHE BOOL "" FORCE )
+set( ENABLE_HYPRE_DEVICE "HIP" CACHE STRING "" FORCE )
+
+# HIP Options
+set( ENABLE_HIP ON CACHE BOOL "" FORCE )
+
+# suppress -Werror for now
+set( ENABLE_WARNINGS_AS_ERRORS FALSE CACHE BOOL "" FORCE )
+
+# GTEST
+set( ENABLE_GTEST_DEATH_TESTS OFF CACHE BOOL "" )
+set( gtest_disable_pthreads ON CACHE BOOL "" )
+
+# disable most binaries and doc generation
+set( ENABLE_TESTS OFF CACHE BOOL "" FORCE )
+set( DISABLE_UNIT_TESTS ON CACHE BOOL "" FORCE )
+set( ENABLE_EXAMPLES OFF CACHE BOOL "" FORCE )
+set( ENABLE_BENCHMARKS OFF CACHE BOOL "" FORCE )
+set( ENABLE_DOCS OFF CACHE BOOL "" FORCE )
+
+# BLT trying to find MPI fails on cray with cce
+set( ENABLE_FIND_MPI FALSE CACHE BOOL "" )
diff --git a/host-configs/LLNL/tuo-cce-18-rocm-6.2.1.cmake b/host-configs/LLNL/tuo-cce-18-rocm-6.2.1.cmake
new file mode 100644
index 00000000..06f09e36
--- /dev/null
+++ b/host-configs/LLNL/tuo-cce-18-rocm-6.2.1.cmake
@@ -0,0 +1,40 @@
+set( CCE_VERSION_STRING "18.0.1" )
+set( HIP_VERSION_STRING "6.2.1" )
+set( CONFIG_NAME "tuo-cce-${CCE_VERSION_STRING}-rocm-${HIP_VERSION_STRING}" CACHE PATH "" )
+include( ${CMAKE_CURRENT_LIST_DIR}/amdgpu-base.cmake )
+
+# TODO: Set up the tpls
+#set(TPL_INSTALL_DATE 2023-05-17)
+#set(GEOS_TPL_DIR "/usr/WS1/GEOS/GEOSX/TPLs_${TPL_INSTALL_DATE}/install-${CONFIG_NAME}" CACHE PATH "")
+
+set( ENABLE_UMPIRE ON CACHE BOOL "" )
+set( ENABLE_CHAI ON CACHE BOOL "" )
+set( ENABLE_CALIPER ON CACHE BOOL "" )
+set( ENABLE_ADIAK ON CACHE BOOL "" )
+
+set( CAMP_DIR ${GEOS_TPL_DIR}/raja CACHE PATH "" )
+set( RAJA_DIR ${GEOS_TPL_DIR}/raja CACHE PATH "" )
+set( UMPIRE_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "" )
+set( CHAI_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "" )
+set( CALIPER_DIR ${GEOS_TPL_DIR}/caliper CACHE PATH "" )
+
+# MPI options
+set(MPI_HOME /opt/cray/pe/mpich/8.1.31/ofi/crayclang/18.0 CACHE PATH "")
+set(MPI_INCLUDE_DIR ${MPI_HOME}/include CACHE PATH "") # Needed by hypre
+
+# C++ options
+set( CRAYPE_VERSION "2.7.33")
+set( CMAKE_C_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/cc" CACHE PATH "" )
+set( CMAKE_CXX_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/CC" CACHE PATH "" )
+set( CMAKE_Fortran_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/ftn" CACHE PATH "" )
+
+if( ENABLE_HIP )
+  set( ENABLE_CLANG_HIP ON CACHE BOOL "" FORCE )
+
+  set( HIP_ROOT "/opt/rocm-${HIP_VERSION_STRING}" CACHE PATH "" )
+  set( ROCM_PATH ${HIP_ROOT} CACHE PATH "" )
+
+  set( CMAKE_HIP_ARCHITECTURES "gfx942" CACHE STRING "" FORCE )
+  set( CMAKE_CXX_FLAGS "-munsafe-fp-atomics -fno-gpu-rdc" CACHE STRING "" FORCE )
+  set( CMAKE_CXX_LINK_FLAGS "-fno-gpu-rdc --hip-link" CACHE STRING "" FORCE )
+endif()

From d3106866b2b7785bb0b5d6d1cf1a88ebe5364b96 Mon Sep 17 00:00:00 2001
From: "Victor A. P. Magri" <paludettomag1@llnl.gov>
Date: Thu, 8 May 2025 14:03:51 -0700
Subject: [PATCH 08/14] Add tuo-cce-19-rocm-6.4.0 host config

---
 host-configs/LLNL/tuo-cce-19-rocm-6.4.0.cmake | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 host-configs/LLNL/tuo-cce-19-rocm-6.4.0.cmake

diff --git a/host-configs/LLNL/tuo-cce-19-rocm-6.4.0.cmake b/host-configs/LLNL/tuo-cce-19-rocm-6.4.0.cmake
new file mode 100644
index 00000000..53c63253
--- /dev/null
+++ b/host-configs/LLNL/tuo-cce-19-rocm-6.4.0.cmake
@@ -0,0 +1,40 @@
+set( CCE_VERSION_STRING "19.0.0" )
+set( HIP_VERSION_STRING "6.4.0" )
+set( CONFIG_NAME "tuo-cce-${CCE_VERSION_STRING}-rocm-${HIP_VERSION_STRING}" CACHE PATH "" )
+include( ${CMAKE_CURRENT_LIST_DIR}/amdgpu-base.cmake )
+
+# TODO: Set up the tpls
+#set(TPL_INSTALL_DATE 2023-05-17)
+#set(GEOS_TPL_DIR "/usr/WS1/GEOS/GEOSX/TPLs_${TPL_INSTALL_DATE}/install-${CONFIG_NAME}" CACHE PATH "")
+
+set( ENABLE_UMPIRE ON CACHE BOOL "" )
+set( ENABLE_CHAI ON CACHE BOOL "" )
+set( ENABLE_CALIPER ON CACHE BOOL "" )
+set( ENABLE_ADIAK ON CACHE BOOL "" )
+
+set( CAMP_DIR ${GEOS_TPL_DIR}/raja CACHE PATH "" )
+set( RAJA_DIR ${GEOS_TPL_DIR}/raja CACHE PATH "" )
+set( UMPIRE_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "" )
+set( CHAI_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "" )
+set( CALIPER_DIR ${GEOS_TPL_DIR}/caliper CACHE PATH "" )
+
+# MPI options
+set(MPI_HOME /opt/cray/pe/mpich/8.1.32/ofi/crayclang/18.0 CACHE PATH "")
+set(MPI_INCLUDE_DIR ${MPI_HOME}/include CACHE PATH "") # Needed by hypre
+
+# C++ options
+set( CRAYPE_VERSION "2.7.34")
+set( CMAKE_C_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/cc" CACHE PATH "" )
+set( CMAKE_CXX_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/CC" CACHE PATH "" )
+set( CMAKE_Fortran_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/ftn" CACHE PATH "" )
+
+if( ENABLE_HIP )
+  set( ENABLE_CLANG_HIP ON CACHE BOOL "" FORCE )
+
+  set( HIP_ROOT "/opt/rocm-${HIP_VERSION_STRING}" CACHE PATH "" )
+  set( ROCM_PATH ${HIP_ROOT} CACHE PATH "" )
+
+  set( CMAKE_HIP_ARCHITECTURES "gfx942" CACHE STRING "" FORCE )
+  set( CMAKE_CXX_FLAGS "-munsafe-fp-atomics -fno-gpu-rdc" CACHE STRING "" FORCE )
+  set( CMAKE_CXX_LINK_FLAGS "-fno-gpu-rdc --hip-link" CACHE STRING "" FORCE )
+endif()

From 404f1d79a01f29d42a153223b9b23c06236c743f Mon Sep 17 00:00:00 2001
From: "Victor A. P. Magri" <paludettomag1@llnl.gov>
Date: Sat, 31 May 2025 11:41:19 -0700
Subject: [PATCH 09/14] Add matrix host configs

---
 host-configs/LLNL/matrix-cuda-12-base.cmake   | 16 ++++++++++++++++
 host-configs/LLNL/matrix-gcc-12-cuda-12.cmake | 13 +++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 host-configs/LLNL/matrix-cuda-12-base.cmake
 create mode 100644 host-configs/LLNL/matrix-gcc-12-cuda-12.cmake

diff --git a/host-configs/LLNL/matrix-cuda-12-base.cmake b/host-configs/LLNL/matrix-cuda-12-base.cmake
new file mode 100644
index 00000000..d614ed05
--- /dev/null
+++ b/host-configs/LLNL/matrix-cuda-12-base.cmake
@@ -0,0 +1,16 @@
+include(${CMAKE_CURRENT_LIST_DIR}/lassen-base.cmake)
+
+# Cuda options
+set(ENABLE_CUDA ON CACHE BOOL "")
+set(CUDA_TOOLKIT_ROOT_DIR /usr/tce/packages/cuda/cuda-12.2.2 CACHE STRING "")
+set(CMAKE_CUDA_HOST_COMPILER ${CMAKE_CXX_COMPILER} CACHE STRING "")
+set(CMAKE_CUDA_COMPILER ${CUDA_TOOLKIT_ROOT_DIR}/bin/nvcc CACHE STRING "")
+set(CUDA_ARCH sm_90 CACHE STRING "")
+set(CMAKE_CUDA_ARCHITECTURES 90 CACHE STRING "")
+set(CMAKE_CUDA_STANDARD 17 CACHE STRING "")
+set(CMAKE_CUDA_FLAGS "-restrict -arch ${CUDA_ARCH} --expt-extended-lambda -Werror cross-execution-space-call,reorder,deprecated-declarations" CACHE STRING "")
+set(CMAKE_CUDA_FLAGS_RELEASE "-O3 -DNDEBUG -Xcompiler -DNDEBUG -Xcompiler -O3 " CACHE STRING "")
+set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -Xcompiler -DNDEBUG -Xcompiler -O3 -Xcompiler -g " CACHE STRING "")
+set(CMAKE_CUDA_FLAGS_DEBUG "-g -G -O0 -Xcompiler -O0" CACHE STRING "")
+
+set(CHAI_CUDA_FLAGS "-arch ${CUDA_ARCH}" CACHE STRING "" FORCE)
diff --git a/host-configs/LLNL/matrix-gcc-12-cuda-12.cmake b/host-configs/LLNL/matrix-gcc-12-cuda-12.cmake
new file mode 100644
index 00000000..048acd08
--- /dev/null
+++ b/host-configs/LLNL/matrix-gcc-12-cuda-12.cmake
@@ -0,0 +1,13 @@
+set(CONFIG_NAME "matrix-gcc-12-cuda-12" CACHE PATH "")
+
+# Set compiler info
+set(COMPILER_DIR /usr/tce/packages/gcc/gcc-12.1.1)
+set(CMAKE_C_COMPILER ${COMPILER_DIR}/bin/gcc CACHE PATH "")
+set(CMAKE_CXX_COMPILER ${COMPILER_DIR}/bin/g++ CACHE PATH "")
+
+# C++ options
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG" CACHE STRING "")
+set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "")
+
+include(${CMAKE_CURRENT_LIST_DIR}/matrix-cuda-12-base.cmake)

From dd4369378b9f5c3a500da2f6202d551238727ff7 Mon Sep 17 00:00:00 2001
From: "Victor A. P. Magri" <paludettomag1@llnl.gov>
Date: Sun, 1 Jun 2025 00:08:03 -0400
Subject: [PATCH 10/14] Fix CXX std 14 -> 17

---
 host-configs/LLNL/amdgpu-base.cmake |  2 +-
 host-configs/LLNL/tuo-base.cmake    | 27 ---------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 host-configs/LLNL/tuo-base.cmake

diff --git a/host-configs/LLNL/amdgpu-base.cmake b/host-configs/LLNL/amdgpu-base.cmake
index 6598fe4c..a88fd0db 100644
--- a/host-configs/LLNL/amdgpu-base.cmake
+++ b/host-configs/LLNL/amdgpu-base.cmake
@@ -1,4 +1,4 @@
-set( CMAKE_CXX_STANDARD 14 CACHE STRING "" )
+set( CMAKE_CXX_STANDARD 17 CACHE STRING "" )
 
 set( ENABLE_MPI ON CACHE BOOL "" FORCE )
 set( ENABLE_FIND_MPI ON CACHE BOOL "" FORCE )
diff --git a/host-configs/LLNL/tuo-base.cmake b/host-configs/LLNL/tuo-base.cmake
deleted file mode 100644
index 6598fe4c..00000000
--- a/host-configs/LLNL/tuo-base.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-set( CMAKE_CXX_STANDARD 14 CACHE STRING "" )
-
-set( ENABLE_MPI ON CACHE BOOL "" FORCE )
-set( ENABLE_FIND_MPI ON CACHE BOOL "" FORCE )
-set( ENABLE_CUDA OFF CACHE BOOL "" FORCE )
-set( ENABLE_HYPRE ON CACHE BOOL "" FORCE )
-set( ENABLE_HYPRE_DEVICE "HIP" CACHE STRING "" FORCE )
-
-# HIP Options
-set( ENABLE_HIP ON CACHE BOOL "" FORCE )
-
-# suppress -Werror for now
-set( ENABLE_WARNINGS_AS_ERRORS FALSE CACHE BOOL "" FORCE )
-
-# GTEST
-set( ENABLE_GTEST_DEATH_TESTS OFF CACHE BOOL "" )
-set( gtest_disable_pthreads ON CACHE BOOL "" )
-
-# disable most binaries and doc generation
-set( ENABLE_TESTS OFF CACHE BOOL "" FORCE )
-set( DISABLE_UNIT_TESTS ON CACHE BOOL "" FORCE )
-set( ENABLE_EXAMPLES OFF CACHE BOOL "" FORCE )
-set( ENABLE_BENCHMARKS OFF CACHE BOOL "" FORCE )
-set( ENABLE_DOCS OFF CACHE BOOL "" FORCE )
-
-# BLT trying to find MPI fails on cray with cce
-set( ENABLE_FIND_MPI FALSE CACHE BOOL "" )

From 5ef6481f204b735a97bc788c57bddd39d2b25eb8 Mon Sep 17 00:00:00 2001
From: "Victor A. P. Magri" <paludettomag1@llnl.gov>
Date: Mon, 2 Jun 2025 00:57:55 -0400
Subject: [PATCH 11/14] Update HCs

---
 .../LLNL/tioga-cce-18-rocm-6.2.1.cmake        | 11 ++----
 .../LLNL/tioga-cce-19-rocm-6.4.0.cmake        | 37 +++++++++++++++++++
 host-configs/LLNL/tuo-cce-18-rocm-6.2.1.cmake | 13 +++----
 host-configs/LLNL/tuo-cce-19-rocm-6.4.0.cmake | 13 +++----
 4 files changed, 51 insertions(+), 23 deletions(-)
 create mode 100644 host-configs/LLNL/tioga-cce-19-rocm-6.4.0.cmake

diff --git a/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake b/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake
index 8a18213b..2636f0fd 100644
--- a/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake
+++ b/host-configs/LLNL/tioga-cce-18-rocm-6.2.1.cmake
@@ -4,9 +4,6 @@ set( CONFIG_NAME "tioga-cce-${CCE_VERSION_STRING}-rocm-${HIP_VERSION_STRING}" CA
 include( ${CMAKE_CURRENT_LIST_DIR}/amdgpu-base.cmake )
 
 # TODO: Set up the tpls
-#set(TPL_INSTALL_DATE 2023-05-17)
-#set(GEOS_TPL_DIR "/usr/WS1/GEOS/GEOSX/TPLs_${TPL_INSTALL_DATE}/install-${CONFIG_NAME}" CACHE PATH "")
-
 set( ENABLE_UMPIRE ON CACHE BOOL "" )
 set( ENABLE_CHAI ON CACHE BOOL "" )
 set( ENABLE_CALIPER ON CACHE BOOL "" )
@@ -19,8 +16,8 @@ set( CHAI_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "" )
 set( CALIPER_DIR ${GEOS_TPL_DIR}/caliper CACHE PATH "" )
 
 # MPI options
-set(MPI_HOME /opt/cray/pe/mpich/8.1.31/ofi/crayclang/18.0 CACHE PATH "")
-set(MPI_INCLUDE_DIR ${MPI_HOME}/include CACHE PATH "") # Needed by hypre
+set( MPI_HOME /opt/cray/pe/mpich/8.1.31/ofi/crayclang/18.0 CACHE PATH "" )
+set( MPI_INCLUDE_DIR ${MPI_HOME}/include CACHE PATH "" ) # Needed by hypre
 
 # C++ options
 set( CRAYPE_VERSION "2.7.33")
@@ -35,8 +32,8 @@ if( ENABLE_HIP )
   set( ROCM_PATH ${HIP_ROOT} CACHE PATH "" )
 
   set( CMAKE_HIP_ARCHITECTURES "gfx90a" CACHE STRING "" FORCE )
-  set( CMAKE_CXX_FLAGS "-munsafe-fp-atomics -fno-gpu-rdc" CACHE STRING "" FORCE )
-  set( CMAKE_CXX_LINK_FLAGS "-fno-gpu-rdc --hip-link" CACHE STRING "" FORCE )
+  set( CMAKE_HIP_FLAGS "-munsafe-fp-atomics -fno-gpu-rdc" CACHE STRING "" FORCE )
+  set( CMAKE_HIP_LINK_FLAGS "-fno-gpu-rdc --hip-link -Wl,--allow-shlib-undefined" CACHE STRING "" FORCE )
 
   ##############################################################################
   # The flag "fgpu-rdc" causes link issues when using cce-18
diff --git a/host-configs/LLNL/tioga-cce-19-rocm-6.4.0.cmake b/host-configs/LLNL/tioga-cce-19-rocm-6.4.0.cmake
new file mode 100644
index 00000000..ac08db08
--- /dev/null
+++ b/host-configs/LLNL/tioga-cce-19-rocm-6.4.0.cmake
@@ -0,0 +1,37 @@
+set( CCE_VERSION_STRING "19.0.0" )
+set( HIP_VERSION_STRING "6.4.0" )
+set( CONFIG_NAME "tioga-cce-${CCE_VERSION_STRING}-rocm-${HIP_VERSION_STRING}" CACHE PATH "" )
+include( ${CMAKE_CURRENT_LIST_DIR}/amdgpu-base.cmake )
+
+# TODO: Set up GEOS_TPL_DIR
+set( ENABLE_UMPIRE ON CACHE BOOL "" )
+set( ENABLE_CHAI ON CACHE BOOL "" )
+set( ENABLE_CALIPER ON CACHE BOOL "" )
+set( ENABLE_ADIAK ON CACHE BOOL "" )
+
+set( CAMP_DIR ${GEOS_TPL_DIR}/raja CACHE PATH "" )
+set( RAJA_DIR ${GEOS_TPL_DIR}/raja CACHE PATH "" )
+set( UMPIRE_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "" )
+set( CHAI_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "" )
+set( CALIPER_DIR ${GEOS_TPL_DIR}/caliper CACHE PATH "" )
+
+# MPI options
+set( MPI_HOME /opt/cray/pe/mpich/8.1.33.1/ofi/crayclang/18.0 CACHE PATH "" )
+set( MPI_INCLUDE_DIR ${MPI_HOME}/include CACHE PATH "" ) # Needed by hypre
+
+# C++ options
+set( CRAYPE_VERSION "2.7.34")
+set( CMAKE_C_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/cc" CACHE PATH "" )
+set( CMAKE_CXX_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/CC" CACHE PATH "" )
+set( CMAKE_Fortran_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/ftn" CACHE PATH "" )
+
+if( ENABLE_HIP )
+  set( ENABLE_CLANG_HIP ON CACHE BOOL "" FORCE )
+
+  set( HIP_ROOT "/opt/rocm-${HIP_VERSION_STRING}" CACHE PATH "" )
+  set( ROCM_PATH ${HIP_ROOT} CACHE PATH "" )
+
+  set( CMAKE_HIP_ARCHITECTURES "gfx90a" CACHE STRING "" FORCE )
+  set( CMAKE_HIP_FLAGS "-munsafe-fp-atomics -fno-gpu-rdc" CACHE STRING "" FORCE )
+  set( CMAKE_HIP_LINK_FLAGS "-fno-gpu-rdc --hip-link -Wl,--allow-shlib-undefined" CACHE STRING "" FORCE )
+endif()
diff --git a/host-configs/LLNL/tuo-cce-18-rocm-6.2.1.cmake b/host-configs/LLNL/tuo-cce-18-rocm-6.2.1.cmake
index 06f09e36..18201010 100644
--- a/host-configs/LLNL/tuo-cce-18-rocm-6.2.1.cmake
+++ b/host-configs/LLNL/tuo-cce-18-rocm-6.2.1.cmake
@@ -3,10 +3,7 @@ set( HIP_VERSION_STRING "6.2.1" )
 set( CONFIG_NAME "tuo-cce-${CCE_VERSION_STRING}-rocm-${HIP_VERSION_STRING}" CACHE PATH "" )
 include( ${CMAKE_CURRENT_LIST_DIR}/amdgpu-base.cmake )
 
-# TODO: Set up the tpls
-#set(TPL_INSTALL_DATE 2023-05-17)
-#set(GEOS_TPL_DIR "/usr/WS1/GEOS/GEOSX/TPLs_${TPL_INSTALL_DATE}/install-${CONFIG_NAME}" CACHE PATH "")
-
+# TODO: Set up GEOS_TPL_DIR
 set( ENABLE_UMPIRE ON CACHE BOOL "" )
 set( ENABLE_CHAI ON CACHE BOOL "" )
 set( ENABLE_CALIPER ON CACHE BOOL "" )
@@ -19,8 +16,8 @@ set( CHAI_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "" )
 set( CALIPER_DIR ${GEOS_TPL_DIR}/caliper CACHE PATH "" )
 
 # MPI options
-set(MPI_HOME /opt/cray/pe/mpich/8.1.31/ofi/crayclang/18.0 CACHE PATH "")
-set(MPI_INCLUDE_DIR ${MPI_HOME}/include CACHE PATH "") # Needed by hypre
+set( MPI_HOME /opt/cray/pe/mpich/8.1.31/ofi/crayclang/18.0 CACHE PATH "" )
+set( MPI_INCLUDE_DIR ${MPI_HOME}/include CACHE PATH "" ) # Needed by hypre
 
 # C++ options
 set( CRAYPE_VERSION "2.7.33")
@@ -35,6 +32,6 @@ if( ENABLE_HIP )
   set( ROCM_PATH ${HIP_ROOT} CACHE PATH "" )
 
   set( CMAKE_HIP_ARCHITECTURES "gfx942" CACHE STRING "" FORCE )
-  set( CMAKE_CXX_FLAGS "-munsafe-fp-atomics -fno-gpu-rdc" CACHE STRING "" FORCE )
-  set( CMAKE_CXX_LINK_FLAGS "-fno-gpu-rdc --hip-link" CACHE STRING "" FORCE )
+  set( CMAKE_HIP_FLAGS "-munsafe-fp-atomics -fno-gpu-rdc" CACHE STRING "" FORCE )
+  set( CMAKE_HIP_LINK_FLAGS "-fno-gpu-rdc --hip-link -Wl,--allow-shlib-undefined" CACHE STRING "" FORCE )
 endif()
diff --git a/host-configs/LLNL/tuo-cce-19-rocm-6.4.0.cmake b/host-configs/LLNL/tuo-cce-19-rocm-6.4.0.cmake
index 53c63253..a12e7a76 100644
--- a/host-configs/LLNL/tuo-cce-19-rocm-6.4.0.cmake
+++ b/host-configs/LLNL/tuo-cce-19-rocm-6.4.0.cmake
@@ -3,10 +3,7 @@ set( HIP_VERSION_STRING "6.4.0" )
 set( CONFIG_NAME "tuo-cce-${CCE_VERSION_STRING}-rocm-${HIP_VERSION_STRING}" CACHE PATH "" )
 include( ${CMAKE_CURRENT_LIST_DIR}/amdgpu-base.cmake )
 
-# TODO: Set up the tpls
-#set(TPL_INSTALL_DATE 2023-05-17)
-#set(GEOS_TPL_DIR "/usr/WS1/GEOS/GEOSX/TPLs_${TPL_INSTALL_DATE}/install-${CONFIG_NAME}" CACHE PATH "")
-
+# TODO: Set up GEOS_TPL_DIR
 set( ENABLE_UMPIRE ON CACHE BOOL "" )
 set( ENABLE_CHAI ON CACHE BOOL "" )
 set( ENABLE_CALIPER ON CACHE BOOL "" )
@@ -19,8 +16,8 @@ set( CHAI_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "" )
 set( CALIPER_DIR ${GEOS_TPL_DIR}/caliper CACHE PATH "" )
 
 # MPI options
-set(MPI_HOME /opt/cray/pe/mpich/8.1.32/ofi/crayclang/18.0 CACHE PATH "")
-set(MPI_INCLUDE_DIR ${MPI_HOME}/include CACHE PATH "") # Needed by hypre
+set( MPI_HOME /opt/cray/pe/mpich/8.1.33.1/ofi/crayclang/18.0 CACHE PATH "" )
+set( MPI_INCLUDE_DIR ${MPI_HOME}/include CACHE PATH "" ) # Needed by hypre
 
 # C++ options
 set( CRAYPE_VERSION "2.7.34")
@@ -35,6 +32,6 @@ if( ENABLE_HIP )
   set( ROCM_PATH ${HIP_ROOT} CACHE PATH "" )
 
   set( CMAKE_HIP_ARCHITECTURES "gfx942" CACHE STRING "" FORCE )
-  set( CMAKE_CXX_FLAGS "-munsafe-fp-atomics -fno-gpu-rdc" CACHE STRING "" FORCE )
-  set( CMAKE_CXX_LINK_FLAGS "-fno-gpu-rdc --hip-link" CACHE STRING "" FORCE )
+  set( CMAKE_HIP_FLAGS "-munsafe-fp-atomics -fno-gpu-rdc" CACHE STRING "" FORCE )
+  set( CMAKE_HIP_LINK_FLAGS "-fno-gpu-rdc --hip-link -Wl,--allow-shlib-undefined" CACHE STRING "" FORCE )
 endif()

From 71ce0db51605a37681a3f3b76efcac067014f487 Mon Sep 17 00:00:00 2001
From: "Victor A. P. Magri" <paludettomag1@llnl.gov>
Date: Mon, 2 Jun 2025 12:34:10 -0700
Subject: [PATCH 12/14] Fix HCs

---
 host-configs/LLNL/amdgpu-base.cmake             | 4 ++--
 host-configs/LLNL/tioga-cce-19-rocm-6.4.0.cmake | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/host-configs/LLNL/amdgpu-base.cmake b/host-configs/LLNL/amdgpu-base.cmake
index a88fd0db..9e1b1db8 100644
--- a/host-configs/LLNL/amdgpu-base.cmake
+++ b/host-configs/LLNL/amdgpu-base.cmake
@@ -1,7 +1,7 @@
 set( CMAKE_CXX_STANDARD 17 CACHE STRING "" )
 
 set( ENABLE_MPI ON CACHE BOOL "" FORCE )
-set( ENABLE_FIND_MPI ON CACHE BOOL "" FORCE )
+#set( ENABLE_FIND_MPI ON CACHE BOOL "" FORCE )
 set( ENABLE_CUDA OFF CACHE BOOL "" FORCE )
 set( ENABLE_HYPRE ON CACHE BOOL "" FORCE )
 set( ENABLE_HYPRE_DEVICE "HIP" CACHE STRING "" FORCE )
@@ -24,4 +24,4 @@ set( ENABLE_BENCHMARKS OFF CACHE BOOL "" FORCE )
 set( ENABLE_DOCS OFF CACHE BOOL "" FORCE )
 
 # BLT trying to find MPI fails on cray with cce
-set( ENABLE_FIND_MPI FALSE CACHE BOOL "" )
+set( ENABLE_FIND_MPI OFF CACHE BOOL "" )
diff --git a/host-configs/LLNL/tioga-cce-19-rocm-6.4.0.cmake b/host-configs/LLNL/tioga-cce-19-rocm-6.4.0.cmake
index ac08db08..2cc283b0 100644
--- a/host-configs/LLNL/tioga-cce-19-rocm-6.4.0.cmake
+++ b/host-configs/LLNL/tioga-cce-19-rocm-6.4.0.cmake
@@ -29,9 +29,10 @@ if( ENABLE_HIP )
   set( ENABLE_CLANG_HIP ON CACHE BOOL "" FORCE )
 
   set( HIP_ROOT "/opt/rocm-${HIP_VERSION_STRING}" CACHE PATH "" )
+  set( HIP_ROOT_DIR ${HIP_ROOT} CACHE PATH "" )
   set( ROCM_PATH ${HIP_ROOT} CACHE PATH "" )
 
   set( CMAKE_HIP_ARCHITECTURES "gfx90a" CACHE STRING "" FORCE )
-  set( CMAKE_HIP_FLAGS "-munsafe-fp-atomics -fno-gpu-rdc" CACHE STRING "" FORCE )
+  set( CMAKE_HIP_FLAGS "-munsafe-fp-atomics -fno-gpu-rdc -I${MPI_INCLUDE_DIR}" CACHE STRING "" FORCE )
   set( CMAKE_HIP_LINK_FLAGS "-fno-gpu-rdc --hip-link -Wl,--allow-shlib-undefined" CACHE STRING "" FORCE )
 endif()

From 8cf92d5995ece52c6982b65e001ff8e0177301bd Mon Sep 17 00:00:00 2001
From: "Victor A. P. Magri" <paludettomag1@llnl.gov>
Date: Mon, 2 Jun 2025 14:10:29 -0700
Subject: [PATCH 13/14] Fix tuo HC

---
 host-configs/LLNL/tuo-cce-19-rocm-6.4.0.cmake | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/host-configs/LLNL/tuo-cce-19-rocm-6.4.0.cmake b/host-configs/LLNL/tuo-cce-19-rocm-6.4.0.cmake
index a12e7a76..e7fca85a 100644
--- a/host-configs/LLNL/tuo-cce-19-rocm-6.4.0.cmake
+++ b/host-configs/LLNL/tuo-cce-19-rocm-6.4.0.cmake
@@ -15,23 +15,27 @@ set( UMPIRE_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "" )
 set( CHAI_DIR ${GEOS_TPL_DIR}/chai CACHE PATH "" )
 set( CALIPER_DIR ${GEOS_TPL_DIR}/caliper CACHE PATH "" )
 
-# MPI options
-set( MPI_HOME /opt/cray/pe/mpich/8.1.33.1/ofi/crayclang/18.0 CACHE PATH "" )
-set( MPI_INCLUDE_DIR ${MPI_HOME}/include CACHE PATH "" ) # Needed by hypre
-
 # C++ options
 set( CRAYPE_VERSION "2.7.34")
 set( CMAKE_C_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/cc" CACHE PATH "" )
 set( CMAKE_CXX_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/CC" CACHE PATH "" )
 set( CMAKE_Fortran_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/ftn" CACHE PATH "" )
 
+# MPI options
+set( MPI_HOME /opt/cray/pe/mpich/8.1.33.1/ofi/crayclang/18.0 CACHE PATH "" )
+set( MPI_C_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/cc" CACHE PATH "" )
+set( MPI_CXX_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/CC" CACHE PATH "" )
+set( MPI_Fortran_COMPILER "/opt/cray/pe/craype/${CRAYPE_VERSION}/bin/ftn" CACHE PATH "" )
+set( MPI_INCLUDE_DIR ${MPI_HOME}/include CACHE PATH "" ) # Needed by hypre
+
 if( ENABLE_HIP )
   set( ENABLE_CLANG_HIP ON CACHE BOOL "" FORCE )
 
   set( HIP_ROOT "/opt/rocm-${HIP_VERSION_STRING}" CACHE PATH "" )
+  set( HIP_ROOT_DIR ${HIP_ROOT} CACHE PATH "" )
   set( ROCM_PATH ${HIP_ROOT} CACHE PATH "" )
 
   set( CMAKE_HIP_ARCHITECTURES "gfx942" CACHE STRING "" FORCE )
-  set( CMAKE_HIP_FLAGS "-munsafe-fp-atomics -fno-gpu-rdc" CACHE STRING "" FORCE )
+  set( CMAKE_HIP_FLAGS "-munsafe-fp-atomics -fno-gpu-rdc -I${MPI_INCLUDE_DIR}" CACHE STRING "" FORCE )
   set( CMAKE_HIP_LINK_FLAGS "-fno-gpu-rdc --hip-link -Wl,--allow-shlib-undefined" CACHE STRING "" FORCE )
 endif()

From d2bcd13149d2291c9b4a507b9f5a4cdc4a8806e2 Mon Sep 17 00:00:00 2001
From: "Victor A. P. Magri" <paludettomag1@llnl.gov>
Date: Mon, 2 Jun 2025 14:10:56 -0700
Subject: [PATCH 14/14] Enabling back ENABLE_FIND_MPI

---
 host-configs/LLNL/amdgpu-base.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/host-configs/LLNL/amdgpu-base.cmake b/host-configs/LLNL/amdgpu-base.cmake
index 9e1b1db8..1aee82cd 100644
--- a/host-configs/LLNL/amdgpu-base.cmake
+++ b/host-configs/LLNL/amdgpu-base.cmake
@@ -24,4 +24,4 @@ set( ENABLE_BENCHMARKS OFF CACHE BOOL "" FORCE )
 set( ENABLE_DOCS OFF CACHE BOOL "" FORCE )
 
 # BLT trying to find MPI fails on cray with cce
-set( ENABLE_FIND_MPI OFF CACHE BOOL "" )
+#set( ENABLE_FIND_MPI OFF CACHE BOOL "" )