fix tests

kahypar · Nov 29, 2024 · 8f6a7a4 · 8f6a7a4
1 parent ab5af9a
commit 8f6a7a4
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 23 deletions.
diff --git a/tests/datastructures/array_test.cc b/tests/datastructures/array_test.cc
@@ -31,19 +31,12 @@
 
 #include "mt-kahypar/parallel/stl/scalable_vector.h"
 #include "mt-kahypar/datastructures/array.h"
-#include "mt-kahypar/parallel/hardware_topology.h"
-#include "mt-kahypar/parallel/tbb_initializer.h"
-#include "tests/parallel/topology_mock.h"
 
 using ::testing::Test;
 
 namespace mt_kahypar {
 namespace ds {
 
-using TopoMock = mt_kahypar::parallel::TopologyMock<2>;
-using HwTopology = mt_kahypar::parallel::HardwareTopology<TopoMock, parallel::topology_t, parallel::node_t>;
-using TBB = mt_kahypar::parallel::TBBInitializer<HwTopology, false>;
-
 TEST(AArray, WritesAnValueToStrippedVector1) {
   Array<int> vec(256, 0);
   vec[0] = 31;

diff --git a/tests/datastructures/hypergraph_fixtures.h b/tests/datastructures/hypergraph_fixtures.h
@@ -29,15 +29,26 @@
 #include "gmock/gmock.h"
 
 #include "mt-kahypar/definitions.h"
-#include "mt-kahypar/parallel/hardware_topology.h"
 #include "mt-kahypar/parallel/tbb_initializer.h"
-#include "tests/parallel/topology_mock.h"
+
+#ifndef KAHYPAR_DISABLE_HWLOC
+  #include "mt-kahypar/parallel/hardware_topology.h"
+  #include "tests/parallel/topology_mock.h"
+#endif
 
 using ::testing::Test;
 
 namespace mt_kahypar {
 namespace ds {
 
+#ifndef KAHYPAR_DISABLE_HWLOC
+  using TopoMock = mt_kahypar::parallel::TopologyMock<2>;
+  using HwTopology = mt_kahypar::parallel::HardwareTopology<TopoMock, parallel::topology_t, parallel::node_t>;
+  using TBB = mt_kahypar::parallel::TBBInitializer<HwTopology, false>;
+#else
+  using TBB = mt_kahypar::parallel::SimpleTBBInitializer;
+#endif
+
 static auto identity = [](const HypernodeID& id) { return id; };
 
 template<typename Hypergraph, bool useGraphStructure = false>

diff --git a/tests/parallel/memory_pool_test.cc b/tests/parallel/memory_pool_test.cc
@@ -30,20 +30,12 @@
 #include <tbb/task_group.h>
 
 #include "mt-kahypar/parallel/memory_pool.h"
-#include "mt-kahypar/parallel/hardware_topology.h"
-#include "mt-kahypar/parallel/tbb_initializer.h"
-#include "tests/parallel/topology_mock.h"
 
 using ::testing::Test;
 
 namespace mt_kahypar {
 namespace parallel {
 
-using TopoMock = mt_kahypar::parallel::TopologyMock<2>;
-using HwTopology = mt_kahypar::parallel::HardwareTopology<TopoMock, parallel::topology_t, parallel::node_t>;
-using TBB = mt_kahypar::parallel::TBBInitializer<HwTopology, false>;
-
-
 template <class F, class K>
 void executeConcurrent(F f1, K f2) {
   std::atomic<int> cnt(0);

diff --git a/tests/partition/initial_partitioning/CMakeLists.txt b/tests/partition/initial_partitioning/CMakeLists.txt
@@ -1,9 +1,11 @@
 target_sources(mtkahypar_tests PRIVATE
         flat_initial_partitioner_test.cc
         initial_partitioning_data_container_test.cc
-        pool_initial_partitioner_test.cc
         )
 
-if(NOT KAHYPAR_DISABLE_BOOST)
+if(NOT KAHYPAR_DISABLE_BOOST AND NOT KAHYPAR_DISABLE_HWLOC)
         target_sources(mtkahypar_tests PRIVATE initial_partitioner_test.cc)
 endif()
+if(NOT KAHYPAR_DISABLE_HWLOC)
+        target_sources(mtkahypar_tests PRIVATE pool_initial_partitioner_test.cc)
+endif()
diff --git a/tests/partition/refinement/CMakeLists.txt b/tests/partition/refinement/CMakeLists.txt
@@ -4,7 +4,6 @@ target_sources(mtkahypar_tests PRIVATE
          scheduler_test.cc
 #         quotient_graph_test.cc
          gain_policy_test.cc
-         label_propagation_refiner_test.cc
          rollback_test.cc
          rebalance_test.cc
          advanced_rebalancer_test.cc
@@ -16,7 +15,8 @@ target_sources(mtkahypar_tests PRIVATE
          )
 
 if(NOT KAHYPAR_DISABLE_BOOST)
-    target_sources(mtkahypar_tests PRIVATE
-        bipartitioning_gain_policy_test.cc
-        )
+    target_sources(mtkahypar_tests PRIVATE bipartitioning_gain_policy_test.cc)
+endif()
+if(NOT KAHYPAR_DISABLE_HWLOC)
+    target_sources(mtkahypar_tests PRIVATE label_propagation_refiner_test.cc)
 endif()