Move ChangingShape.Multiblock to standalone test and add various comp…

…ressors to it if they are available (blosc, mgard, zfp). Tests: Engine.BP.*/BPChangingShapeWithinStep.MultiBlock/*.
ornladios · Apr 7, 2023 · 231c82d · 231c82d
1 parent c8224b9
commit 231c82d
Show file tree

Hide file tree

Showing 4 changed files with 291 additions and 388 deletions.
diff --git a/testing/adios2/engine/bp/CMakeLists.txt b/testing/adios2/engine/bp/CMakeLists.txt
@@ -130,6 +130,7 @@ bp_gtest_add_tests_helper(WriteReadLocalVariables MPI_ALLOW)
 bp_gtest_add_tests_helper(WriteReadLocalVariablesSel MPI_ALLOW)
 bp_gtest_add_tests_helper(WriteReadLocalVariablesSelHighLevel MPI_ALLOW)
 bp_gtest_add_tests_helper(ChangingShape MPI_ALLOW)
+bp_gtest_add_tests_helper(ChangingShapeWithinStep MPI_ALLOW)
 bp_gtest_add_tests_helper(WriteReadBlockInfo MPI_ALLOW)
 bp_gtest_add_tests_helper(WriteReadVariableSpan MPI_ALLOW)
 bp3_bp4_gtest_add_tests_helper(TimeAggregation MPI_ALLOW)

diff --git a/testing/adios2/engine/bp/TestBPChangingShape.cpp b/testing/adios2/engine/bp/TestBPChangingShape.cpp
@@ -176,187 +176,6 @@ TEST_F(BPChangingShape, BPWriteReadShape2D)
     }
 }
 
-TEST_F(BPChangingShape, MultiBlock)
-{
-    // Write multiple blocks and change shape in between
-    // At read, the last shape should be used not the first one
-    // This test guarantees that one can change the variable shape
-    // until EndStep()
-
-    const std::string fname("BPChangingShapeMultiblock.bp");
-    const int nsteps = 2;
-    const std::vector<int> nblocks = {2, 3};
-    EXPECT_EQ(nsteps, nblocks.size());
-    int rank = 0, nproc = 1;
-
-#if ADIOS2_USE_MPI
-    MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-    MPI_Comm_size(MPI_COMM_WORLD, &nproc);
-    adios2::ADIOS adios(MPI_COMM_WORLD);
-#else
-    adios2::ADIOS adios;
-#endif
-
-    // Writer
-    {
-        adios2::IO outIO = adios.DeclareIO("Output");
-
-        if (!engineName.empty())
-        {
-            outIO.SetEngine(engineName);
-        }
-
-        adios2::Engine writer = outIO.Open(fname, adios2::Mode::Write);
-
-        const size_t dim0 = static_cast<size_t>(nproc);
-        const size_t off0 = static_cast<size_t>(rank);
-        auto var =
-            outIO.DefineVariable<double>("v", {dim0, 1}, {off0, 0}, {1, 1});
-
-        if (!rank)
-        {
-            std::cout << "Writing:" << std::endl;
-        }
-        for (size_t i = 0; i < nsteps; i++)
-        {
-            writer.BeginStep();
-
-            double value =
-                static_cast<double>(rank) + static_cast<double>(i + 1) / 10.0;
-
-            for (size_t j = 0; j < static_cast<size_t>(nblocks[i]); j++)
-            {
-                var.SetShape({dim0, j + 1});
-                var.SetSelection({{off0, j}, {1, 1}});
-
-                if (!rank)
-                {
-                    std::cout << "Step " << i << " block " << j << " shape ("
-                              << var.Shape()[0] << ", " << var.Shape()[1] << ")"
-                              << " value = " << value << std::endl;
-                }
-
-                writer.Put(var, &value, adios2::Mode::Sync);
-                value += 0.01;
-            }
-            writer.EndStep();
-        }
-        writer.Close();
-    }
-
-    // Reader with streaming
-    {
-        adios2::IO inIO = adios.DeclareIO("Input");
-
-        if (!engineName.empty())
-        {
-            inIO.SetEngine(engineName);
-        }
-        adios2::Engine reader = inIO.Open(fname, adios2::Mode::Read);
-
-        if (!rank)
-        {
-            std::cout << "Reading as stream with BeginStep/EndStep:"
-                      << std::endl;
-        }
-
-        int step = 0;
-        while (true)
-        {
-            adios2::StepStatus status =
-                reader.BeginStep(adios2::StepMode::Read);
-
-            if (status != adios2::StepStatus::OK)
-            {
-                break;
-            }
-
-            size_t expected_shape = nblocks[step];
-
-            auto var = inIO.InquireVariable<double>("v");
-            EXPECT_TRUE(var);
-
-            if (!rank)
-            {
-
-                std::cout << "Step " << step << " shape (" << var.Shape()[0]
-                          << ", " << var.Shape()[1] << ")" << std::endl;
-            }
-
-            EXPECT_EQ(var.Shape()[0], nproc);
-            EXPECT_EQ(var.Shape()[1], expected_shape);
-
-            var.SetSelection(
-                {{0, 0}, {static_cast<size_t>(nproc), expected_shape}});
-
-            // Check data on rank 0
-            if (!rank)
-            {
-                std::vector<double> data(nproc * expected_shape);
-                reader.Get(var, data.data());
-
-                reader.PerformGets();
-
-                for (int i = 0; i < nproc; i++)
-                {
-                    double value = static_cast<double>(i) +
-                                   static_cast<double>(step + 1) / 10.0;
-
-                    for (int j = 0; j < nblocks[step]; j++)
-                    {
-                        EXPECT_EQ(data[i * nblocks[step] + j], value);
-                        value += 0.01;
-                    }
-                }
-            }
-
-            reader.EndStep();
-            ++step;
-        }
-        reader.Close();
-    }
-
-    // Reader with file reading
-    {
-        adios2::IO inIO = adios.DeclareIO("InputFile");
-
-        if (!engineName.empty())
-        {
-            inIO.SetEngine(engineName);
-        }
-        adios2::Engine reader =
-            inIO.Open(fname, adios2::Mode::ReadRandomAccess);
-
-        if (!rank)
-        {
-            std::cout << "Reading as file with SetStepSelection:" << std::endl;
-        }
-
-        auto var = inIO.InquireVariable<double>("v");
-        EXPECT_TRUE(var);
-        for (int step = 0; step < nsteps; step++)
-        {
-            var.SetStepSelection({step, 1});
-            if (!rank)
-            {
-                std::cout << "Step " << step << " shape (" << var.Shape()[0]
-                          << ", " << var.Shape()[1] << ")" << std::endl;
-            }
-            size_t expected_shape = nblocks[step];
-            EXPECT_EQ(var.Shape()[0], nproc);
-            EXPECT_EQ(var.Shape()[1], expected_shape);
-
-            var.SetSelection(
-                {{0, 0}, {static_cast<size_t>(nproc), expected_shape}});
-
-            std::vector<double> data(nproc * expected_shape);
-            reader.Get(var, data.data());
-
-            EXPECT_THROW(reader.EndStep(), std::logic_error);
-        }
-    }
-}
-
 int main(int argc, char **argv)
 {
 #if ADIOS2_USE_MPI