From 466b219bbd314499a8fdb7aee881e74c7f4ede98 Mon Sep 17 00:00:00 2001
From: Mike VandenBoom <m.vandenboom@ufl.edu>
Date: Thu, 15 Jan 2026 17:19:20 -0500
Subject: [PATCH] This change will fix configuration issues on HiperGator

---
 toolchain/modules                   | 16 ++++++++--------
 toolchain/templates/hipergator.mako |  5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/toolchain/modules b/toolchain/modules
index 69757c3c03..b5d551cd0d 100644
--- a/toolchain/modules
+++ b/toolchain/modules
@@ -83,11 +83,11 @@ san-all cmake python
 san-gpu nvhpc cuda cray-mpich
 
 h     hipergator
-h-gpu nvhpc/25.9
-h-gpu CUDA_HOME="/apps/compilers/cuda/12.8.1"
-h-all HPC_OMPI_DIR="/apps/mpi/cuda/12.8.1/nvhpc/25.3/openmpi/5.0.7"
-h-all HPC_OMPI_BIN="/apps/mpi/cuda/12.8.1/nvhpc/25.3/openmpi/5.0.7/bin"
-h-all OMPI_MCA_pml=ob1 OMPI_MCA_coll_hcoll_enable=0
-h-gpu PATH="/apps/mpi/cuda/12.8.1/nvhpc/25.3/openmpi/5.0.7/bin:${PATH}"
-h-all LD_LIBRARY_PATH=/apps/compilers/cuda/12.8.1/lib64:$LD_LIBRARY_PATH
-h-gpu MFC_CUDA_CC=100 NVHPC_CUDA_HOME="/apps/compilers/cuda/12.8.1"
+h-all python/3.12
+h-cpu gcc/14.2 openmpi/5.0.7
+h-gpu UCX_NET_DEVICES="mlx5_4:1,mlx5_7:1,mlx5_8:1,mlx5_9:1,mlx5_10:1,mlx5_13:1,mlx5_14:1,mlx5_15:1"
+h-gpu cuda/12.9.1 nvhpc/25.9 openmpi/5.0.7
+h-gpu CC=/apps/compilers/nvhpc/25.9/Linux_x86_64/25.9/comm_libs/mpi/bin/mpicc 
+h-gpu CXX=/apps/compilers/nvhpc/25.9/Linux_x86_64/25.9/comm_libs/mpi/bin/mpicxx
+h-gpu FC=/apps/compilers/nvhpc/25.9/Linux_x86_64/25.9/comm_libs/mpi/bin/mpifort
+h-gpu NVCOMPILER_COMM_LIBS_HOME=/apps/compilers/nvhpc/25.9/Linux_x86_64/25.9/comm_libs/12.9
diff --git a/toolchain/templates/hipergator.mako b/toolchain/templates/hipergator.mako
index 89a40308e9..b8c21ebf5d 100644
--- a/toolchain/templates/hipergator.mako
+++ b/toolchain/templates/hipergator.mako
@@ -8,10 +8,11 @@
 #SBATCH --job-name="${name}"
 #SBATCH --output="${name}.out"
 #SBATCH --time=${walltime}
-#SBATCH --cpus-per-task=7
 % if gpu_enabled:
 #SBATCH --gpus-per-task=1
+#SBATCH --cpus-per-task=3
 #SBATCH --gpu-bind=closest
+#SBATCH --mem-per-cpu=50GB
 % endif
 % if account:
 #SBATCH --account=${account}
@@ -48,7 +49,7 @@ echo
         (set -x; ${profiler} "${target.get_install_binpath(case)}")
     % else:
         (set -x; ${profiler}    \
-            mpirun -np ${nodes*tasks_per_node}            \
+            /apps/compilers/nvhpc/25.9/Linux_x86_64/25.9/comm_libs/mpi/bin/mpirun -np ${nodes*tasks_per_node}            \
                    --bind-to none                         \
                    "${target.get_install_binpath(case)}")
     % endif