From 96418bf4a49757e65e9e14ae643dd6c625f22c23 Mon Sep 17 00:00:00 2001
From: Eugen Betke <betke@dkrz.de>
Date: Mon, 22 Oct 2018 08:59:54 +0200
Subject: [PATCH] Test files

---
 run.sh              | 13 +++++++------
 show_node_status.sh | 33 ++++++---------------------------
 2 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/run.sh b/run.sh
index ab8737e08..3a033a0a7 100755
--- a/run.sh
+++ b/run.sh
@@ -19,7 +19,8 @@ function hosts() {
     echo $hlist
 }
  -D $((120))
-export MODULEPATH=/gsfs/betke/software/modules:$MODULEPATH
+#export MODULEPATH=/gsfs/betke/software/modules:$MODULEPATH
+export MODULEPATH=/esfs/jtacquaviva/software/modules:$MODULEPATH
 
 module purge
 module load betke/hdf5/1.8.20-ddn
@@ -47,9 +48,9 @@ for API in ${API_ARR[@]}; do
     BENCHFILE="./output/COUNT:$COUNT#NN:$NN#PPN:$PPN#API:$API#T:$T.txt"
 
 	if [ ! -e "${BENCHFILE}" ]; then
-        OUTDIR="$(dirname $BENCHFILE)"
+		OUTDIR="$(dirname $BENCHFILE)"
         if [ ! -d $OUTDIR ]; then
-            mkdir $OUTDIR
+		mkdir $OUTDIR
         fi
         touch $BENCHFILE
 
@@ -59,14 +60,14 @@ for API in ${API_ARR[@]}; do
 
         TESTDIR="$(dirname $LUSTRE_TESTFILE_WRITE)"
         if [ -d $TESTDIR ]; then
-            rm -r $TESTDIR
+		rm -r $TESTDIR
         fi
         mkdir -p $TESTDIR 
         lfs setstripe	-c $((2 * $NN)) $TESTDIR
 	(
         set -x
         $MPIEXEC $MPIEXEC_PARAMS $IOR $IOR_PARAMS -o $LUSTRE_TESTFILE_WRITE -w | tee -a $BENCHFILE
-	$MPIEXEC $MPIEXEC_PARAMS /gsfs/betke/git/ime-evaluation/drop_caches.sh
+	$MPIEXEC $MPIEXEC_PARAMS /esfs/jtacquaviva/git/ime-evaluation/drop_caches.sh
         $MPIEXEC $MPIEXEC_PARAMS $IOR $IOR_PARAMS -o $LUSTRE_TESTFILE_READ -r | tee -a $BENCHFILE
         set +x
 	) 2> >(tee -a $BENCHFILE)
@@ -74,7 +75,7 @@ for API in ${API_ARR[@]}; do
         lfs getstripe $TESTDIR | tee -a $BENCHFILE
 	else
 		echo "skip $(readlink -f $BENCHFILE), already exists"
-    fi
+	fi
 
 done
 done
diff --git a/show_node_status.sh b/show_node_status.sh
index b31e6741b..ca59ffa70 100755
--- a/show_node_status.sh
+++ b/show_node_status.sh
@@ -4,40 +4,17 @@ function join_by() {
 	local IFS="$1"; shift; echo "$*"; 
 }
 
-
-cx4nodes=( \
-isc17-c02 \
-isc17-c03 \
-isc17-c04 \
-isc17-c05 \
-isc17-c06 \
-isc17-c07 \
-isc17-c08 \
-isc17-c09 \
-isc17-c10 \
-isc17-c11 \
-isc17-c12 \
-isc17-c13 \
-isc17-c14 \
-isc17-c15 \
-isc17-c18 \
-isc17-c19 \
-isc17-c20 \
-isc17-c22 \
-isc17-c23 \
-isc17-c01 \
-)
-
-#cx4nodes=( isc17-c0{1..9} isc17-c{10..22} )
+cx4nodes=( isc17-c0{1..9} isc17-c{10..23} )
 node_list=$( join_by , "${cx4nodes[@]}" )
 
 
 IFS='' read -r -d '' script <<"EOF"
 if [ -d /esfs/jtacquaviva ]; then
-	if [ -d /gsfs/betke ]; then
+	cx4="$(lspci | grep ConnectX-4)"
+	if [[ "" != $cx4 ]]; then
 		echo 'ok'
 	else 
-		echo "failed: $(hostname) /gsfs/ is not mounted"
+		echo "failed: $(hostname) no cx4"
 	fi
 else 
 	echo "failed: $(hostname) /esfs/ is not mounted"
@@ -60,7 +37,9 @@ for node in ${cx4nodes[@]}; do
 	fi
 done
 
+echo "GOOD NODES:"
 echo "${good_nodes[@]}"
+echo "GOOD NODES (Komma separated):"
 echo $( join_by , "${good_nodes[@]}" )