mvapich mpiexec flags & Print invocation (#355)

MFlowCode · Feb 24, 2024 · 64e514c · 64e514c
1 parent d15f9fa
commit 64e514c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 21 deletions.
diff --git a/toolchain/templates/bridges2.mako b/toolchain/templates/bridges2.mako
@@ -39,12 +39,12 @@ echo
     ${helpers.run_prologue(target)}
 
     % if not mpi:
-        ${' '.join([f"'{x}'" for x in profiler ])} "${target.get_install_binpath()}"
+        (set -x; ${' '.join([f"'{x}'" for x in profiler ])} "${target.get_install_binpath()}")
     % else:
-        ${' '.join([f"'{x}'" for x in profiler ])}             \
+        (set -x; ${' '.join([f"'{x}'" for x in profiler ])}             \
             mpirun -np ${nodes*tasks_per_node}                 \
                    ${' '.join([f"'{x}'" for x in ARG('--') ])} \
-                   "${target.get_install_binpath()}"
+                   "${target.get_install_binpath()}")
     % endif
 
     ${helpers.run_epilogue(target)}

diff --git a/toolchain/templates/default.mako b/toolchain/templates/default.mako
@@ -33,26 +33,31 @@ warn "Consider using a different template via the $MAGENTA--computer$COLOR_RESET
     ${helpers.run_prologue(target)}
 
     % if not mpi:
-        ${' '.join([f"'{x}'" for x in profiler ])} "${target.get_install_binpath()}"
+        (set -x; ${' '.join([f"'{x}'" for x in profiler ])} "${target.get_install_binpath()}")
     % else:
         if [ "$binary" == "jsrun" ]; then
-            ${' '.join([f"'{x}'" for x in profiler ])}            \
+            (set -x; ${' '.join([f"'{x}'" for x in 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()}"
+                      "${target.get_install_binpath()}")
         elif [ "$binary" == "srun" ]; then
-            ${' '.join([f"'{x}'" for x in profiler ])}           \
+            (set -x; ${' '.join([f"'{x}'" for x in profiler ])}  \
                 srun --ntasks-per-node ${tasks_per_node}         \
                      ${' '.join([f"'{x}'" for x in ARG('--') ])} \
-                     "${target.get_install_binpath()}"
-        elif [ "$binary" == "mpirun" ] || [ "$binary" == "mpiexec" ]; then
-            ${' '.join([f"'{x}'" for x in profiler ])}              \
+                     "${target.get_install_binpath()}")
+        elif [ "$binary" == "mpirun" ]; then
+            (set -x; ${' '.join([f"'{x}'" for x in profiler ])}     \
                 $binary -np ${nodes*tasks_per_node}                 \
                         ${' '.join([f"'{x}'" for x in ARG('--') ])} \
-                        "${target.get_install_binpath()}"
+                        "${target.get_install_binpath()}")
+        elif [ "$binary" == "mpiexec" ]; then
+            (set -x; ${' '.join([f"'{x}'" for x in profiler ])}     \
+                $binary --ntasks ${nodes*tasks_per_node}            \
+                        ${' '.join([f"'{x}'" for x in ARG('--') ])} \
+                        "${target.get_install_binpath()}")
         fi
     % endif
 

diff --git a/toolchain/templates/delta.mako b/toolchain/templates/delta.mako
@@ -41,12 +41,12 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sw/spack/deltas11-2023-03/apps/linux-rh
     ${helpers.run_prologue(target)}
 
     % if not mpi:
-        ${' '.join([f"'{x}'" for x in profiler ])} "${target.get_install_binpath()}"
+        (set -x; ${' '.join([f"'{x}'" for x in profiler ])} "${target.get_install_binpath()}")
     % else:
-        ${' '.join([f"'{x}'" for x in profiler ])}             \
-            mpirun -np ${nodes*tasks_per_node} \
+        (set -x; ${' '.join([f"'{x}'" for x in profiler ])}    \
+            mpirun -np ${nodes*tasks_per_node}                 \
                    ${' '.join([f"'{x}'" for x in ARG('--') ])} \
-                   "${target.get_install_binpath()}"
+                   "${target.get_install_binpath()}")
     % endif
 
     ${helpers.run_epilogue(target)}

diff --git a/toolchain/templates/phoenix.mako b/toolchain/templates/phoenix.mako
@@ -39,13 +39,13 @@ echo
     ${helpers.run_prologue(target)}
 
     % if not mpi:
-        ${' '.join([f"'{x}'" for x in profiler ])} "${target.get_install_binpath()}"
+        (set -x; ${' '.join([f"'{x}'" for x in profiler ])} "${target.get_install_binpath()}")
     % else:
-        ${' '.join([f"'{x}'" for x in profiler ])}             \
+        (set -x; ${' '.join([f"'{x}'" for x in profiler ])}    \
             mpirun -np ${nodes*tasks_per_node}                 \
                    --bind-to none                              \
                    ${' '.join([f"'{x}'" for x in ARG('--') ])} \
-                   "${target.get_install_binpath()}"
+                   "${target.get_install_binpath()}")
     % endif
 
     ${helpers.run_epilogue(target)}

diff --git a/toolchain/templates/summit.mako b/toolchain/templates/summit.mako
@@ -24,17 +24,17 @@ echo
     ${helpers.run_prologue(target)}
 
     % if not mpi:
-        ${' '.join([f"'{x}'" for x in profiler ])} "${target.get_install_binpath()}"
+        (set -x; ${' '.join([f"'{x}'" for x in profiler ])} "${target.get_install_binpath()}")
     % else:
-        ${' '.join([f"'{x}'" for x in profiler ])}          \
+        (set -x; ${' '.join([f"'{x}'" for x in profiler ])} \
             jsrun                                           \
                 ${'--smpiargs="-gpu"' if gpu else ''}       \
                 --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()}"
+                "${target.get_install_binpath()}")
     % endif
 
     ${helpers.run_epilogue(target)}