From 556eab5cf67642a726192f6b07fe01af77c0ac0e Mon Sep 17 00:00:00 2001
From: Ben Prather <bprathr2@illinois.edu>
Date: Thu, 30 Nov 2023 16:02:47 -0700
Subject: [PATCH] Fix Chicoma build & bump Parthenon to Kokkos 4.2

---
 external/kokkos-kernels/KokkosBatched_Dot_Internal.hpp |  2 ++
 external/parthenon                                     |  2 +-
 machines/chicoma.sh                                    | 10 ++++++++--
 make.sh                                                |  2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/external/kokkos-kernels/KokkosBatched_Dot_Internal.hpp b/external/kokkos-kernels/KokkosBatched_Dot_Internal.hpp
index e7374341..9552fa06 100644
--- a/external/kokkos-kernels/KokkosBatched_Dot_Internal.hpp
+++ b/external/kokkos-kernels/KokkosBatched_Dot_Internal.hpp
@@ -5,6 +5,8 @@
 
 #include "KokkosBatched_Util.hpp"
 
+#define KOKKOS_IMPL_DO_NOT_USE_PRINTF(...) ::printf(__VA_ARGS__)
+
 namespace KokkosBatched {
 
 ///
diff --git a/external/parthenon b/external/parthenon
index 14d41123..994df614 160000
--- a/external/parthenon
+++ b/external/parthenon
@@ -1 +1 @@
-Subproject commit 14d411239eea0476e0ea1b8f099752a8eab1758a
+Subproject commit 994df614305325331cdef57f8fea57e9ac6b8a0a
diff --git a/machines/chicoma.sh b/machines/chicoma.sh
index 3efe4e61..7e01fd52 100644
--- a/machines/chicoma.sh
+++ b/machines/chicoma.sh
@@ -32,10 +32,16 @@ if [[ "$HOST" == "ch-fe"* || "$HOST" == "nid00"* ]]; then
   else
     module load PrgEnv-aocc
   fi
-  module load cray-hdf5-parallel cmake
+  # Use your own HDF5, Chicoma's is old
+  #module load cray-hdf5-parallel
+  module load cmake
   # System HDF5 can't use compression
   EXTRA_FLAGS="-DPARTHENON_DISABLE_HDF5_COMPRESSION=ON $EXTRA_FLAGS"
-  export MPICH_GPU_SUPPORT_ENABLED=1
+  # Parthenon crashes with device buffers on some Nvidia machines...
+  # if [conditions]
+  EXTRA_FLAGS="-DPARTHENON_ENABLE_HOST_COMM_BUFFERS=ON $EXTRA_FLAGS"
+  #else
+  #export MPICH_GPU_SUPPORT_ENABLED=1
 
   # Runtime opts
   MPI_EXE=srun
diff --git a/make.sh b/make.sh
index 7931fa68..71b241fa 100755
--- a/make.sh
+++ b/make.sh
@@ -217,7 +217,7 @@ fi
 
 ### Build HDF5 ###
 # If we're building HDF5, do it after we set *all flags*
-if [[ "$ARGS" == *"hdf5"* && "$ARGS" == *"clean"* ]]; then
+if [[ "$ARGS" == *"hdf5"* && "$ARGS" == *"clean"* && "$ARGS" != *"dryrun"* ]]; then
   H5VER=1.14.2
   H5VERU=1_14_2
   cd external