make topo a nodegroup.
authorGengbin Zheng <gzheng@illinois.edu>
Thu, 27 Sep 2012 21:23:44 +0000 (16:23 -0500)
committerGengbin Zheng <gzheng@illinois.edu>
Thu, 27 Sep 2012 21:23:44 +0000 (16:23 -0500)
tests/charm++/load_balancing/lb_test/Topo.C
tests/charm++/load_balancing/lb_test/Topo.ci
tests/charm++/load_balancing/lb_test/lb_test.C

index 91e5bd27de3b78861e67674786c5a2a2aee4adac..a7d4da9172ba9fdce804cd8c010a9a9f37dbce8f 100644 (file)
@@ -131,7 +131,7 @@ void Topo::FindComputeTimes()
     // CkPrintf("%d work %f\n", i, work);
     total_work += work;
   }
-  if (CkMyPe() == 0)
+  if (CkMyNode() == 0)
     CkPrintf("[%d] Total work/step = %f sec\n",CkMyPe(),total_work*1e-6);
       
 }
index c505cae33c4943265175a9f1b924da27742692b1..f2b5f52ba87b4421eb779e665716f8e2106c5c7f 100644 (file)
@@ -2,7 +2,7 @@ module Topo {
 
 message TopoInitMsg;
 
-group Topo {
+nodegroup Topo {
   entry Topo(TopoInitMsg*); 
        entry void shuffleLoad(void);
 };
index 765fb2e0d2cd80b325cc50b6970dcf7d0b21ab42..3f8ed2ac0dd01feca70bf2fa5d6db95626803c12 100644 (file)
@@ -302,7 +302,7 @@ public:
 #if DYNAMIC_IMBALANCE
        else if(nTimes > n_loadbalance && (nTimes-(n_loadbalance/2)) % n_loadbalance == 0) {
                //printf("Here at %d\n",nTimes);
-               contribute(CkCallback(CkIndex_Topo::shuffleLoad(),topoid));
+               contribute(CkCallback(CkIndex_Topo::shuffleLoad(),topoid,1));
        } 
 #endif
        else ForwardMessages();