Minor script changes

micro_run.py

@@ -7,21 +7,35 @@ module load betke/hdf5/1.8.20-ddn
 module load betke/ior/git-ddn
 module list
 
+IOTYPE="shared"
 NN=16
-NODES='isc17-c01,isc17-c02,isc17-c03,isc17-c04,isc17-c05,isc17-c06,isc17-c07,isc17-c08,isc17-c09,isc17-c11,isc17-c12,isc17-c13,isc17-c14,isc17-c15,isc17-c18,isc17-c22'
+NODES='isc17-c02,isc17-c03,isc17-c04,isc17-c05,isc17-c06,isc17-c07,isc17-c08,isc17-c09,isc17-c11,isc17-c12,isc17-c13,isc17-c14,isc17-c15,isc17-c18,isc17-c22,isc17-c01'
+
+if [[ "shared" == $IOTYPE ]]; then 
+    LUSTRE_TESTFILE="/esfs/jtacquaviva/sharedread${NN}/file"
+elif [[ "posix" == $IOTYPE ]]; then 
+    LUSTRE_TESTFILE="/esfs/jtacquaviva/indread${NN}/file"
+fi
 
-LUSTRE_TESTFILE="/esfs/jtacquaviva/indread${NN}/file"
 TESTDIR="$(dirname $LUSTRE_TESTFILE)"
 mkdir $TESTDIR
 lfs setstripe -c $(($NN * 2)) $TESTDIR
+
 ITERATIONS=1
-IOR="$(which ior) -i $ITERATIONS -s 1 -t $((16 * 1024 * 1024)) -b $((4800 * 1024 * 1024 * 32)) -o $LUSTRE_TESTFILE -a POSIX -F -e -g -k -w"
+
+if [[ "shared" == $IOTYPE ]]; then 
+    IOR="$(which ior) -i $ITERATIONS -s 1 -t $((16 * 1024 * 1024)) -b $((4800 * 1024 * 1024 * 32 / 8)) -o $LUSTRE_TESTFILE -a MPIIO -e -g -k -w"
+elif [[ "posix" == $IOTYPE ]]; then 
+    IOR="$(which ior) -i $ITERATIONS -s 1 -t $((16 * 1024 * 1024)) -b $((4800 * 1024 * 1024 * 32)) -o $LUSTRE_TESTFILE -a POSIX -F -e -g -k -w"
+fi
+
+
 ENVVAR="-genv MV2_NUM_HCAS 1 -genv MV2_CPU_BINDING_LEVEL core -genv MV2_CPU_BINDING_POLICY scatter"
 MPIEXEC="/opt/ddn/mvapich/bin/mpiexec -ppn 8 -np $((8*$NN)) $ENVVAR -hosts isc17-c04,isc17-c05"
 
 set -x
 $MPIEXEC $IOR 
 #$MPIEXEC $IOR -r -D $((5*60)) 
--set +x
+set +x
 #rm $LUSTRE_TESTFILE
 

run.sh

@@ -39,8 +39,8 @@ MPIEXEC="/opt/ddn/mvapich/bin/mpiexec"
 
 API_ARR=( "POSIX" "MPIIO" )
 #NN_ARR=( 4 2 1 8 10 16)
-NN_ARR=( 16 )
-PPN_ARR=( 8 6 4 2 1 )
+NN_ARR=( 1 2 8 )
+PPN_ARR=( 8 4 1 6 2)
 T_ARR=( $((10*1024*1024)) $((1*1024*1024)) $((100*1024)) $((16*1024)) )
 
 for COUNT in $(seq 1); do
@@ -68,7 +68,7 @@ for API in ${API_ARR[@]}; do
         fi
 
 
-        IOR_PARAMS="-i $ITERATIONS -s 1 -t $T -b $((4800 * 1024 * 1024 * 32 / $PPN)) -D $((120)) -a $API $IOR_API_OPTS -e -g -z -k"
+        IOR_PARAMS="-i $ITERATIONS -s 1 -t $T -b $((4800 * 1024 * 1024 * 32 / $PPN)) -D $((60)) -a $API $IOR_API_OPTS -e -g -z -k"
 	    ENVVAR="-genv MV2_NUM_HCAS 1 -genv MV2_CPU_BINDING_LEVEL core -genv MV2_CPU_BINDING_POLICY scatter"
         MPIEXEC_PARAMS=" -ppn $PPN -np $(($NN * $PPN)) $ENVVAR --hosts $(hosts $NN) "
 

tool_show_bad_output_files.sh

@@ -8,7 +8,7 @@ find "./output" -type f -name "*.txt" -print0 |
 		if [[ "" != ${status} ]]; then
 			if [[ "delete" == $force_delete ]]; then
 				set -x
-					rm $fn
+					git rm $fn
 				set +x
 			else
 				echo "Bad output: $fn"