Execution scripts prepared. Some minor errors found in Merge methods.

generalRun.sh

@@ -2,7 +2,9 @@
 
 #SBATCH -N 1
 #SBATCH -p P1
-#SBATCH -t 00:10:00
+#SBATCH -t 00:15:00
+
+dirCG="/home/martini/malleable_cg"
 
 module load /home/martini/MODULES/modulefiles/mpich-4.0.3-ofi
 module load /home/martini/MODULES/modulefiles/intel64Only.module
@@ -16,8 +18,9 @@ numC=$3
 msm=$4
 mss=$5
 mrm=$6
+is_sync=$8
 
-initial_nodelist=$(bash BashScripts/createInitialNodelist.sh $numP $cores $nodelist)
-echo "Test"
-mpirun -hosts $initial_nodelist -np $numP ./build/a.out $matrix $numC $msm $mss $mrm $mss $nodelist $nodes
+initial_nodelist=$(bash $dirCG/BashScripts/createInitialNodelist.sh $numP $cores $nodelist)
+echo "Test numP=$numP numC=$numC Meths=$msm $mrm $mss -- Is_synch=$is_sync"
+mpirun -hosts $initial_nodelist -np $numP $dirCG/build/a.out $matrix $numC $msm $mss $mrm $mss $is_sync $nodelist $nodes
 echo "End"

runBase.sh

@@ -11,15 +11,16 @@ nodelist=$SLURM_JOB_NODELIST
 nodes=$SLURM_JOB_NUM_NODES
 cores=20
 numP=$1
-numC=4
+numC=2
 msm=1
-mss=2
-mrm=1
+mss=1
+mrm=0
+send_sync=1
 
 
 initial_nodelist=$(bash BashScripts/createInitialNodelist.sh $numP $cores $nodelist)
 echo "Test"
-mpirun -hosts $initial_nodelist -np $numP ./build/a.out bcsstk01.rsa $numC $msm $mss $mrm $mss $nodelist $nodes
+mpirun -hosts $initial_nodelist -np $numP ./build/a.out bcsstk01.rsa $numC $msm $mss $mrm $mss $send_sync $nodelist $nodes
 #mpirun -np 4 ./ConjugateGradient bcsstk17.rsa
 #mpirun -np 8 ./ConjugateGradient bcsstk01.rsa
 #mpirun -np 12 ./ConjugateGradient bcsstk01.rsa

runOFI.sh

@@ -6,37 +6,57 @@
 
 
 dirM="/home/martini/SparseMatrix/"
+dirCG="/home/martini/malleable_cg"
 #matrix="Queen_4147.rb"
 #matrix="audikw_1.rb"
 matrix="bcsstk01.rsa"
 
 #procs=(2 10 20 40 80 120 160)
-procs=(2)
+procs=(2 4)
 msm=(0 1)
 mss=(1 2)
 mrm=(0 1)
-mrs=(1 2)
+is_syncs=(1 0)
 
 echo $matrix
 for proc in "${procs[@]}"
 do
   echo "------------------------------------------run np=$proc next=0"
-
-  node_qty=$(($proc / 20))
-  if [ $node_qty -eq 0 ]
-  then
-    node_qty=1
-  fi
-
-  for sm_type in "${msm[@]}"
+  for proc_c in "${procs[@]}"
   do
-    for ss_type in "${mss[@]}"
-    do
-      for rm_type in "${mrm[@]}"
+    if [ $proc -ne $proc_c ]
+    then
+
+      max_numP=$proc
+      if [ "$proc_c" -gt "$proc" ];
+      then
+        max_numP=$proc_c
+      fi
+      node_qty=$(($max_numP / 20))
+      if [ $node_qty -eq 0 ]
+      then
+        node_qty=1
+      fi
+
+      for sm_type in "${msm[@]}"
       do
-        sbatch -p P1 -N $node_qty ./generalRun.sh $proc $dirM$matrix 4 $sm_type $ss_type $rm_type $ss_type
+        for rm_type in "${mrm[@]}"
+        do
+          for is_sync in "${is_syncs[@]}"
+          do
+            if [ $is_sync -eq 1 ] # Matrix is send syncrhonously
+            then
+              sbatch -p P1 -N $node_qty $dirCG/generalRun.sh $proc $dirM$matrix $proc_c $sm_type 1 $rm_type 1 $is_sync
+  	    else # Matrix is send asyncrhonously
+              for ss_type in "${mss[@]}"
+              do
+                sbatch -p P1 -N $node_qty $dirCG/generalRun.sh $proc $dirM$matrix $proc_c $sm_type $ss_type $rm_type $ss_type $is_sync
+	      done
+ 	    fi
+          done
+        done
       done
-    done
+    fi
   done
 done