Various Fixes

kahypar · Dec 7, 2024 · d7a91ab · d7a91ab
1 parent 8ab7428
commit d7a91ab
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/branch_ci.yml b/.github/workflows/branch_ci.yml
@@ -1,9 +1,9 @@
 name: Mt-KaHyPar Fast CI
 
-on:
-  push:
-    branches-ignore:
-      - master
+#on:
+#  push:
+#    branches-ignore:
+#      - master
 
 jobs:
   mt_kahypar_compiler_version_test:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -78,7 +78,7 @@ option(KAHYPAR_ENABLE_STEINER_TREE_METRIC
   "Enables the Steiner tree metric. Can be turned off for faster compilation." OFF)
 
 option(KAHYPAR_PYTHON
-  "Build the Python interface. Can be turned off in case Python is not available." ON)
+  "Build the Python interface. Can be turned off in case Python is not available." OFF)
 
 option(MT_KAHYPAR_DISABLE_BOOST
   "Whether to exclude components requiring Boost::program_options. Will result in no binary target and the C and Python interface not being able to load configuration files." OFF)

diff --git a/mt-kahypar/dynamic/strategies/localFM.h b/mt-kahypar/dynamic/strategies/localFM.h
@@ -32,6 +32,12 @@ namespace mt_kahypar::dyn {
         //use local_fm to refine partitioned_hypergraph_s
         void local_fm(ds::StaticHypergraph& hypergraph, Context& context, const HypernodeID& hn) {
 
+          //TODO
+          //context.refinement.fm.algorithm = FMAlgorithm::kway_fm;
+
+          //TODO
+          //context.refinement.fm.multitry_rounds = 1;
+
           //GainCachePtr::deleteGainCache(_gain_cache);
           //TODO maybe
           GainCachePtr::resetGainCache(_gain_cache);

diff --git a/mt-kahypar/dynamic/strategies/localFM_factor.h b/mt-kahypar/dynamic/strategies/localFM_factor.h
@@ -17,6 +17,7 @@ namespace mt_kahypar::dyn {
         gain_cache_t _gain_cache;
         std::unique_ptr<IRefiner> _fm;
         std::unique_ptr<IRebalancer> _rebalancer;
+        parallel::scalable_vector<HypernodeID> nodes_to_partition;
 
         void repartition(ds::StaticHypergraph& hypergraph_s, Context& context) {
           std::cout << "Repartitioning" << std::endl;
@@ -32,7 +33,7 @@ namespace mt_kahypar::dyn {
         }
 
         //use local_fm to refine partitioned_hypergraph_s
-        void local_fm(ds::StaticHypergraph& hypergraph, Context& context, const HypernodeID& hn) {
+        void local_fm(ds::StaticHypergraph& hypergraph, Context& context) {
 
           //GainCachePtr::deleteGainCache(_gain_cache);
           //TODO maybe
@@ -47,11 +48,13 @@ namespace mt_kahypar::dyn {
           Metrics best_Metrics = {mt_kahypar::metrics::quality(*partitioned_hypergraph_s, Objective::km1),
                                   mt_kahypar::metrics::imbalance(*partitioned_hypergraph_s, context)};
 
-          _fm->refine(partitioned_hypergraph, {hn}, best_Metrics, std::numeric_limits<double>::max());
+          _fm->refine(partitioned_hypergraph, nodes_to_partition, best_Metrics, std::numeric_limits<double>::max());
         }
 
         PartitionID add_node_to_partitioned_hypergraph(ds::StaticHypergraph& hypergraph, Context& context, const HypernodeID& hn) {
 
+          nodes_to_partition.push_back(hn);
+
           //compute for each block the number of nodes it is connected to
           std::vector<std::tuple<int,int>> block_connectivities(context.partition.k, std::make_tuple(0,0));
           for ( PartitionID p = 0; p < context.partition.k; ++p ) {
@@ -81,6 +84,7 @@ namespace mt_kahypar::dyn {
 
           //on first call, initialize partitioned_hypergraph_s
           if (!partitioned_hypergraph_s) {
+            nodes_to_partition = parallel::scalable_vector<HypernodeID>(changes_size);
             repartition(hypergraph, context);
           }
 
@@ -110,7 +114,8 @@ namespace mt_kahypar::dyn {
           if (skipped_changes >= step_size) {
             skipped_changes = 0;
             step_size *= 2;
-            local_fm(hypergraph, context, hn);
+            local_fm(hypergraph, context);
+            nodes_to_partition = parallel::scalable_vector<HypernodeID>(changes_size);
           } else {
             skipped_changes++;
           }