From d67598cbd82ab4890da81141f9eac3b26fdf2f0b Mon Sep 17 00:00:00 2001 From: Benjamin Wilfong Date: Thu, 10 Oct 2024 12:54:15 -0500 Subject: [PATCH 1/2] fix delta --- toolchain/modules | 2 +- toolchain/templates/delta.mako | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/toolchain/modules b/toolchain/modules index d73c600773..a2c558df43 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 e08a4aaee8..e2faa0b97c 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 From fc8bea67062191e152bcafeb14357efeac3d34d2 Mon Sep 17 00:00:00 2001 From: Ben Wilfong <48168887+wilfonba@users.noreply.github.com> Date: Tue, 15 Oct 2024 23:20:32 -0400 Subject: [PATCH 2/2] fix delta again --- toolchain/templates/delta.mako | 1 - 1 file changed, 1 deletion(-) diff --git a/toolchain/templates/delta.mako b/toolchain/templates/delta.mako index e2faa0b97c..694f22c457 100644 --- a/toolchain/templates/delta.mako +++ b/toolchain/templates/delta.mako @@ -47,7 +47,6 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sw/spack/deltas11-2023-03/apps/linux-rh % else: (set -x; ${profiler} \ srun --ntasks ${nodes*tasks_per_node} \ - ${' '.join([f"'{x}'" for x in ARG('--') ])} \ "${target.get_install_binpath(case)}") % endif