Fix Chicoma build & bump Parthenon to Kokkos 4.2

AFD-Illinois · Nov 30, 2023 · 556eab5 · 556eab5
1 parent 712de12
commit 556eab5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git 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
diff --git 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
@@ -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