From d5134fae002edb177930502fc073c133e3439721 Mon Sep 17 00:00:00 2001 From: Ben Wilfong Date: Fri, 5 Dec 2025 11:16:29 -0800 Subject: [PATCH 1/2] add tuo modules and template --- toolchain/modules | 8 ++++- toolchain/templates/tuo.mako | 63 ++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 toolchain/templates/tuo.mako diff --git a/toolchain/modules b/toolchain/modules index 67655a41df..d733d13d9c 100644 --- a/toolchain/modules +++ b/toolchain/modules @@ -52,6 +52,12 @@ f-all cpe/25.03 rocm/6.3.1 f-all cray-fftw cray-hdf5 cray-python cmake f-gpu craype-accel-amd-gfx90a rocprofiler-compute/3.0.0 +t OLCF Tuolumne +t-all cpe/25.03 rocm/6.3.1 +t-all cray-fftw cray-hdf5 cray-python cmake +t-gpu craype-accel-amd-gfx942 +t-gpu HSA_XNACK=1 + d NCSA Delta d-all python/3.11.6 d-cpu gcc/11.4.0 openmpi @@ -101,4 +107,4 @@ 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" \ No newline at end of file +h-gpu MFC_CUDA_CC=100 NVHPC_CUDA_HOME="/apps/compilers/cuda/12.8.1" diff --git a/toolchain/templates/tuo.mako b/toolchain/templates/tuo.mako new file mode 100644 index 0000000000..6821b3af1a --- /dev/null +++ b/toolchain/templates/tuo.mako @@ -0,0 +1,63 @@ +#!/usr/bin/env bash + +<%namespace name="helpers" file="helpers.mako"/> + +% if engine == 'batch': +# flux: -N ${nodes} +# flux: -n ${tasks_per_node*nodes} +# flux: --job-name="${name}" +# flux: --output="${name}.out" +# flux: --error="${name}.err" +# flux: --time=${walltime} +# flux: --exclusive +# flux:--setattr=thp=always +# flux: --coral2-hugepages=512GB +% if account: +# flux: --bank=${account} +% endif +% if partition: +# flux: --queue=${partition} +% endif +% if unified: +# flux:--setattr=thp=always +# flux: --coral2-hugepages=512GB +% endif +% endif + +${helpers.template_prologue()} + +ok ":) Loading modules:\n" +cd "${MFC_ROOT_DIR}" +% if engine == 'batch': +. ./mfc.sh load -c t -m ${'g' if gpu else 'c'} +% endif +cd - > /dev/null +echo + +% if gpu: + export MPICH_GPU_SUPPORT_ENABLED=1 +% else: + export MPICH_GPU_SUPPORT_ENABLED=0 +% endif + +% for target in targets: + ${helpers.run_prologue(target)} + + % if not mpi: + (set -x; ${profiler} "${target.get_install_binpath(case)}") + % else: + (set -x; flux run \ + --nodes=${nodes} --ntasks=${tasks_per_node * nodes} \ + --exclusive \ + % if gpu: + --gpus-per-task 1 \ + % endif + ${profiler} "${target.get_install_binpath(case)}") + % endif + + ${helpers.run_epilogue(target)} + + echo +% endfor + +${helpers.template_epilogue()} From e23561256c0f1878fa9c9a97403b64d35948119c Mon Sep 17 00:00:00 2001 From: Ben Wilfong <48168887+wilfonba@users.noreply.github.com> Date: Fri, 5 Dec 2025 14:30:37 -0500 Subject: [PATCH 2/2] Add tuo to ./mfc.sh load --- toolchain/bootstrap/modules.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/toolchain/bootstrap/modules.sh b/toolchain/bootstrap/modules.sh index 2a0245fc80..fbe28a9598 100644 --- a/toolchain/bootstrap/modules.sh +++ b/toolchain/bootstrap/modules.sh @@ -39,12 +39,13 @@ done if [ -v $u_c ]; then log "Select a system:" log "$G""ORNL$W: Ascent (a) | Frontier (f) | Summit (s) | Wombat (w)" + log "$B""LLNL $W: Tuolumne (t)" log "$C""ACCESS$W: Bridges2 (b) | Expanse (e) | Delta (d) | DeltaAI (dai)" log "$Y""Gatech$W: Phoenix (p)" log "$R""Caltech$W: Richardson (r)" - log "$BR""Brown$W: Oscar (o)" + log "$BR""Brown$W: Oscar (o)" log "$B""DoD$W: Carpenter Cray (cc) | Carpenter GNU (c) | Nautilus (n)" - log_n "($G""a$W/$G""f$W/$G""s$W/$G""w$W/$C""b$W/$C""e$CR/$C""d/$C""dai$CR/$Y""p$CR/$R""r$CR/$B""cc$CR/$B""c$CR/$B""n$CR/$BR""o"$CR"): " + log_n "($G""a$W/$G""f$W/$G""s$W/$G""w$W/$B""t$W/$C""b$W/$C""e$CR/$C""d/$C""dai$CR/$Y""p$CR/$R""r$CR/$B""cc$CR/$B""c$CR/$B""n$CR/$BR""o"$CR"): " read u_c log fi