fix(common): is_span() return'd wrong value when using the overcommit…

… tag
KaHIP · Sep 25, 2024 · fedefa2 · fedefa2
1 parent 3777844
commit fedefa2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/kaminpar-common/datastructures/static_array.h b/kaminpar-common/datastructures/static_array.h
@@ -197,7 +197,7 @@ template <typename T> class StaticArray {
   }
 
   [[nodiscard]] bool is_span() const {
-    return _owned_data.get() == nullptr;
+    return _owned_data.get() == nullptr && _overcommited_data.get() == nullptr;
   }
 
   //

diff --git a/kaminpar-shm/initial_partitioning/initial_coarsener.cc b/kaminpar-shm/initial_partitioning/initial_coarsener.cc
@@ -246,7 +246,7 @@ InitialCoarsener::ContractionResult InitialCoarsener::contract_current_clusterin
 
   std::fill(_cluster_sizes.begin(), _cluster_sizes.begin() + n, 0);
   std::fill(_leader_node_mapping.begin(), _leader_node_mapping.begin() + n, 0);
-  // Note:_clustering does not need to be cleared
+  // Note: _clustering does not need to be cleared
 
   _timings.contract_ms += timer.elapsed();
 

diff --git a/kaminpar-shm/initial_partitioning/sequential_graph_hierarchy.cc b/kaminpar-shm/initial_partitioning/sequential_graph_hierarchy.cc
@@ -24,6 +24,23 @@ void SequentialGraphHierarchy::init(const CSRGraph &graph) {
 void SequentialGraphHierarchy::push(CSRGraph &&c_graph, StaticArray<NodeID> &&c_mapping) {
   KASSERT(current().n() == c_mapping.size());
 
+  KASSERT(
+      !c_graph.raw_nodes().is_span(),
+      "span-based coarse graph should not be used with the sequential graph hierarchy"
+  );
+  KASSERT(
+      !c_graph.raw_edges().is_span(),
+      "span-based coarse graph should not be used with the sequential graph hierarchy"
+  );
+  KASSERT(
+      !c_graph.raw_node_weights().is_span(),
+      "span-based coarse graph should not be used with the sequential graph hierarchy"
+  );
+  KASSERT(
+      !c_graph.raw_edge_weights().is_span(),
+      "span-based coarse graph should not be used with the sequential graph hierarchy"
+  );
+
   _coarse_mappings.push_back(std::move(c_mapping));
   _coarse_graphs.push_back(std::move(c_graph));
 }