Modify Templating to Work with Omniperf and Rocprof (#421)

Co-authored-by: Ben Wilfong <[email protected]>

Author: wilfonba

toolchain/mfc/run/run.py

@@ -1,4 +1,4 @@
-import re, os, sys, typing, dataclasses
+import re, os, sys, typing, dataclasses, shlex
 
 from glob import glob
 
@@ -102,7 +102,7 @@ def __generate_job_script(targets, case: input.MFCInputFile):
         case=case,
         MFC_ROOTDIR=MFC_ROOTDIR,
         qsystem=queues.get_system(),
-        profiler=__profiler_prepend(),
+        profiler=shlex.join(__profiler_prepend())
     )
 
     file_write(__job_script_filepath(), content)

toolchain/templates/bridges2.mako

@@ -39,9 +39,9 @@ echo
     ${helpers.run_prologue(target)}
 
     % if not mpi:
-        (set -x; ${' '.join([f"'{x}'" for x in profiler ])} "${target.get_install_binpath(case)}")
+        (set -x; ${profiler} "${target.get_install_binpath(case)}")
     % else:
-        (set -x; ${' '.join([f"'{x}'" for x in profiler ])}             \
+        (set -x; ${profiler}             \
             mpirun -np ${nodes*tasks_per_node}                 \
                    ${' '.join([f"'{x}'" for x in ARG('--') ])} \
                    "${target.get_install_binpath(case)}")

toolchain/templates/default.mako

@@ -33,28 +33,28 @@ warn "Consider using a different template via the $MAGENTA--computer$COLOR_RESET
     ${helpers.run_prologue(target)}
 
     % if not mpi:
-        (set -x; ${' '.join([f"'{x}'" for x in profiler ])} "${target.get_install_binpath(case)}")
+        (set -x; ${profiler} "${target.get_install_binpath(case)}")
     % else:
         if [ "$binary" == "jsrun" ]; then
-            (set -x; ${' '.join([f"'{x}'" for x in profiler ])}   \
+            (set -x; ${profiler}   \
                 jsrun --nrs          ${tasks_per_node*nodes}      \
                       --cpu_per_rs   1                            \
                       --gpu_per_rs   ${1 if gpu else 0}           \
                       --tasks_per_rs 1                            \
                       ${' '.join([f"'{x}'" for x in ARG('--') ])} \
                       "${target.get_install_binpath(case)}")
         elif [ "$binary" == "srun" ]; then
-            (set -x; ${' '.join([f"'{x}'" for x in profiler ])}  \
+            (set -x; {profiler}  \
                 srun --ntasks-per-node ${tasks_per_node}         \
                      ${' '.join([f"'{x}'" for x in ARG('--') ])} \
                      "${target.get_install_binpath(case)}")
         elif [ "$binary" == "mpirun" ]; then
-            (set -x; ${' '.join([f"'{x}'" for x in profiler ])}     \
+            (set -x; ${profiler}     \
                 $binary -np ${nodes*tasks_per_node}                 \
                         ${' '.join([f"'{x}'" for x in ARG('--') ])} \
                         "${target.get_install_binpath(case)}")
         elif [ "$binary" == "mpiexec" ]; then
-            (set -x; ${' '.join([f"'{x}'" for x in profiler ])}     \
+            (set -x; ${profiler}     \
                 $binary --ntasks ${nodes*tasks_per_node}            \
                         ${' '.join([f"'{x}'" for x in ARG('--') ])} \
                         "${target.get_install_binpath(case)}")

toolchain/templates/delta.mako

@@ -43,9 +43,9 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sw/spack/deltas11-2023-03/apps/linux-rh
     ${helpers.run_prologue(target)}
 
     % if not mpi:
-        (set -x; ${' '.join([f"'{x}'" for x in profiler ])} "${target.get_install_binpath(case)}")
+        (set -x; ${profiler} "${target.get_install_binpath(case)}")
     % else:
-        (set -x; ${' '.join([f"'{x}'" for x in profiler ])}    \
+        (set -x; ${profiler}    \
             mpirun -np ${nodes*tasks_per_node}                 \
                    ${' '.join([f"'{x}'" for x in ARG('--') ])} \
                    "${target.get_install_binpath(case)}")

toolchain/templates/frontier.mako

@@ -37,11 +37,11 @@ echo
     ${helpers.run_prologue(target)}
 
     % if not mpi:
-        (set -x; ${' '.join([f"'{x}'" for x in profiler ])} "${target.get_install_binpath(case)}")
+        (set -x; ${profiler} "${target.get_install_binpath(case)}")
     % else:
-        (set -x; ${' '.join([f"'{x}'" for x in profiler ])}    \
-            srun -N ${nodes}                 \
+        (set -x; srun -N ${nodes}                 \
                    -n ${tasks_per_node}                              \
+                   ${profiler}    \
                    ${' '.join([f"'{x}'" for x in ARG('--') ])} \
                    "${target.get_install_binpath(case)}")
     % endif

toolchain/templates/phoenix.mako

@@ -39,9 +39,9 @@ echo
     ${helpers.run_prologue(target)}
 
     % if not mpi:
-        (set -x; ${' '.join([f"'{x}'" for x in profiler ])} "${target.get_install_binpath(case)}")
+        (set -x; ${profiler} "${target.get_install_binpath(case)}")
     % else:
-        (set -x; ${' '.join([f"'{x}'" for x in profiler ])}    \
+        (set -x; ${profiler}    \
             mpirun -np ${nodes*tasks_per_node}                 \
                    --bind-to none                              \
                    ${' '.join([f"'{x}'" for x in ARG('--') ])} \

toolchain/templates/summit.mako

@@ -24,9 +24,9 @@ echo
     ${helpers.run_prologue(target)}
 
     % if not mpi:
-        (set -x; ${' '.join([f"'{x}'" for x in profiler ])} "${target.get_install_binpath(case)}")
+        (set -x; ${rofiler} "${target.get_install_binpath(case)}")
     % else:
-        (set -x; ${' '.join([f"'{x}'" for x in profiler ])} \
+        (set -x; ${profiler} \
             jsrun                                           \
                 ${'--smpiargs="-gpu"' if gpu else ''}       \
                 --nrs          ${tasks_per_node*nodes}      \