reverse temporary updates for testing

rapidsai · Nov 14, 2024 · 6507e31 · 6507e31
1 parent 3115b32
commit 6507e31
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/cpp/tests/traversal/mg_bfs_test.cpp b/cpp/tests/traversal/mg_bfs_test.cpp
@@ -341,10 +341,10 @@ INSTANTIATE_TEST_SUITE_P(
     std::make_tuple(
       BFS_Usecase{0, false, false},
       cugraph::test::Rmat_Usecase(
-        20, 16, 0.57, 0.19, 0.19, 0, true /* undirected */, false /* scramble vertex IDs */)),
+        20, 16, 0.57, 0.19, 0.19, 0, false, false /* scramble vertex IDs */)),
     std::make_tuple(
       BFS_Usecase{0, true, false},
       cugraph::test::Rmat_Usecase(
-        20, 16, 0.57, 0.19, 0.19, 0, true /* undirected */, false /* scramble vertex IDs */))));
+        20, 16, 0.57, 0.19, 0.19, 0, false, false /* scramble vertex IDs */))));
 
 CUGRAPH_MG_TEST_PROGRAM_MAIN()
diff --git a/cpp/tests/traversal/mg_graph500_bfs_test.cu b/cpp/tests/traversal/mg_graph500_bfs_test.cu
@@ -73,8 +73,8 @@ class Tests_GRAPH500_MGBFS
   static void SetUpTestCase()
   {
     size_t pool_size =
-      16;  // note that CUDA_DEVICE_MAX_CONNECTIONS (default: 8) should be set to a value larger
-           // than pool_size to avoid false dependency among different streams
+      8;  // note that CUDA_DEVICE_MAX_CONNECTIONS (default: 8) should be set to a value larger than
+          // pool_size to avoid false dependency among different streams
     handle_ = cugraph::test::initialize_mg_handle(pool_size);
   }
 

diff --git a/cpp/tests/utilities/base_fixture.hpp b/cpp/tests/utilities/base_fixture.hpp
@@ -77,14 +77,10 @@ inline auto make_pool(bool use_max = false)
   // effect the maximum amount of parallel tests, and therefore `tests/CMakeLists.txt`
   // `_CUGRAPH_TEST_PERCENT` default value will need to be audited.
   auto const [free, total] = rmm::available_device_memory();
-  auto const init_alloc =
+  auto const min_alloc =
     use_max ? rmm::align_down(std::min(free, total / 2), rmm::CUDA_ALLOCATION_ALIGNMENT)
             : rmm::align_down(std::min(free, total / 10), rmm::CUDA_ALLOCATION_ALIGNMENT);
-  std::optional<size_t> max_alloc{};
-  if (use_max) {
-    max_alloc = init_alloc;
-  }
-  return rmm::mr::make_owning_wrapper<rmm::mr::pool_memory_resource>(make_cuda(), init_alloc, max_alloc);
+  return rmm::mr::make_owning_wrapper<rmm::mr::pool_memory_resource>(make_cuda(), min_alloc);
 }
 
 inline auto make_binning()
@@ -236,9 +232,6 @@ inline auto parse_test_options(int argc, char** argv)
 #define CUGRAPH_MG_TEST_PROGRAM_MAIN()                                                  \
   int main(int argc, char** argv)                                                       \
   {                                                                                     \
-    if (setenv("CUDA_DEVICE_MAX_CONNECTIONS", "18", 1) != 0) {                          \
-      std::cerr << "setenv() returned ret" << std::endl;                                \
-    }                                                                                   \
     cugraph::test::initialize_mpi(argc, argv);                                          \
     auto comm_rank = cugraph::test::query_mpi_comm_world_rank();                        \
     auto comm_size = cugraph::test::query_mpi_comm_world_size();                        \