Modifying the control point command line arguments.
authorIsaac Dooley <idooley2@illinois.edu>
Tue, 3 Nov 2009 19:32:27 +0000 (19:32 +0000)
committerIsaac Dooley <idooley2@illinois.edu>
Tue, 3 Nov 2009 19:32:27 +0000 (19:32 +0000)
src/ck-cp/controlPoints.C

index 050b6364550ea52165e3aacbcee11100408e53b1..a489b02071b6e23cb11cc1a5616af2c499f5b2be 100644 (file)
@@ -121,8 +121,10 @@ controlPointManager::controlPointManager(){
     ControlPoint::initControlPointEffects();
 
     phase_id = 0;
-    
-    loadDataFile();
+
+    if(loadDataFileAtStartup){    
+      loadDataFile();
+    }
     
     if(allData.phases.size()>0){
       allData.findBest();
@@ -715,11 +717,11 @@ public:
       whichTuningScheme = RandomSelection;
     } else if ( CmiGetArgFlagDesc(args->argv,"+CPExhaustiveSearch","Exhaustive Search of Control Point Values") ){
       whichTuningScheme = ExhaustiveSearch;
-    } else if ( CmiGetArgFlagDesc(args->argv,"+CPSimulatedAnnealing","Simulated Annealing Search of Control Point Values") ){
+    } else if ( CmiGetArgFlagDesc(args->argv,"+CPSimulAnneal","Simulated Annealing Search of Control Point Values") ){
       whichTuningScheme = SimulatedAnnealing;
-    } else if ( CmiGetArgFlagDesc(args->argv,"+CPCriticalPathAutoPrioritization","Use Critical Path to adapt Control Point Values") ){
+    } else if ( CmiGetArgFlagDesc(args->argv,"+CPCriticalPathPrio","Use Critical Path to adapt Control Point Values") ){
       whichTuningScheme = CriticalPathAutoPrioritization;
-    } else if ( CmiGetArgFlagDesc(args->argv,"+CPUseBestKnownTiming","Use BestKnown Timing for Control Point Values") ){
+    } else if ( CmiGetArgFlagDesc(args->argv,"+CPBestKnown","Use BestKnown Timing for Control Point Values") ){
       whichTuningScheme = UseBestKnownTiming;
     } 
 
@@ -734,9 +736,6 @@ public:
       loadDataFileAtStartup = true;
     }
 
-
-
-
     controlPointManagerProxy = CProxy_controlPointManager::ckNew();
   }
   ~controlPointMain(){}
@@ -1097,7 +1096,6 @@ int controlPoint(const char *name, int lb, int ub){
   } else {
     result = valueProvidedByOptimizer(name);
   } 
-
    
   CkAssert(isInRange(result,ub,lb));
   thisPhaseData.controlPoints.insert(std::make_pair(std::string(name),result)); 
@@ -1106,6 +1104,7 @@ int controlPoint(const char *name, int lb, int ub){
   return result;
 }
 
+
 /// Get control point value from set of provided integers
 int controlPoint(const char *name, std::vector<int>& values){
   instrumentedPhase &thisPhaseData = controlPointManagerProxy.ckLocalBranch()->thisPhaseData;