Fix build w/NVHPC on Chicoma

machines/chicoma.sh

@@ -11,10 +11,8 @@ if [[ "$HOST" == "ch-fe"* || "$HOST" == "nid00"* ]]; then
   export CRAY_CPU_TARGET="x86-64"
   if [[ "$ARGS" == *"cuda"* ]]; then
     DEVICE_ARCH="AMPERE80"
-    # Runtime
-    MPI_NUM_PROCS=4
     if [[ "$ARGS" == *"gnu"* ]]; then
-      module load PrgEnv-gnu cpe-cuda cuda
+      module load PrgEnv-gnu
     elif [[ "$ARGS" == *"intel"* ]]; then
       module load PrgEnv-intel
     elif [[ "$ARGS" == *"nvc++"* ]]; then
@@ -23,9 +21,10 @@ if [[ "$HOST" == "ch-fe"* || "$HOST" == "nid00"* ]]; then
     else
       module load PrgEnv-nvhpc
     fi
+    module load cpe-cuda cuda craype-accel-nvidia80
     # GPU runtime opts
     MPI_NUM_PROCS=4
-    MPI_EXTRA_ARGS="--cpu-bind=mask_cpu:0x0*16,0x1*16,0x2*16,0x3*16 $SOURCE_DIR/bin/select-gpu"
+    MPI_EXTRA_ARGS="--cpu-bind=mask_cpu:0x0*16,0x1*16,0x2*16,0x3*16 $SOURCE_DIR/bin/select_gpu_chicoma"
     unset OMP_NUM_THREADS
     unset OMP_PROC_BIND
     unset OMP_PLACES
@@ -35,6 +34,7 @@ if [[ "$HOST" == "ch-fe"* || "$HOST" == "nid00"* ]]; then
   module load cray-hdf5-parallel cmake
   # System HDF5 can't use compression
   EXTRA_FLAGS="-DPARTHENON_DISABLE_HDF5_COMPRESSION=ON $EXTRA_FLAGS"
+  export MPICH_GPU_SUPPORT_ENABLED=1
 
   # Runtime opts
   MPI_EXE=srun

run.sh

@@ -50,6 +50,7 @@ fi
 # Load environment from the same files as the compile process
 HOST=$(hostname -f)
 ARGS=$(cat $KHARMA_DIR/make_args)
+SOURCE_DIR=$(dirname "$(readlink -f "$0")")
 for machine in $KHARMA_DIR/machines/*.sh
 do
   source $machine