Parameterize the exit on convergence.

[loba.git] / Experimentations / run-all

diff --git a/Experimentations/run-all b/Experimentations/run-all
index d423b4d15d29aab2c6aae739e7e769a65a280aa6..95d70b1ec8d0f955540455c66392a06a07a2c5ee 100755 (executable)
--- a/Experimentations/run-all
+++ b/Experimentations/run-all
@@ -5,11 +5,12 @@ set -e
 
 usage() {
     cat >&2 <<EOF
 
 usage() {
     cat >&2 <<EOF

-Usage: $0 [-c] <parameters file>
+Usage: $0 [OPTION] <parameters file>

 Options:
     -h  print this help
     -n  dry-run mode (for debugging)
     -c  (continue) do not overwrite previous results
 Options:
     -h  print this help
     -n  dry-run mode (for debugging)
     -c  (continue) do not overwrite previous results

+    -z  compress output files with gzip

 EOF
     exit $1
 }
 EOF
     exit $1
 }


@@ -34,11 +35,13 @@ array_check() {
 # read args
 overwrite=1
 debug=0
 # read args
 overwrite=1
 debug=0

-while getopts "chn" c; do
+compress=0
+while getopts "chnz" c; do

     case "$c" in
         'c') overwrite=0 ;;
         'h') usage 0 ;;
         'n') debug=1 ;;
     case "$c" in
         'c') overwrite=0 ;;
         'h') usage 0 ;;
         'n') debug=1 ;;

+        'z') compress=1 ;;

         '?') usage 1 ;;
     esac
 done
         '?') usage 1 ;;
     esac
 done


@@ -49,7 +52,7 @@ parameters="$1"
 log "Running: $0 $@"
 log "Hostname: $(hostname -f)"
 
 log "Running: $0 $@"
 log "Hostname: $(hostname -f)"
 

-declare -a TOPOLOGIES ALGORITHMS PLATFORMS COMMON_OPTS
+declare -a TOPOLOGIES ALGORITHMS PLATFORMS COMMON_OPTS MORE_ARGS

 
 # read parameters
 log "Reading parameters from \"$1\"."
 
 # read parameters
 log "Reading parameters from \"$1\"."


@@ -67,7 +70,7 @@ variable_check DEADLINE
 : ${LOBA:=$PWD/loba}
 
 COMMON_OPTS=(
 : ${LOBA:=$PWD/loba}
 
 COMMON_OPTS=(

-    --cfg=contexts/factory:raw
+    "${MORE_ARGS[@]}"

 )
 
 log "Results put in: \"$RESULTS\"."
 )
 
 log "Results put in: \"$RESULTS\"."


@@ -78,14 +81,27 @@ outfile() {
     echo "$*" | sed 's,[^ ]*/,,g;s/\.xml//;y/ /_/'
 }
 
     echo "$*" | sed 's,[^ ]*/,,g;s/\.xml//;y/ /_/'
 }
 

+summary() {
+    gzip -cdf "$@" \
+    | sed -n '\!^\[main/INFO\] ,----\[ Results \]!,${
+        /send\|recv\|wall clock\|Simulation succeeded/d;p;
+      }'
+}
+
+if [ $compress = 1 ]; then
+    outsuffix=".gz"
+else
+    outsuffix=""
+fi
+

 for plat in "${PLATFORMS[@]}"; do
     tmp=$(basename "$plat" ".xml")
     plat_output="$RESULTS/plat_$tmp"
     for topo in "${TOPOLOGIES[@]}"; do
         topo_output="$plat_output/topo_$topo"
 for plat in "${PLATFORMS[@]}"; do
     tmp=$(basename "$plat" ".xml")
     plat_output="$RESULTS/plat_$tmp"
     for topo in "${TOPOLOGIES[@]}"; do
         topo_output="$plat_output/topo_$topo"

+        [ $debug = 0 ] && mkdir -p "$topo_output"

         for algo in "${ALGORITHMS[@]}"; do
             algo_output="$topo_output/algo_$algo"
         for algo in "${ALGORITHMS[@]}"; do
             algo_output="$topo_output/algo_$algo"

-            [ $debug = 0 ] && mkdir -p "$algo_output"

             args=(
                 -T"$topo"
                 -a"$algo"
             args=(
                 -T"$topo"
                 -a"$algo"


@@ -94,24 +110,36 @@ for plat in "${PLATFORMS[@]}"; do
                 -t"$DEADLINE"
                 "$plat"
             )
                 -t"$DEADLINE"
                 "$plat"
             )

-            for bk in "" "-b"; do
-                tmp=$(outfile "loba" $bk "${args[@]}")
-                out="$algo_output/$tmp.out"
-                cmd=( "$LOBA" "${COMMON_OPTS[@]}" $bk "${args[@]}" )
-                log "Run: ${cmd[@]}"$'\n'"... &> $out"
-                if [ $overwrite = 0 -a -e "$out" ]; then
+            for bk in "plain" "bookkeeping"; do
+                cmd=( "$LOBA" "${COMMON_OPTS[@]}" )
+                case "$bk" in
+                    "plain") : ;;
+                    "bookkeeping") cmd+=( "-b" ) ;;
+                    *) die "internal error (bk = \"$bk\")" ;;
+                esac
+                out="${algo_output}_${bk}.out"
+                outf="$out$outsuffix"
+                cmd+=( "${args[@]}" )
+                log "Run: ${cmd[@]}"$'\n'"... &> $outf"
+                if [ $overwrite = 0 -a -e "$outf" ]; then

                     log "already run !"
                     log "already run !"

-                    tail -n4 "$out"
+                    summary "$outf"

                     continue
                 fi
                 if [ $debug = 1 ]; then
                     log "skipped (dry-run)"
                     continue
                 fi
                 if [ $debug = 1 ]; then
                     log "skipped (dry-run)"

+                    continue
+                fi
+                rm -f "$outf";
+                echo "# ${cmd[@]}" > "$out"
+                if "${cmd[@]}" >> "$out" 2>&1; then
+                    summary "$out"

                 else
                 else

-                    echo "# ${cmd[@]}" > "$out"
-                       out2="/tmp/tmp_loba.o"
-                    "${cmd[@]}" > "$out2" 2>&1
-                   tail -17 "$out2" >> "$out" 
-                    tail -n4 "$out"
+                    grep -v '/INFO\]' "$out"
+                fi
+                if [ $compress = 1 ]; then
+                    log "Compress output file."
+                    gzip --best "$out"

                 fi
             done
         done
                 fi
             done
         done