Make sure that Kokkos is initialized on all ranks in unit test

kokkos · May 8, 2024 · 467e8c0 · 467e8c0
1 parent d30b3fd
commit 467e8c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/unit_tests/Test_Empty.cpp b/unit_tests/Test_Empty.cpp
@@ -23,7 +23,4 @@ using RemoteSpace_t = Kokkos::Experimental::DefaultRemoteMemorySpace;
 
 void test_empty() { RemoteSpace_t::fence(); }
 
-TEST(TEST_CATEGORY, test_empty) {
-  test_empty();
-  MPI_Barrier(MPI_COMM_WORLD);
-}
+TEST(TEST_CATEGORY, test_empty) { test_empty(); }
diff --git a/unit_tests/Test_Main.cpp b/unit_tests/Test_Main.cpp
@@ -21,6 +21,8 @@
 
 #include <Kokkos_RemoteSpaces.hpp>
 
+using RemoteSpace_t = Kokkos::Experimental::DefaultRemoteMemorySpace;
+
 int main(int argc, char *argv[]) {
   int mpi_thread_level_available;
   int mpi_thread_level_required = MPI_THREAD_MULTIPLE;
@@ -54,6 +56,7 @@ int main(int argc, char *argv[]) {
 
   Kokkos::initialize(argc, argv);
   ::testing::InitGoogleTest(&argc, argv);
+  RemoteSpace_t::fence();
   int result = RUN_ALL_TESTS();
 
   Kokkos::finalize();