From 5e09a276777b11d1a74181066e44ef6e124a18d7 Mon Sep 17 00:00:00 2001
From: Eugen Betke <betke@dkrz.de>
Date: Tue, 13 Nov 2018 16:07:38 +0100
Subject: [PATCH] Minor changes

---
 benchmark/config.sh                     | 34 ++++++++++++-------------
 benchmark/run_v2.sh                     |  4 +--
 benchmark/tool_estimate_time_remains.sh | 16 +++++-------
 3 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/benchmark/config.sh b/benchmark/config.sh
index 5be3bc64e..4ae04015c 100755
--- a/benchmark/config.sh
+++ b/benchmark/config.sh
@@ -5,18 +5,16 @@ hostname=$(hostname)
 
 
 if [[ "isc17" == ${hostname:0:5} ]]; then
-    echo "Loading ISC17 configuration"
     export MODULEPATH=/esfs/jtacquaviva/software/modules:$MODULEPATH
     module purge
     module load ddn/mvapich/3.1.4
-    module load betke/hdf5/1.8.20-ddn
-    module load betke/ior/git-ddn
+    module load root/hdf5/1.10.4
+    module load root/ior/git-20181107
     module list
     export TD="/esfs/jtacquaviva/testfiles"
     export WD="/esfs/jtacquaviva/git/ddn-ime-evaluation/benchmark"
-    export NODES=( isc17-c04 isc17-c01 isc17-c02 isc17-c03 isc17-c05 isc17-c06 isc17-c07 isc17-c08 isc17-c09 isc17-c12 isc17-c13 isc17-c14 isc17-c15 isc17-c18 isc17-c22 )
+    export NODES=( isc17-c04 isc17-c05 isc17-c02 isc17-c03 isc17-c05 isc17-c06 isc17-c07 isc17-c08 isc17-c09 isc17-c12 isc17-c13 isc17-c14 isc17-c15 isc17-c18 isc17-c22 isc17-c01 )
 elif [[ "m" == ${hostname:0:1} ]]; then
-    echo "Loading Mistral configuration"
     . /sw/rhel6-x64/tcl/modules-3.2.10/Modules/3.2.10/init/sh
     export MODULEPATH=$MODULEPATH:/work/ku0598/k202107/software/modules
     module purge
@@ -40,20 +38,22 @@ fi
 # DATASIZE = 76800MB
 DATASIZE=$((4800 * 1024 * 1024 * 16))
 
-#TYPE_ARR=( "read" "write" )
-#API_ARR=( "MPIIO" "POSIX")
-#NN_ARR=( 1 2 4 8 16)
-#PPN_ARR=( 8 4 1 )
-#T_ARR=( $((10*1024*1024)) $((1*1024*1024)) $((100*1024)) $((16*1024)) )
+COUNT_ARR=( $(seq 3) )
+TYPE_ARR=( "read" "write" )
+API_ARR=( "MPIIO" "POSIX")
+NN_ARR=( 1 2 4 8 16)
+PPN_ARR=( 8 4 1 )
+T_ARR=( $((10*1024*1024)) $((1*1024*1024)) $((100*1024)) $((16*1024)) )
 
-TYPE_ARR=( "write" )
-API_ARR=( "POSIX")
-NN_ARR=( 1 )
-PPN_ARR=( 8 )
-T_ARR=( $((10*1024*1024)) )
+#COUNT_ARR=( $(seq 3) )
+#TYPE_ARR=( "write" )
+#API_ARR=( "POSIX")
+#NN_ARR=( 1 )
+#PPN_ARR=( 8 )
+#T_ARR=( $((10*1024*1024)) )
 
 export IOR="$(which ior)"
 export MPIEXEC="$(which mpiexec)"
 
-type ior >/dev/null 2>&1     && echo "Found $IOR" || { echo >&2 "I require ior but it's not installed.  Aborting."; exit 1; }
-type mpiexec >/dev/null 2>&1 && echo "Found $MPIEXEC" || { echo >&2 "I require mpiexec but it's not installed.  Aborting."; exit 1; } 
+type ior >/dev/null 2>&1     || { echo >&2 "I require ior but it's not installed.  Aborting."; exit 1; }
+type mpiexec >/dev/null 2>&1 || { echo >&2 "I require mpiexec but it's not installed.  Aborting."; exit 1; } 
diff --git a/benchmark/run_v2.sh b/benchmark/run_v2.sh
index 7e40e4020..52c060d73 100755
--- a/benchmark/run_v2.sh
+++ b/benchmark/run_v2.sh
@@ -21,7 +21,7 @@ function hosts() {
 }
 
 
-for COUNT in $(seq 1); do
+for COUNT in ${COUNT_ARR[@]}; do
 for TYPE in ${TYPE_ARR[@]}; do
 for NN in ${NN_ARR[@]}; do 
 for T in ${T_ARR[@]}; do 
@@ -36,7 +36,7 @@ for API in ${API_ARR[@]}; do
         [ ! -d $OUTDIR ] && mkdir $OUTDIR
         touch $BENCHFILE
 
-        #$MPIEXEC $MPIEXEC_PARAMS ./drop_caches.sh
+        $MPIEXEC $MPIEXEC_PARAMS ./drop_caches.sh
 
         IOR_TYPE_OPTS=""
         if [[ "read" == $TYPE ]]; then
diff --git a/benchmark/tool_estimate_time_remains.sh b/benchmark/tool_estimate_time_remains.sh
index 0f2f61d4d..37cc248b3 100755
--- a/benchmark/tool_estimate_time_remains.sh
+++ b/benchmark/tool_estimate_time_remains.sh
@@ -1,15 +1,11 @@
 #!/bin/bash
 
+. ./config.sh
 
-
-API_ARR=( "POSIX" "MPIIO" )
-NN_ARR=( 4 2 1 8  16)
-PPN_ARR=( 8 6 4 2 1 )
-T_ARR=( $((10*1024*1024)) $((1*1024*1024)) $((100*1024)) $((16*1024)) )
-
-
-done="$(find output -type f | wc -l)"
-todo=$((${#API_ARR[@]} * ${#NN_ARR[@]} * ${#PPN_ARR[@]} * ${#T_ARR[@]}))
+set -x
+done="$(find output_v2 -type f | wc -l)"
+todo=$((${#COUNT_ARR[@]} * ${#TYPE_ARR[@]} * ${#API_ARR[@]} * ${#NN_ARR[@]} * ${#PPN_ARR[@]} * ${#T_ARR[@]}))
 remains=$(($todo - $done))
+set +x
 
-echo "$(($remains * 2 * 6 / 60)) h"
+echo "$(($remains * 1 / 60)) h"