Revert "Revert "correcting typos""

This reverts commit aec96ae.

Author: alielabridi

.gitignore

@@ -88,3 +88,4 @@ $RECYCLE.BIN/
 
 # Windows shortcuts
 *.lnk
+sftp-config.json

sftp-config.json

@@ -1,4 +1,5 @@
 {
+    //to be private
     // The tab key will cycle through the settings when first created
     // Visit http://wbond.net/sublime_packages/sftp/settings for help
 

strassen.C

@@ -85,12 +85,12 @@ class Main : public CBase_Main {
 
         }
         else if(correctness){
-            CkPrintf("Strassen - Correct: matrix size = %d, Threshold = %d,# of proc = %d, Exec time = %lf sec (cpp: %lf) \n",  size, THRESHOLD,CkNumPes(),endtimer-starttimer,elapsed_secs);
-            myfile<<"Strassen - Correct: matrix size = " <<size<<", Threshold = "<< THRESHOLD<<",# of proc = "<<CkNumPes()<<" , Exec time = " << endtimer-starttimer << "\n";
+            CkPrintf("Charm++ - Correct: matrix size = %d, Threshold = %d,# of proc = %d, Exec time = %lf sec (cpp: %lf) \n",  size, THRESHOLD,CkNumPes(),endtimer-starttimer,elapsed_secs);
+            myfile<<"Charm++ - Correct: matrix size = " <<size<<", Threshold = "<< THRESHOLD<<",# of proc = "<<CkNumPes()<<" , Exec time = " << endtimer-starttimer << "\n";
         }
         else{
-            CkPrintf("Strassen - Incorrect: matrix size = %d, Threshold = %d,# of proc = %d, Exec time = %lf sec \n",  size, THRESHOLD,CkNumPes(),endtimer-starttimer);
-            myfile<<"Strassen - Incorrect: matrix size = " <<size<<", Threshold = "<< THRESHOLD<<",# of proc = "<<CkNumPes()<<" , Exec time = " << endtimer-starttimer << "\n";
+            CkPrintf("Charm++ - Incorrect: matrix size = %d, Threshold = %d,# of proc = %d, Exec time = %lf sec \n",  size, THRESHOLD,CkNumPes(),endtimer-starttimer);
+            myfile<<"Charm++ - Incorrect: matrix size = " <<size<<", Threshold = "<< THRESHOLD<<",# of proc = "<<CkNumPes()<<" , Exec time = " << endtimer-starttimer << "\n";
         }
   myfile.close();
         delete m;
@@ -242,15 +242,10 @@ class strassen : public CBase_strassen  {
 
             ValueMsg * m1 = (ValueMsg *) CkWaitFuture(p1Future);
             ValueMsg * m2 = (ValueMsg *) CkWaitFuture(p2Future);
-           
             ValueMsg * m3 = (ValueMsg *) CkWaitFuture(p3Future);
-           
             ValueMsg * m4 = (ValueMsg *) CkWaitFuture(p4Future);
-
             ValueMsg * m5 = (ValueMsg *) CkWaitFuture(p5Future);
-
             ValueMsg * m6 = (ValueMsg *) CkWaitFuture(p6Future);
-
             ValueMsg * m7 = (ValueMsg *) CkWaitFuture(p7Future);
 
             /*do we need another chare for the C1,C2,C3,C4 ?*/

testing.sh

@@ -4,10 +4,6 @@
 # do
 # 	for THRESHOLD in {3..6}
 # 		do
-# 			if [$THRESHOLD > $size]
-# 			then
-# 				break
-# 			fi
 # 			for proc in {1..10}
 # 				do
 # 					./charmrun ./strassen $((2**$size)) $((2**$THRESHOLD)) 0 +p$proc
@@ -19,33 +15,10 @@
 # done
 
 
-# for size in {8..10}
-# do
-# 	for THRESHOLD in {5..7}
-# 		do
-# 			if [$THRESHOLD > $size]
-# 			then
-# 				break
-# 			fi
-# 			for proc in {1..10}
-# 				do
-# 					./charmrun ./strassen $((2**$size)) $((2**$THRESHOLD)) 0 +p$proc
-# 					./OpenMP $((2**$size)) $((2**$THRESHOLD)) $proc
-# 				done
-
-# 		done
-# 	./charmrun ./strassen $((2**$size)) $((2**$size)) 0 +p1
-# done
-
-
-for size in {7..9}
+for size in {10..12}
 do
-	for THRESHOLD in {5..6}
+	for THRESHOLD in {6..7}
 		do
-			if [$THRESHOLD > $size]
-			then
-				break
-			fi
 			for proc in {1..10}
 				do
 					./charmrun ./strassen $((2**$size)) $((2**$THRESHOLD)) 0 +p$proc
@@ -54,4 +27,5 @@ do
 
 		done
 	./charmrun ./strassen $((2**$size)) $((2**$size)) 0 +p1
-done
+done
+