Flows: simplify construction of flow refiners

Author: N-Maas

mt-kahypar/partition/factories.h

@@ -33,7 +33,6 @@
 #include "mt-kahypar/partition/initial_partitioning/i_initial_partitioner.h"
 #include "mt-kahypar/partition/refinement/i_refiner.h"
 #include "mt-kahypar/partition/refinement/i_rebalancer.h"
-#include "mt-kahypar/partition/refinement/flows/i_flow_refiner.h"
 #include "mt-kahypar/partition/refinement/fm/fm_commons.h"
 #include "mt-kahypar/partition/refinement/fm/strategies/i_fm_strategy.h"
 #include "mt-kahypar/partition/refinement/gains/gain_cache_ptr.h"
@@ -64,6 +63,4 @@ using FlowSchedulerFactory = mt_kahypar::ThreadSafeFactory<FlowAlgorithm,
 
 using RebalancerFactory = mt_kahypar::ThreadSafeFactory<RebalancingAlgorithm, IRebalancer* (*)(HypernodeID, const Context&, gain_cache_t)>;
 
-using FlowRefinementFactory = mt_kahypar::ThreadSafeFactory<FlowAlgorithm,
-                              IFlowRefiner* (*)(const HyperedgeID, const Context&)>;
 }  // namespace mt_kahypar

mt-kahypar/partition/refinement/flows/flow_refinement_scheduler.cpp

@@ -29,8 +29,8 @@
 #include <chrono>
 
 #include "mt-kahypar/definitions.h"
-#include "mt-kahypar/partition/factories.h"
 #include "mt-kahypar/partition/metrics.h"
+#include "mt-kahypar/partition/refinement/flows/flow_refiner.h"
 #include "mt-kahypar/partition/refinement/gains/gain_definitions.h"
 #include "mt-kahypar/io/partitioning_output.h"
 #include "mt-kahypar/utils/utilities.h"
@@ -373,8 +373,7 @@ void FlowRefinementScheduler<GraphAndGainTypes>::initializeImpl(mt_kahypar_parti
   // Initialize Refiners
   for (auto& refiner: _refiner) {
     if ( refiner == nullptr ) {
-      refiner =  FlowRefinementFactory::getInstance().createObject(
-        _context.refinement.flows.algorithm, _num_hyperedges, _context);
+      refiner = constructFlowRefiner();
     }
   }
 
@@ -407,6 +406,11 @@ void FlowRefinementScheduler<GraphAndGainTypes>::resizeDataStructuresForCurrentK
   }
 }
 
+template<typename GraphAndGainTypes>
+std::unique_ptr<IFlowRefiner> FlowRefinementScheduler<GraphAndGainTypes>::constructFlowRefiner() {
+  return std::make_unique<FlowRefiner<GraphAndGainTypes>>(_num_hyperedges, _context);
+}
+
 namespace {
 
 template<typename PartitionedHypergraph, typename GainCache, typename F>

mt-kahypar/partition/refinement/flows/flow_refinement_scheduler.h

@@ -118,6 +118,8 @@ class FlowRefinementScheduler final : public IRefiner {
 
   void resizeDataStructuresForCurrentK();
 
+  std::unique_ptr<IFlowRefiner> constructFlowRefiner();
+
   template<typename F>
   HyperedgeWeight runFlowSearch(PartitionedHypergraph& phg,
                                 utils::Timer& timer,

mt-kahypar/partition/registries/register_refinement_algorithms.cpp

@@ -43,7 +43,6 @@
 #include "mt-kahypar/partition/refinement/fm/strategies/unconstrained_strategy.h"
 #include "mt-kahypar/partition/refinement/flows/do_nothing_refiner.h"
 #include "mt-kahypar/partition/refinement/flows/flow_refinement_scheduler.h"
-#include "mt-kahypar/partition/refinement/flows/flow_refiner.h"
 #include "mt-kahypar/partition/refinement/gains/gain_definitions.h"
 #include "mt-kahypar/partition/refinement/rebalancing/simple_rebalancer.h"
 #include "mt-kahypar/partition/refinement/rebalancing/advanced_rebalancer.h"
@@ -103,11 +102,6 @@ using AdvancedRebalancerDispatcher = kahypar::meta::StaticMultiDispatchFactory<
                                      IRebalancer,
                                      kahypar::meta::Typelist<GraphAndGainTypesList>>;
 
-using FlowRefinementDispatcher = kahypar::meta::StaticMultiDispatchFactory<
-                                 FlowRefiner,
-                                 IFlowRefiner,
-                                 kahypar::meta::Typelist<GraphAndGainTypesList>>;
-
 
 #define REGISTER_DISPATCHED_LP_REFINER(id, dispatcher, ...)                                            \
   kahypar::meta::Registrar<LabelPropagationFactory> register_ ## dispatcher(                           \
@@ -213,23 +207,6 @@ using FlowRefinementDispatcher = kahypar::meta::StaticMultiDispatchFactory<
     return new refiner(num_hypernodes, context, gain_cache);                                           \
   })
 
-#define REGISTER_DISPATCHED_FLOW_REFINER(id, dispatcher, ...)                                          \
-  kahypar::meta::Registrar<FlowRefinementFactory> register_ ## dispatcher(                             \
-    id,                                                                                                \
-    [](const HyperedgeID num_hyperedges, const Context& context) {                                     \
-    return dispatcher::create(                                                                         \
-      std::forward_as_tuple(num_hyperedges, context),                                                  \
-      __VA_ARGS__                                                                                      \
-      );                                                                                               \
-  })
-
-#define REGISTER_FLOW_REFINER(id, refiner, t)                                                   \
-  kahypar::meta::Registrar<FlowRefinementFactory> JOIN(register_ ## refiner, t)(                \
-    id,                                                                                         \
-    [](const HyperedgeID num_Hyperedges, const Context& context) -> IFlowRefiner* {             \
-    return new refiner(num_Hyperedges, context);                                                \
-  })
-
 
 kahypar::meta::PolicyBase& getGraphAndGainTypesPolicy(mt_kahypar_partition_type_t partition_type, GainPolicy gain_policy) {
   switch ( partition_type ) {
@@ -287,11 +264,6 @@ void register_refinement_algorithms() {
                                 AdvancedRebalancerDispatcher,
                                 getGraphAndGainTypesPolicy(context.partition.partition_type, context.partition.gain_policy));
   REGISTER_REBALANCER(RebalancingAlgorithm::do_nothing, DoNothingRefiner, 5);
-
-  REGISTER_DISPATCHED_FLOW_REFINER(FlowAlgorithm::flow_cutter,
-                                  FlowRefinementDispatcher,
-                                  getGraphAndGainTypesPolicy(context.partition.partition_type, context.partition.gain_policy));
-  REGISTER_FLOW_REFINER(FlowAlgorithm::do_nothing, DoNothingFlowRefiner, 6);
 }
 
 }  // namespace mt_kahypar

tests/partition/refinement/flow_refiner_mock.h

@@ -110,13 +110,4 @@ class FlowRefinerMock final : public IFlowRefiner {
   RefineFunc _refine_func;
 };
 
-#define REGISTER_FLOW_REFINER(id, refiner, t)                                                   \
-  static kahypar::meta::Registrar<FlowRefinementFactory> JOIN(register_ ## refiner, t)(         \
-    id,                                                                                         \
-    [](const HyperedgeID num_hyperedges, const Context& context) -> IFlowRefiner* {             \
-    return new refiner(num_hyperedges, context);                                                \
-  })
-
-REGISTER_FLOW_REFINER(FlowAlgorithm::mock, FlowRefinerMock, 1);
-
 }  // namespace mt_kahypar