Separate MPI tests by MPI barriers

Author: franzpoeschel

test/ParallelIOTest.cpp

@@ -36,6 +36,16 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers_string.hpp>
 
+#define PARALLEL_TEST_CASE(name, tags)                                         \
+    static void openPMD_parallel_##name();                                     \
+    TEST_CASE(#name, tags)                                                     \
+    {                                                                          \
+        MPI_Barrier(MPI_COMM_WORLD);                                           \
+        openPMD_parallel_##name();                                             \
+        MPI_Barrier(MPI_COMM_WORLD);                                           \
+    }                                                                          \
+    static void openPMD_parallel_##name()
+
 #if !openPMD_HAVE_MPI
 TEST_CASE("none", "[parallel]")
 {}
@@ -80,7 +90,7 @@ TEST_CASE("none", "[parallel]")
 
 using namespace openPMD;
 
-TEST_CASE("parallel_multi_series_test", "[parallel]")
+PARALLEL_TEST_CASE(parallel_multi_series_test, "[parallel]")
 {
     std::list<Series> allSeries;
 
@@ -223,7 +233,7 @@ void write_test_zero_extent(
 #endif
 
 #if openPMD_HAVE_HDF5 && openPMD_HAVE_MPI
-TEST_CASE("git_hdf5_sample_content_test", "[parallel][hdf5]")
+PARALLEL_TEST_CASE(git_hdf5_sample_content_test, "[parallel][hdf5]")
 {
     int mpi_rank{-1};
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
@@ -307,7 +317,7 @@ TEST_CASE("git_hdf5_sample_content_test", "[parallel][hdf5]")
     }
 }
 
-TEST_CASE("hdf5_write_test", "[parallel][hdf5]")
+PARALLEL_TEST_CASE(hdf5_write_test, "[parallel][hdf5]")
 {
     int mpi_s{-1};
     int mpi_r{-1};
@@ -377,13 +387,13 @@ TEST_CASE("hdf5_write_test", "[parallel][hdf5]")
     o.flush("hdf5.independent_stores = false");
 }
 
-TEST_CASE("hdf5_write_test_zero_extent", "[parallel][hdf5]")
+PARALLEL_TEST_CASE(hdf5_write_test_zero_extent, "[parallel][hdf5]")
 {
     write_test_zero_extent(false, "h5", true, true);
     write_test_zero_extent(true, "h5", true, true);
 }
 
-TEST_CASE("hdf5_write_test_skip_chunk", "[parallel][hdf5]")
+PARALLEL_TEST_CASE(hdf5_write_test_skip_chunk, "[parallel][hdf5]")
 {
     //! @todo add via JSON option instead of environment read
     auto const hdf5_collective =
@@ -397,7 +407,7 @@ TEST_CASE("hdf5_write_test_skip_chunk", "[parallel][hdf5]")
         REQUIRE(true);
 }
 
-TEST_CASE("hdf5_write_test_skip_declare", "[parallel][hdf5]")
+PARALLEL_TEST_CASE(hdf5_write_test_skip_declare, "[parallel][hdf5]")
 {
     //! @todo add via JSON option instead of environment read
     auto const hdf5_collective =
@@ -413,7 +423,7 @@ TEST_CASE("hdf5_write_test_skip_declare", "[parallel][hdf5]")
 
 #else
 
-TEST_CASE("no_parallel_hdf5", "[parallel][hdf5]")
+PARALLEL_TEST_CASE(no_parallel_hdf5, "[parallel][hdf5]")
 {
     REQUIRE(true);
 }
@@ -495,7 +505,7 @@ void available_chunks_test(std::string const &file_ending)
     }
 }
 
-TEST_CASE("available_chunks_test", "[parallel][adios]")
+PARALLEL_TEST_CASE(available_chunks_test, "[parallel][adios]")
 {
     available_chunks_test("bp");
 }
@@ -550,14 +560,14 @@ void extendDataset(std::string const &ext, std::string const &jsonConfig)
     }
 }
 
-TEST_CASE("extend_dataset", "[parallel]")
+PARALLEL_TEST_CASE(extend_dataset, "[parallel]")
 {
     extendDataset("bp", R"({"backend": "adios2"})");
 }
 #endif
 
 #if openPMD_HAVE_ADIOS2 && openPMD_HAVE_MPI
-TEST_CASE("adios_write_test", "[parallel][adios]")
+PARALLEL_TEST_CASE(adios_write_test, "[parallel][adios]")
 {
     Series o = Series(
         "../samples/parallel_write.bp",
@@ -645,25 +655,25 @@ TEST_CASE("adios_write_test", "[parallel][adios]")
     }
 }
 
-TEST_CASE("adios_write_test_zero_extent", "[parallel][adios]")
+PARALLEL_TEST_CASE(adios_write_test_zero_extent, "[parallel][adios]")
 {
     write_test_zero_extent(false, "bp", true, true);
     write_test_zero_extent(true, "bp", true, true);
 }
 
-TEST_CASE("adios_write_test_skip_chunk", "[parallel][adios]")
+PARALLEL_TEST_CASE(adios_write_test_skip_chunk, "[parallel][adios]")
 {
     write_test_zero_extent(false, "bp", false, true);
     write_test_zero_extent(true, "bp", false, true);
 }
 
-TEST_CASE("adios_write_test_skip_declare", "[parallel][adios]")
+PARALLEL_TEST_CASE(adios_write_test_skip_declare, "[parallel][adios]")
 {
     write_test_zero_extent(false, "bp", false, false);
     write_test_zero_extent(true, "bp", false, false);
 }
 
-TEST_CASE("hzdr_adios_sample_content_test", "[parallel][adios2][bp3]")
+PARALLEL_TEST_CASE(hzdr_adios_sample_content_test, "[parallel][adios2][bp3]")
 {
     int mpi_rank{-1};
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
@@ -743,7 +753,7 @@ void write_4D_test(std::string const &file_ending)
     o.flush();
 }
 
-TEST_CASE("write_4D_test", "[parallel]")
+PARALLEL_TEST_CASE(write_4D_test, "[parallel]")
 {
     for (auto const &t : getBackends())
     {
@@ -776,7 +786,7 @@ void write_makeconst_some(std::string const &file_ending)
         E_x.makeConstant(42);
 }
 
-TEST_CASE("write_makeconst_some", "[parallel]")
+PARALLEL_TEST_CASE(write_makeconst_some, "[parallel]")
 {
     for (auto const &t : getBackends())
     {
@@ -883,7 +893,7 @@ void close_iteration_test(std::string const &file_ending)
     }
 }
 
-TEST_CASE("close_iteration_test", "[parallel]")
+PARALLEL_TEST_CASE(close_iteration_test, "[parallel]")
 {
     for (auto const &t : getBackends())
     {
@@ -1002,7 +1012,7 @@ void file_based_write_read(std::string const &file_ending)
     }
 }
 
-TEST_CASE("file_based_write_read", "[parallel]")
+PARALLEL_TEST_CASE(file_based_write_read, "[parallel]")
 {
     return;
     for (auto const &t : getBackends())
@@ -1182,7 +1192,7 @@ void hipace_like_write(std::string const &file_ending)
     }
 }
 
-TEST_CASE("hipace_like_write", "[parallel]")
+PARALLEL_TEST_CASE(hipace_like_write, "[parallel]")
 {
     for (auto const &t : getBackends())
     {
@@ -1192,7 +1202,7 @@ TEST_CASE("hipace_like_write", "[parallel]")
 #endif
 
 #if openPMD_HAVE_ADIOS2 && openPMD_HAVE_MPI
-TEST_CASE("independent_write_with_collective_flush", "[parallel]")
+PARALLEL_TEST_CASE(independent_write_with_collective_flush, "[parallel]")
 {
     Series write(
         "../samples/independent_write_with_collective_flush.bp5",
@@ -1226,7 +1236,7 @@ TEST_CASE("independent_write_with_collective_flush", "[parallel]")
 #endif
 
 #if openPMD_HAVE_MPI
-TEST_CASE("unavailable_backend", "[core][parallel]")
+PARALLEL_TEST_CASE(unavailable_backend, "[core][parallel]")
 {
 #if !openPMD_HAVE_ADIOS2
     {
@@ -1374,15 +1384,15 @@ void adios2_streaming(bool variableBasedLayout)
     }
 }
 
-TEST_CASE("adios2_streaming", "[pseudoserial][adios2]")
+PARALLEL_TEST_CASE(adios2_streaming, "[pseudoserial][adios2]")
 {
 #if HAS_ADIOS_2_9
     adios2_streaming(true);
 #endif // HAS_ADIOS_2_9
     adios2_streaming(false);
 }
 
-TEST_CASE("parallel_adios2_json_config", "[parallel][adios2]")
+PARALLEL_TEST_CASE(parallel_adios2_json_config, "[parallel][adios2]")
 {
     int size{-1};
     int rank{-1};
@@ -1593,7 +1603,7 @@ void adios2_ssc()
     }
 }
 
-TEST_CASE("adios2_ssc", "[parallel][adios2]")
+PARALLEL_TEST_CASE(adios2_ssc, "[parallel][adios2]")
 {
     adios2_ssc();
 }
@@ -1919,7 +1929,7 @@ void append_mode(
 #endif
 }
 
-TEST_CASE("append_mode", "[serial]")
+PARALLEL_TEST_CASE(append_mode, "[serial]")
 {
     for (auto const &t : testedFileExtensions())
     {
@@ -2122,7 +2132,7 @@ void joined_dim(std::string const &ext)
     }
 }
 
-TEST_CASE("joined_dim", "[parallel]")
+PARALLEL_TEST_CASE(joined_dim, "[parallel]")
 {
 #if 100000000 * ADIOS2_VERSION_MAJOR + 1000000 * ADIOS2_VERSION_MINOR +        \
         10000 * ADIOS2_VERSION_PATCH + 100 * ADIOS2_VERSION_TWEAK >=           \
@@ -2147,7 +2157,7 @@ TEST_CASE("joined_dim", "[parallel]")
 
 #if openPMD_HAVE_ADIOS2_BP5
 // Parallel version of the same test from SerialIOTest.cpp
-TEST_CASE("adios2_flush_via_step")
+PARALLEL_TEST_CASE(adios2_flush_via_step, "[parallel]")
 {
     int size_i(0), rank_i(0);
     MPI_Comm_rank(MPI_COMM_WORLD, &rank_i);
@@ -2254,12 +2264,12 @@ TEST_CASE("adios2_flush_via_step")
 }
 #endif
 
-TEST_CASE("read_variablebased_randomaccess")
+PARALLEL_TEST_CASE(read_variablebased_randomaccess, "[parallel]")
 {
     read_variablebased_randomaccess::read_variablebased_randomaccess();
 }
 
-TEST_CASE("iterate_nonstreaming_series", "[serial][adios2]")
+PARALLEL_TEST_CASE(iterate_nonstreaming_series, "[parallel][adios2]")
 {
     iterate_nonstreaming_series::iterate_nonstreaming_series();
 }
@@ -2720,14 +2730,14 @@ void run_test()
 }
 } // namespace adios2_chunk_distribution
 
-TEST_CASE("adios2_chunk_distribution", "[parallel][adios2]")
+PARALLEL_TEST_CASE(adios2_chunk_distribution, "[parallel][adios2]")
 {
     adios2_chunk_distribution::run_test();
 }
 #endif // openPMD_HAVE_ADIOS2 && openPMD_HAVE_MPI
 
 #if openPMD_HAVE_MPI
-TEST_CASE("bug_1655_bp5_writer_hangup", "[parallel]")
+PARALLEL_TEST_CASE(bug_1655_bp5_writer_hangup, "[parallel]")
 {
     bug_1655_bp5_writer_hangup::bug_1655_bp5_writer_hangup();
 }