getting rid of calls to cbrt
authorSameer Kumar <skumar2@uiuc.edu>
Sun, 17 Oct 2004 23:30:17 +0000 (23:30 +0000)
committerSameer Kumar <skumar2@uiuc.edu>
Sun, 17 Oct 2004 23:30:17 +0000 (23:30 +0000)
src/ck-com/AAMLearner.C
src/ck-com/AAPLearner.C
src/ck-com/AAPLearner.h
src/ck-com/ComlibManager.C

index fc510fb2aca5c2f5aff81ada49c5a5fa3b0c16c1..e771a3d22fa83a812fe06b94ee5dffbc77bd72bd 100644 (file)
@@ -108,7 +108,7 @@ double AAMLearner::computeHypercube(double P, double m, double d) {
 //P = number of processors, m = msgsize, d = degree
 double AAMLearner::computeGrid(double P, double m, double d) {
     double cost = 0.0;
-    cost = 3 * cbrt((double) P) * alpha;
+    cost = 3 * cubeRoot((double) P) * alpha;
     cost += d * m * (beta + gamma);
     
     return cost;
index 1ae490996595a8f8ecd7ca5972f1798857637cce..7223e16de5560ac3b35288890cc007df869588d6 100644 (file)
@@ -125,7 +125,7 @@ double AAPLearner::computeHypercube(double P, double m, double d) {
 //P = number of processors, m = msgsize, d = degree
 double AAPLearner::computeGrid(double P, double m, double d) {
     double cost = 0.0;
-    cost = 3 * cbrt((double) P) * alpha;
+    cost = 3 * cubeRoot((double) P) * alpha;
     cost += 3 * d * m * beta;
     
     return cost;
index 75b89499a8204c2309eaaf1137191a96bf87d9e6..49979d59ad1870c80c86a5c494ccb88fe98e1a36 100644 (file)
@@ -2,6 +2,7 @@
 #ifndef AAPLEARNER_H
 #define AAPLEARNER_H
 
+#include "comlib.h"
 #include "ComlibManager.h"
 #include "ComlibLearner.h"
 
index a04beba2b50ce8f5d60d3656722486d52f64690b..4ccc36e77b0133c09a374d1e4163a30e3ccea3d5 100644 (file)
@@ -70,7 +70,7 @@ void ComlibManager::init(){
     PUPable_reg(CharmStrategy);
     PUPable_reg(CharmMessageHolder);
     
-    //comm_debug = 1;
+    comm_debug = 1;
     
     numStatsReceived = 0;
     curComlibController = 0;
@@ -779,7 +779,7 @@ void ComlibManager::sendRemote(){
 
 void ComlibManager::AtSync() {
 
-    //comm_debug = 1;
+    comm_debug = 1;
     ComlibPrintf("[%d] In ComlibManager::Atsync, controller %d, ite %d\n", CkMyPe(), curComlibController, clibIteration);
 
     barrier2Reached = 0;