refactor(contraction): remove legacy buffered contraction code (#71)

KaHIP · Jan 29, 2025 · 38c9047 · 38c9047
1 parent 680059e
commit 38c9047
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 224 deletions.
diff --git a/kaminpar-cli/kaminpar_arguments.cc b/kaminpar-cli/kaminpar_arguments.cc
@@ -271,7 +271,6 @@ Options are:
   - disable: Do not merge two-hop singleton clusters
   - match:   Join two-hop singleton clusters pairwise
   - cluster: Cluster two-hop singleton clusters into a single cluster (respecting the maximum cluster weight limit)
-  - legacy:  Use v2.1 default behaviour
   )")
       ->capture_default_str();
   lp->add_option(
@@ -309,7 +308,6 @@ CLI::Option_group *create_contraction_coarsening_options(CLI::App *app, Context
       ->description(R"(The algorithm used for contraction.
 Options are:
   - buffered:         Use an edge buffer that is partially filled
-  - buffered-legacy:  Use an edge buffer
   - unbuffered:       Use no edge buffer by remapping the coarse nodes
   - unbuffered-naive: Use no edge buffer by computing twice
   )")

diff --git a/kaminpar-shm/coarsening/contraction/cluster_contraction.cc b/kaminpar-shm/coarsening/contraction/cluster_contraction.cc
@@ -17,7 +17,6 @@
 
 // ... configurable contraction algorithms:
 #include "kaminpar-shm/coarsening/contraction/buffered_cluster_contraction.h"
-#include "kaminpar-shm/coarsening/contraction/legacy_buffered_cluster_contraction.h"
 #include "kaminpar-shm/coarsening/contraction/naive_unbuffered_cluster_contraction.h"
 #include "kaminpar-shm/coarsening/contraction/unbuffered_cluster_contraction.h"
 
@@ -41,8 +40,6 @@ std::unique_ptr<CoarseGraph> contract_clustering(
   switch (con_ctx.algorithm) {
   case ContractionAlgorithm::BUFFERED:
     return contract_clustering_buffered(graph, std::move(clustering), con_ctx, m_ctx);
-  case ContractionAlgorithm::BUFFERED_LEGACY:
-    return contract_clustering_buffered_legacy(graph, std::move(clustering), con_ctx, m_ctx);
   case ContractionAlgorithm::UNBUFFERED:
     return contract_clustering_unbuffered(graph, std::move(clustering), con_ctx, m_ctx);
   case ContractionAlgorithm::UNBUFFERED_NAIVE:

diff --git a/kaminpar-shm/coarsening/contraction/legacy_buffered_cluster_contraction.cc b/kaminpar-shm/coarsening/contraction/legacy_buffered_cluster_contraction.cc
diff --git a/kaminpar-shm/coarsening/contraction/legacy_buffered_cluster_contraction.h b/kaminpar-shm/coarsening/contraction/legacy_buffered_cluster_contraction.h
diff --git a/kaminpar-shm/context_io.cc b/kaminpar-shm/context_io.cc
@@ -389,8 +389,6 @@ std::ostream &operator<<(std::ostream &out, const ContractionAlgorithm mode) {
   switch (mode) {
   case ContractionAlgorithm::BUFFERED:
     return out << "buffered";
-  case ContractionAlgorithm::BUFFERED_LEGACY:
-    return out << "buffered-legacy";
   case ContractionAlgorithm::UNBUFFERED:
     return out << "unbuffered";
   case ContractionAlgorithm::UNBUFFERED_NAIVE:
@@ -403,7 +401,6 @@ std::ostream &operator<<(std::ostream &out, const ContractionAlgorithm mode) {
 std::unordered_map<std::string, ContractionAlgorithm> get_contraction_algorithms() {
   return {
       {"buffered", ContractionAlgorithm::BUFFERED},
-      {"buffered-legacy", ContractionAlgorithm::BUFFERED_LEGACY},
       {"unbuffered", ContractionAlgorithm::UNBUFFERED},
       {"unbuffered-naive", ContractionAlgorithm::UNBUFFERED_NAIVE},
   };

diff --git a/kaminpar-shm/kaminpar.h b/kaminpar-shm/kaminpar.h
@@ -186,7 +186,6 @@ enum class TieBreakingStrategy {
 
 enum class ContractionAlgorithm {
   BUFFERED,
-  BUFFERED_LEGACY,
   UNBUFFERED,
   UNBUFFERED_NAIVE,
 };