greedyrecomp test suite and upgrades

Author: papp-pal-andras

apps/config/bsp_test_suite_config.json

@@ -18,16 +18,30 @@
             "parameters": {}
         },
         {
-            "name": "GreedyRecomputer",
+            "name": "GreedyRecomputerMask7",
+            "id": "GreedyRecomputer",
             "run" : true,
-            "name_suffix" : "Locking",
+            "name_suffix" : "GreedyBsp",
             "parameters": {
+                "methodmask" : 7,
                 "scheduler": {
-                    "name": "BspLocking",
+                    "name": "GreedyBspHC",
+                    "id": "LocalSearch",
+                    "run" : true,
+                    "name_suffix" : "GreedyBspHC",
                     "parameters": {
-                    "max_percent_idle_processors": 0.4,
-                    "increase_parallelism_in_new_superstep": true
-                    }                    
+                        "improver": {
+                            "name" : "hill_climb" 
+                        },
+                        "scheduler": {
+                            "name": "GreedyBsp",
+                            "id": "GreedyBsp",
+                            "parameters": {
+                                "max_percent_idle_processors": 0.2,
+                                "increase_parallelism_in_new_superstep": true
+                            }
+                        }                
+                    }                
                 } 
             }
         },

apps/test_suite_runner/AbstractTestSuiteRunner.hpp

@@ -312,6 +312,8 @@ class AbstractTestSuiteRunner {
                     continue;
                 }
 
+                bspInstance.SetAllOnesCompatibilityMatrix();
+
                 for (auto &algorithmConfigPair : parser_.scheduler_) {
                     const pt::ptree &algoConfig = algorithmConfigPair.second;
 

apps/test_suite_runner/StringToScheduler/run_bsp_recomp_scheduler.hpp

@@ -45,9 +45,14 @@ ReturnStatus RunBspRecompScheduler(const ConfigParser &parser,
 
     std::cout << "Running algorithm: " << algorithm.get_child("name").get_value<std::string>() << std::endl;
 
-    if (algorithm.get_child("name").get_value<std::string>() == "GreedyRecomputer") {
+    if (algorithm.get_child("id").get_value<std::string>() == "GreedyRecomputer") {
         BspSchedule<GraphT> bspSchedule(schedule.GetInstance());
 
+        unsigned methodMask = algorithm.get_child("parameters").get_child("methodmask").get_value<unsigned>();
+        if (methodMask > 7) {
+            return ReturnStatus::ERROR;
+        }
+
         ReturnStatus status = RunBspScheduler(parser, algorithm.get_child("parameters").get_child("scheduler"), bspSchedule);
 
         BspScheduleCS<GraphT> initialSchedule(std::move(bspSchedule));
@@ -58,7 +63,11 @@ ReturnStatus RunBspRecompScheduler(const ConfigParser &parser,
 
         GreedyRecomputer<GraphT> scheduler;
 
-        return scheduler.ComputeRecompScheduleBasic(initialSchedule, schedule);
+        if (methodMask == 0) {
+            return scheduler.ComputeRecompScheduleBasic(initialSchedule, schedule);
+        } else {
+            return scheduler.ComputeRecompScheduleAdvanced(initialSchedule, schedule, methodMask);
+        }
 
     } else {
         throw std::invalid_argument("Parameter error: Unknown algorithm.\n");

apps/test_suite_runner/StringToScheduler/run_bsp_scheduler.hpp

@@ -196,7 +196,16 @@ ReturnStatus RunBspScheduler(const ConfigParser &parser,
 
         std::unique_ptr<ImprovementScheduler<GraphT>> improver
             = GetBspImproverByName<GraphT>(parser, algorithm.get_child("parameters").get_child("improver"));
-        return improver->ImproveSchedule(schedule);
+
+        const unsigned timeLimit = parser.globalParams_.get_optional<unsigned>("timeLimit").value_or(std::numeric_limits<unsigned>::max());
+        improver->SetTimeLimitSeconds(timeLimit);
+        if (timeLimit == std::numeric_limits<unsigned>::max()) {
+            return improver->ImproveSchedule(schedule);
+        } else {
+            return improver->ImproveScheduleWithTimeLimit(schedule);
+        }
+
+
 #ifdef COPT
     } else if (id == "FullILP") {
         CoptFullScheduler<GraphT> scheduler;

include/osp/bsp/model/BspScheduleRecomp.hpp

@@ -211,7 +211,7 @@ bool BspScheduleRecomp<GraphT>::SatisfiesConstraints() const {
 
         if (nodeFirstAvailableOnProc[node][fromProc] > val) {
             // std::cout << "Not a valid schedule: node " << node << " not yet available for sending from processor "
-            // << from_proc << " in superstep "<< val <<"." << std::endl;
+            // << fromProc << " in superstep "<< val <<"." << std::endl;
             return false;
         }
     }
@@ -341,7 +341,7 @@ void BspScheduleRecomp<Graph_t>::CleanSchedule()
     for (auto const &[key, val] : commSchedule_) {
         arrivesAt[std::get<0>(key)][std::get<2>(key)].insert(val);
     }
-    
+
     // - computation steps
     for (const auto &node : instance_->GetComputationalDag().Vertices()) {
         for (unsigned index = 0; index < nodeToProcessorAndSupertepAssignment_[node].size(); ) {
@@ -386,7 +386,7 @@ void BspScheduleRecomp<Graph_t>::CleanSchedule()
         usedAt[std::get<0>(key)][std::get<1>(key)].insert(val);
     }
 
-    // - computation steps    
+    // - computation steps
     for (const auto &node : instance_->GetComputationalDag().Vertices()) {
         for (unsigned index = 0; index < nodeToProcessorAndSupertepAssignment_[node].size(); ) {
             const auto &procAndStep = nodeToProcessorAndSupertepAssignment_[node][index];