modif des scripts rc

diff --git a/Experimentations/rc_hcube b/Experimentations/rc_hcube
index 1585110a2cc18f3c5d0a9928b44a811e4e815386..6ca247dd607fa677830fc332c6c73ff2276fe139 100644 (file)
--- a/Experimentations/rc_hcube
+++ b/Experimentations/rc_hcube
@@ -26,7 +26,7 @@ NHOSTS=0
 LOAD=-100
 
 # time limit for the simulation
-DEADLINE=800
+DEADLINE=600 #800
 
 # optional: additional arguments for loba (default: empty)
 MORE_ARGS=(  -c1e8,0 -C1e5,0 -M10)

diff --git a/Experimentations/rc_hcube1 b/Experimentations/rc_hcube1
new file mode 100644 (file)
index 0000000..2e1a761
--- /dev/null
+++ b/Experimentations/rc_hcube1
@@ -0,0 +1,38 @@
+### PARAMETER FILE FOR RC'S EXPERIMENTATIONS
+
+# define the topologies
+TOPOLOGIES=(
+  hcube
+)
+
+# define the algorithms
+ALGORITHMS=(
+    simple
+         makhoul
+    besteffort
+    2besteffort
+
+)
+
+# the different platform files
+PLATFORMS=(
+    cluster64.xml
+)
+
+# number of hosts
+NHOSTS=0
+
+# total load
+LOAD=-100
+
+# time limit for the simulation
+DEADLINE=1000
+
+# optional: additional arguments for loba (default: empty)
+MORE_ARGS=(  -c1e8,0 -C1e5,0 -M10)
+
+# optional: path to binary (default: ./loba)
+LOBA=../loba
+
+# optional: path to results (default: ./results)
+RESULTS=./results_hcube1

diff --git a/Experimentations/rc_hcubeN b/Experimentations/rc_hcubeN
new file mode 100644 (file)
index 0000000..92851ad
--- /dev/null
+++ b/Experimentations/rc_hcubeN
@@ -0,0 +1,38 @@
+### PARAMETER FILE FOR RC'S EXPERIMENTATIONS
+
+# define the topologies
+TOPOLOGIES=(
+  hcube
+)
+
+# define the algorithms
+ALGORITHMS=(
+    simple
+         makhoul
+    besteffort
+    2besteffort
+
+)
+
+# the different platform files
+PLATFORMS=(
+    cluster64.xml
+)
+
+# number of hosts
+NHOSTS=0
+
+# total load
+LOAD=-100
+
+# time limit for the simulation
+DEADLINE=600 #800
+
+# optional: additional arguments for loba (default: empty)
+MORE_ARGS=( -R -r42 -c1e8,0 -C1e5,0 -M10)
+
+# optional: path to binary (default: ./loba)
+LOBA=../loba
+
+# optional: path to results (default: ./results)
+RESULTS=./results_hcubeN

diff --git a/Experimentations/rc_line1 b/Experimentations/rc_line1
new file mode 100644 (file)
index 0000000..1d84f2a
--- /dev/null
+++ b/Experimentations/rc_line1
@@ -0,0 +1,38 @@
+### PARAMETER FILE FOR RC'S EXPERIMENTATIONS
+
+# define the topologies
+TOPOLOGIES=(
+  line
+)
+
+# define the algorithms
+ALGORITHMS=(
+    simple
+         makhoul
+    besteffort
+    2besteffort
+
+)
+
+# the different platform files
+PLATFORMS=(
+    cluster64.xml
+)
+
+# number of hosts
+NHOSTS=0
+
+# total load
+LOAD=-100
+
+# time limit for the simulation
+DEADLINE=6000
+
+# optional: additional arguments for loba (default: empty)
+MORE_ARGS=(  -c1e8,0 -C1e5,0 -M10)
+
+# optional: path to binary (default: ./loba)
+LOBA=../loba
+
+# optional: path to results (default: ./results)
+RESULTS=./results_line1

diff --git a/Experimentations/rc_lineN b/Experimentations/rc_lineN
new file mode 100644 (file)
index 0000000..336d8c7
--- /dev/null
+++ b/Experimentations/rc_lineN
@@ -0,0 +1,38 @@
+### PARAMETER FILE FOR RC'S EXPERIMENTATIONS
+
+# define the topologies
+TOPOLOGIES=(
+  line
+)
+
+# define the algorithms
+ALGORITHMS=(
+    simple
+         makhoul
+    besteffort
+    2besteffort
+
+)
+
+# the different platform files
+PLATFORMS=(
+    cluster64.xml
+)
+
+# number of hosts
+NHOSTS=0
+
+# total load
+LOAD=-100
+
+# time limit for the simulation
+DEADLINE=6000
+
+# optional: additional arguments for loba (default: empty)
+MORE_ARGS=( -R -r42 -c1e8,0 -C1e5,0 -M10)
+
+# optional: path to binary (default: ./loba)
+LOBA=../loba
+
+# optional: path to results (default: ./results)
+RESULTS=./results_lineN

diff --git a/Experimentations/run-all2 b/Experimentations/run-all2
index bdbc3bdf61cc0975f14b33b6233a921c1f15d977..d296dfcb9031ab9d31f43e8d2272f982842124cd 100755 (executable)
--- a/Experimentations/run-all2
+++ b/Experimentations/run-all2
@@ -101,12 +101,12 @@ for plat in "${PLATFORMS[@]}"; do
     for topo in "${TOPOLOGIES[@]}"; do
         topo_output="$plat_output/topo_$topo"
         [ $debug = 0 ] && mkdir -p "$topo_output"
-        for lr in "1" "N"; do
-            case "$lr" in
-                "1") loadinit=( ) ;;
-                "N") loadinit=( "-R" "-r42" ) ;;
-                *) die "internal error (lr = \"$lr\")" ;;
-            esac
+ #       for lr in "1" "N"; do
+ #           case "$lr" in
+ #               "1") loadinit=( ) ;;
+ #               "N") loadinit=( "-R" "-r42" ) ;;
+ #               *) die "internal error (lr = \"$lr\")" ;;
+ #           esac
                                                for mode in "R" "Z"; do
                                                                case "$mode" in
                                                                                "R") computemode=( );;
@@ -121,7 +121,7 @@ for plat in "${PLATFORMS[@]}"; do
                                                                                                -N"$NHOSTS"
                                                                                                -L"$LOAD"
                                                                                                -t"$DEADLINE"
-                                                                                               "${loadinit[@]}"
+#                                                                                              "${loadinit[@]}"
                                                                                                "${computemode[@]}"
                                                                                                "$plat"
                                                                                )
@@ -133,7 +133,7 @@ for plat in "${PLATFORMS[@]}"; do
                                                                                                                "bookkeeping") cmd+=( "-b" ) ;;
                                                                                                                *) die "internal error (bk = \"$bk\")" ;;
                                                                                                esac
-                                                                                               out="${algo_output}_${bk}_${lr}${mode}.out"
+                                                                                               out="${algo_output}_${bk}_${mode}.out"
                                                                                                outf="$out$outsuffix"
                                                                                                cmd+=( "${args[@]}" )
                                                                                                log "Run: ${cmd[@]}"$'\n'"... &> $outf"
@@ -158,7 +158,7 @@ for plat in "${PLATFORMS[@]}"; do
                                                                                                                gzip --best "$out"
                                                                                                fi
                                                                                done
-                                                               done
+#                                                              done
             done
         done
     done