update multilevel Sarkar

Author: raphael-s-steiner

apps/coarser_plotter.cpp

@@ -53,7 +53,7 @@ int main(int argc, char *argv[]) {
     params.leniency = 0.005;
     params.maxWeight = 15000;
     params.smallWeightThreshold = 4000;
-    params.buffer_merge_mode = SarkarParams::BufferMergeMode::HOMOGENEOUS;
+    params.buffer_merge_mode = SarkarParams::BufferMergeMode::FULL;
 
     SarkarMul<Graph_t, Graph_t> coarser;
     coarser.setParameters(params);

apps/test_suite_runner/StringToScheduler/get_coarser.hpp

@@ -233,9 +233,9 @@ get_multilevel_coarser_by_name(const ConfigParser &, const boost::property_tree:
                 else if (mode_str == "FAN_IN") ml_params.buffer_merge_mode = SarkarParams::BufferMergeMode::FAN_IN;
                 else if (mode_str == "FAN_OUT") ml_params.buffer_merge_mode = SarkarParams::BufferMergeMode::FAN_OUT;
                 else if (mode_str == "HOMOGENEOUS") ml_params.buffer_merge_mode = SarkarParams::BufferMergeMode::HOMOGENEOUS;
-                else if (mode_str == "MIX") ml_params.buffer_merge_mode = SarkarParams::BufferMergeMode::MIX;
+                else if (mode_str == "FULL") ml_params.buffer_merge_mode = SarkarParams::BufferMergeMode::FULL;
                 else throw std::invalid_argument("Invalid Sarkar Buffer Merge mode: " + mode_str
-                    + "!\nChoose from: OFF, FAN_IN, FAN_OUT, HOMOGENEOUS, MIX.");
+                    + "!\nChoose from: OFF, FAN_IN, FAN_OUT, HOMOGENEOUS, FULL.");
             }
         }
 

include/osp/coarser/Sarkar/SarkarMul.hpp

@@ -26,7 +26,7 @@ namespace osp {
 
 namespace SarkarParams {
 
-enum class BufferMergeMode { OFF, FAN_IN, FAN_OUT, HOMOGENEOUS, MIX };
+enum class BufferMergeMode { OFF, FAN_IN, FAN_OUT, HOMOGENEOUS, FULL };
 
 template<typename commCostType>
 struct MulParameters {
@@ -239,55 +239,35 @@ RETURN_STATUS SarkarMul<Graph_t, Graph_t_coarse>::run_buffer_merges() {
     RETURN_STATUS status = RETURN_STATUS::OSP_SUCCESS;
 
     unsigned no_change = 0;
-    while (no_change < ml_params.max_num_iteration_without_changes) {
-        switch (ml_params.buffer_merge_mode)
-        {
-            case SarkarParams::BufferMergeMode::FAN_IN:
-                {
-                    params.mode = SarkarParams::Mode::FAN_IN_BUFFER;
-                }
-                break;
-
-            case SarkarParams::BufferMergeMode::FAN_OUT:
-                {
-                    params.mode = SarkarParams::Mode::FAN_OUT_BUFFER;
-                }
-                break;
-
-            case SarkarParams::BufferMergeMode::HOMOGENEOUS:
-                {
-                    params.mode = SarkarParams::Mode::HOMOGENEOUS_BUFFER;
-                }
-                break;
-
-            case SarkarParams::BufferMergeMode::MIX:
-                {
-                    if (thue_coin.get_flip()) {
-                        params.mode = SarkarParams::Mode::HOMOGENEOUS_BUFFER;
-                    } else {
-                        params.mode = thue_coin.get_flip() ? SarkarParams::Mode::FAN_IN_BUFFER : SarkarParams::Mode::FAN_OUT_BUFFER;
-                    }
-                }
-                break;
-
-            default:
-                {
-                    params.mode = SarkarParams::Mode::HOMOGENEOUS_BUFFER;
-                }
-                break;
-        }
-        updateParams();
-
+    while (no_change < ml_params.max_num_iteration_without_changes) {        
         vertex_idx_t<Graph_t> diff = 0;
-        status = std::max(status, run_single_contraction_mode(diff));
+        if ((ml_params.buffer_merge_mode == SarkarParams::BufferMergeMode::HOMOGENEOUS) || (ml_params.buffer_merge_mode == SarkarParams::BufferMergeMode::FULL && diff == 0)) {
+            params.mode = SarkarParams::Mode::HOMOGENEOUS_BUFFER;
+            updateParams();
+            status = std::max(status, run_single_contraction_mode(diff));
+        }
+        if (ml_params.buffer_merge_mode == SarkarParams::BufferMergeMode::FAN_IN) {
+            params.mode = SarkarParams::Mode::FAN_IN_BUFFER;
+            updateParams();
+            status = std::max(status, run_single_contraction_mode(diff));
+        }
+        if (ml_params.buffer_merge_mode == SarkarParams::BufferMergeMode::FAN_OUT) {
+            params.mode = SarkarParams::Mode::FAN_OUT_BUFFER;
+            updateParams();
+            status = std::max(status, run_single_contraction_mode(diff));
+        }
+        if (ml_params.buffer_merge_mode == SarkarParams::BufferMergeMode::FULL && diff == 0) {
+            params.mode = thue_coin.get_flip() ? SarkarParams::Mode::FAN_IN_BUFFER : SarkarParams::Mode::FAN_OUT_BUFFER;
+            updateParams();
+            status = std::max(status, run_single_contraction_mode(diff));
+        }
 
         if (diff > 0) {
             no_change = 0;
+            status = std::max(status, run_contractions( ml_params.commCostVec.back() ));        
         } else {
             no_change++;
         }
-
-        status = std::max(status, run_contractions( ml_params.commCostVec.back() ));        
     }
 
     return status;