revert unintentional changes to template files

wilfonba · May 24, 2024 · 745d4f8 · 745d4f8
1 parent ac39b72
commit 745d4f8
Show file tree

Hide file tree

Showing 6 changed files with 123 additions and 5 deletions.
diff --git a/asdf b/asdf
@@ -0,0 +1,113 @@
+cases:
+  5eq_rk3_weno3_hllc:
+    description:
+      args:
+      - -n
+      - '4'
+      path: /fastscratch/bwilfong3/software/MFC-Wilfong/benchmarks/5eq_rk3_weno3_hllc/case.py
+      slug: 5eq_rk3_weno3_hllc
+    output_summary:
+      invocation:
+      - run
+      - /fastscratch/bwilfong3/software/MFC-Wilfong/benchmarks/5eq_rk3_weno3_hllc/case.py
+      - '1'
+      - --case-optimization
+      - --targets
+      - pre_process
+      - simulation
+      - post_process
+      - --output-summary
+      - /fastscratch/bwilfong3/software/MFC-Wilfong/build/benchmarks/adec/5eq_rk3_weno3_hllc.yaml
+      - -n
+      - '4'
+      lock:
+        debug: false
+        gpu: true
+        mpi: true
+  hypo_hll:
+    description:
+      args:
+      - -n
+      - '4'
+      path: /fastscratch/bwilfong3/software/MFC-Wilfong/benchmarks/hypo_hll/case.py
+      slug: hypo_hll
+    output_summary:
+      invocation:
+      - run
+      - /fastscratch/bwilfong3/software/MFC-Wilfong/benchmarks/hypo_hll/case.py
+      - '1'
+      - --case-optimization
+      - --targets
+      - pre_process
+      - simulation
+      - post_process
+      - --output-summary
+      - /fastscratch/bwilfong3/software/MFC-Wilfong/build/benchmarks/adec/hypo_hll.yaml
+      - -n
+      - '4'
+      lock:
+        debug: false
+        gpu: true
+        mpi: true
+  ibm:
+    description:
+      args:
+      - -n
+      - '4'
+      path: /fastscratch/bwilfong3/software/MFC-Wilfong/benchmarks/ibm/case.py
+      slug: ibm
+    output_summary:
+      invocation:
+      - run
+      - /fastscratch/bwilfong3/software/MFC-Wilfong/benchmarks/ibm/case.py
+      - '1'
+      - --case-optimization
+      - --targets
+      - pre_process
+      - simulation
+      - post_process
+      - --output-summary
+      - /fastscratch/bwilfong3/software/MFC-Wilfong/build/benchmarks/adec/ibm.yaml
+      - -n
+      - '4'
+      lock:
+        debug: false
+        gpu: true
+        mpi: true
+  viscous_weno5_sgb_mono:
+    description:
+      args:
+      - -n
+      - '4'
+      path: /fastscratch/bwilfong3/software/MFC-Wilfong/benchmarks/viscous_weno5_sgb_mono/case.py
+      slug: viscous_weno5_sgb_mono
+    output_summary:
+      invocation:
+      - run
+      - /fastscratch/bwilfong3/software/MFC-Wilfong/benchmarks/viscous_weno5_sgb_mono/case.py
+      - '1'
+      - --case-optimization
+      - --targets
+      - pre_process
+      - simulation
+      - post_process
+      - --output-summary
+      - /fastscratch/bwilfong3/software/MFC-Wilfong/build/benchmarks/adec/viscous_weno5_sgb_mono.yaml
+      - -n
+      - '4'
+      lock:
+        debug: false
+        gpu: true
+        mpi: true
+metadata:
+  invocation:
+  - bench
+  - -o
+  - asdf
+  - --
+  - -n
+  - '4'
+  lock:
+    debug: false
+    gpu: true
+    mpi: true
diff --git a/toolchain/templates/bridges2.mako b/toolchain/templates/bridges2.mako
@@ -44,7 +44,7 @@ echo
         (set -x; ${profiler}             \
             mpirun -np ${nodes*tasks_per_node}                 \
                    ${' '.join([f"'{x}'" for x in ARG('--') ])} \
-                   "${target.get_install_binpath(case)}"
+                   "${target.get_install_binpath(case)}")
     % endif
 
     ${helpers.run_epilogue(target)}

diff --git a/toolchain/templates/default.mako b/toolchain/templates/default.mako
@@ -42,7 +42,7 @@ warn "Consider using a different template via the $MAGENTA--computer$COLOR_RESET
                       --gpu_per_rs   ${1 if gpu else 0}           \
                       --tasks_per_rs 1                            \
                       ${' '.join([f"'{x}'" for x in ARG('--') ])} \
-                      "${target.get_install_binpath(case)}"
+                      "${target.get_install_binpath(case)}")
         elif [ "$binary" == "srun" ]; then
             (set -x; {profiler}  \
                 srun --ntasks-per-node ${tasks_per_node}         \

diff --git a/toolchain/templates/delta.mako b/toolchain/templates/delta.mako
@@ -16,6 +16,8 @@
 % endif
 % if gpu:
 #SBATCH --gpus-per-node=${tasks_per_node}
+#SBATCH --mem=208G
+#SBATCH --gpu-bind=closest
 % endif
 #SBATCH --output="${name}.out"
 #SBATCH --error="${name}.err"
@@ -34,6 +36,9 @@ cd "${MFC_ROOTDIR}"
 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/
+
 % for target in targets:
     ${helpers.run_prologue(target)}
 
@@ -43,7 +48,7 @@ echo
         (set -x; ${profiler}    \
             mpirun -np ${nodes*tasks_per_node}                 \
                    ${' '.join([f"'{x}'" for x in ARG('--') ])} \
-                   "${target.get_install_binpath(case)}"
+                   "${target.get_install_binpath(case)}")
     % endif
 
     ${helpers.run_epilogue(target)}

diff --git a/toolchain/templates/phoenix.mako b/toolchain/templates/phoenix.mako
@@ -45,7 +45,7 @@ echo
             mpirun -np ${nodes*tasks_per_node}                 \
                    --bind-to none                              \
                    ${' '.join([f"'{x}'" for x in ARG('--') ])} \
-                   "${target.get_install_binpath(case)}"
+                   "${target.get_install_binpath(case)}")
     % endif
 
     ${helpers.run_epilogue(target)}

diff --git a/toolchain/templates/summit.mako b/toolchain/templates/summit.mako
@@ -34,7 +34,7 @@ echo
                 --gpu_per_rs   ${1 if gpu else 0}           \
                 --tasks_per_rs 1                            \
                 ${' '.join([f"'{x}'" for x in ARG('--') ])} \
-                "${target.get_install_binpath(case)}"
+                "${target.get_install_binpath(case)}")
     % endif
 
     ${helpers.run_epilogue(target)}