diff --git a/toolchain/modules b/toolchain/modules index d73c60077..a2c558df4 100644 --- a/toolchain/modules +++ b/toolchain/modules @@ -54,7 +54,7 @@ f-gpu craype-accel-amd-gfx90a d NCSA Delta d-all python/3.11.6 d-cpu gcc/11.4.0 openmpi -d-gpu nvhpc/22.11 openmpi+cuda/4.1.5+cuda cmake +d-gpu nvhpc/24.1 cuda/12.3.0 openmpi/4.1.5+cuda cmake d-gpu CC=nvc CXX=nvc++ FC=nvfortran c DoD Carpenter diff --git a/toolchain/templates/delta.mako b/toolchain/templates/delta.mako index e08a4aaee..e2faa0b97 100644 --- a/toolchain/templates/delta.mako +++ b/toolchain/templates/delta.mako @@ -37,7 +37,7 @@ cd - > /dev/null echo # Fixes Delta not being able to find core library file -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sw/spack/deltas11-2023-03/apps/linux-rhel8-zen3/nvhpc-22.11/openmpi-4.1.5-nzb4n4r/lib/ +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sw/spack/deltas11-2023-03/apps/linux-rhel8-zen3/nvhpc-24.1/openmpi-4.1.5-zkiklxi/lib/ % for target in targets: ${helpers.run_prologue(target)} @@ -46,7 +46,7 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sw/spack/deltas11-2023-03/apps/linux-rh (set -x; ${profiler} "${target.get_install_binpath(case)}") % else: (set -x; ${profiler} \ - mpirun -np ${nodes*tasks_per_node} \ + srun --ntasks ${nodes*tasks_per_node} \ ${' '.join([f"'{x}'" for x in ARG('--') ])} \ "${target.get_install_binpath(case)}") % endif