Skip to content

Commit cf81f25

Browse files
Brown Oscar Python module and mako file update (#1352)
Co-authored-by: Spencer Bryngelson <sbryngelson@gmail.com>
1 parent 8bf2296 commit cf81f25

4 files changed

Lines changed: 64 additions & 4 deletions

File tree

toolchain/bootstrap/modules.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,12 @@ if [ -v $u_c ]; then
4343
log "$C""ACCESS$W: Bridges2 (b) | Expanse (e) | Delta (d) | DeltaAI (dai)"
4444
log "$Y""Gatech$W: Phoenix (p)"
4545
log "$R""Caltech$W: Richardson (r)"
46-
log "$BR""Brown$W: Oscar (o)"
46+
log "$BR""Brown$W: Oscar (o)"
47+
log "$BR""Purdue$W: Anvil (pa)"
4748
log "$B""DoD$W: Carpenter Cray (cc) | Carpenter GNU (c) | Nautilus (n)"
4849
log "$OR""Florida$W: HiPerGator (h)"
4950
log "$C""WPI $W: Turing (t)"
50-
log_n "($G""a$W/$G""f$W/$G""s$W/$G""w$W/$B""tuo$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"/$OR""h"$CR/$C""t""$CR"): "
51+
log_n "($G""a$W/$G""f$W/$G""s$W/$G""w$W/$B""tuo$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/$BR""pa"$CR"/$OR""h"$CR/$C""t""$CR"): "
5152
read u_c
5253
log
5354
fi

toolchain/modules

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,18 @@ d-gpu MFC_CUDA_CC=80,86
6565

6666
o Brown Oscar
6767
o-all python
68-
o-cpu hpcx-mpi python/3.13.10s
68+
o-cpu hpcx-mpi python/3.13.5
6969
o-gpu nvhpc cuda/12.3.0 cmake/3.26.3
7070
o-gpu CC=nvc CXX=nvc++ FC=nvfortran
7171

72+
pa Purdue Anvil
73+
pa-cpu gcc/11.2.0
74+
pa-cpu openmpi/4.1.6
75+
pa-cpu python/3.9.5
76+
pa-cpu fftw/3.3.8
77+
pa-cpu cmake/3.20.0
78+
pa-all PYTHONPATH=""
79+
7280
dai NCSA DeltaAI
7381
dai-all python cmake nvidia/25.5
7482
dai-all CC=nvc CXX=nvc++ FC=nvfortran

toolchain/templates/anvil.mako

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#!/usr/bin/env bash
2+
3+
<%namespace name="helpers" file="helpers.mako"/>
4+
5+
% if engine == 'batch':
6+
#SBATCH --nodes=${nodes}
7+
#SBATCH --ntasks-per-node=${tasks_per_node}
8+
#SBATCH --cpus-per-task=1
9+
#SBATCH --job-name="${name}"
10+
#SBATCH --time=${walltime}
11+
% if partition:
12+
#SBATCH --partition=${partition}
13+
% endif
14+
% if account:
15+
#SBATCH --account="${account}"
16+
% endif
17+
#SBATCH --output="${name}.out"
18+
#SBATCH --error="${name}.err"
19+
#SBATCH --export=ALL
20+
% if email:
21+
#SBATCH --mail-user=${email}
22+
#SBATCH --mail-type="BEGIN, END, FAIL"
23+
% endif
24+
% endif
25+
26+
${helpers.template_prologue()}
27+
28+
ok ":) Loading modules:\n"
29+
cd "${MFC_ROOT_DIR}"
30+
. ./mfc.sh load -c pa -m ${'g' if gpu_enabled else 'c'}
31+
cd - > /dev/null
32+
echo
33+
34+
% for target in targets:
35+
${helpers.run_prologue(target)}
36+
37+
% if not mpi:
38+
(set -x; ${profiler} "${target.get_install_binpath(case)}")
39+
% else:
40+
(set -x; ${profiler} \
41+
mpirun -np ${nodes*tasks_per_node} \
42+
"${target.get_install_binpath(case)}")
43+
% endif
44+
45+
${helpers.run_epilogue(target)}
46+
47+
echo
48+
% endfor
49+
50+
${helpers.template_epilogue()}

toolchain/templates/oscar.mako

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#SBATCH --nodes=${nodes}
77
#SBATCH --tasks-per-node=${tasks_per_node}
88
#SBATCH --cpus-per-task=1
9+
#SBATCH --mem-per-cpu=4g
910
#SBATCH --job-name="${name}"
1011
#SBATCH --time=${walltime}
1112
% if partition:
@@ -42,7 +43,7 @@ echo
4243
(set -x; ${profiler} "${target.get_install_binpath(case)}")
4344
% else:
4445
(set -x; ${profiler} \
45-
mpirun -np ${nodes*tasks_per_node} \
46+
srun \
4647
"${target.get_install_binpath(case)}")
4748
% endif
4849

0 commit comments

Comments
 (0)