In run-all: simplify the names of the output files.

Before:
  .../results/plat_${PLATFORM}/topo_${TOPOLOGY}/algo_${ALGO}/loba_${PARAM}.out

After:
  .../results/plat_${PLATFORM}/topo_${TOPOLOGY}/algo_${ALGO}_${VARIANT}.out

with VARIANT being "plain" or "bookkeeping".

diff --git a/Experimentations/run-all b/Experimentations/run-all
index 9d4354292b0c7fab232ef51bae877ea7f873d6b2..581ee1f811b5d11941e9fe34cb6ffbb6d88cd95b 100755 (executable)
--- a/Experimentations/run-all
+++ b/Experimentations/run-all
@@ -100,9 +100,9 @@ for plat in "${PLATFORMS[@]}"; do
     plat_output="$RESULTS/plat_$tmp"
     for topo in "${TOPOLOGIES[@]}"; do
         topo_output="$plat_output/topo_$topo"
     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"


@@ -111,11 +111,16 @@ 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"
+            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"
                 outf="$out$outsuffix"

-                cmd=( "$LOBA" "${COMMON_OPTS[@]}" $bk "${args[@]}" )
+                cmd+=( "${args[@]}" )

                 log "Run: ${cmd[@]}"$'\n'"... &> $outf"
                 if [ $overwrite = 0 -a -e "$outf" ]; then
                     log "already run !"
                 log "Run: ${cmd[@]}"$'\n'"... &> $outf"
                 if [ $overwrite = 0 -a -e "$outf" ]; then
                     log "already run !"

diff --git a/TODO b/TODO
index fcd2d79938522709e1a6a80b1f15999456b7728f..e9efed09377065c977499085261bcff4398f9c3b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,10 +1,3 @@
-* In run-all:
-  - Use more legible names for generated files.
-    Current problems are:
-    . file names are too long.
-    . MORE_ARGS do not appear in file name.
-    Why not simply using file names "plain.out", and "bookkeeping.out"?
-

 * Support heterogeneous platforms?
    Not sure yet.
    Should be doable if each process also sends its speed to its neighbors.
 * Support heterogeneous platforms?
    Not sure yet.
    Should be doable if each process also sends its speed to its neighbors.