Merge pull request #510 from ExaWorks/mpirun_output_take_2

mpirun can mangle tagged output lines, so use heuristics to fix that.

Author: hategan

src/psij/launchers/scripts/mpi_launch.sh

@@ -16,28 +16,22 @@ fi
 pre_launch
 
 filter_out() {
-    sed -nE 's/^\[[^]]+\]<stdout>:(.*)/\1/p'
-}
-
-filter_err() {
-    sed -nE 's/^\[[^]]+\]<stderr>:(.*)/\1/p'
+    # must start with [n,n]<stdout>:
+    # may contain one or more [n,n]<stdout>: lodged into the line
+    sed -nE 's/^\[[^]]+\]<std[oe][ur][tr]>:(.*)/\1/p' | sed -E 's/\[[^]]+\]<std[oe][ur][tr]>://g'
 }
 
 filter_out_5() {
-    sed -nE 's/^\[[^]]+\]<stdout>: (.*)/\1/p'
-}
-
-filter_err_5() {
-    sed -nE 's/^\[[^]]+\]<stderr>: (.*)/\1/p'
+    sed -nE 's/^\[[^]]+\]<std[oe][ur][tr]>: (.*)/\1/p'
 }
 
 set +e
 if [ "$IS_OPENMPI_5" == "1" ]; then
     mpirun --oversubscribe --output TAG -n $_PSI_J_PROCESS_COUNT "$@" \
-        1> >(filter_out_5 > $_PSI_J_STDOUT) 2> >(filter_err_5 > $_PSI_J_STDERR) <$_PSI_J_STDIN
+        1> >(filter_out_5 > $_PSI_J_STDOUT) 2> >(filter_out_5 > $_PSI_J_STDERR) <$_PSI_J_STDIN
 elif [ "$IS_OPENMPI" == "1" ]; then
     mpirun --oversubscribe --tag-output -q -n $_PSI_J_PROCESS_COUNT "$@" \
-        1> >(filter_out > "$_PSI_J_STDOUT") 2> >(filter_err > $_PSI_J_STDERR) <$_PSI_J_STDIN
+        1> >(filter_out > "$_PSI_J_STDOUT") 2> >(filter_out > $_PSI_J_STDERR) <$_PSI_J_STDIN
 else
     mpirun -n $_PSI_J_PROCESS_COUNT "$@" 1>$_PSI_J_STDOUT 2>$_PSI_J_STDERR <$_PSI_J_STDIN
 fi