Remove __openPMD_internal/useSteps bug

Author: franzpoeschel

.github/ci/sanitizer/clang/Leak.supp

@@ -15,3 +15,5 @@ leak:adios_inq_var
 # ADIOS2
 leak:adios2::core::engine::SstReader::*
 leak:adios2::core::engine::SstWriter::*
+leak:adios2::format::BP3Serializer::AggregateCollectiveMetadataIndices
+leak:adios2::core::engine::BP5Writer::MarshalAttributes

include/openPMD/IO/ADIOS/ADIOS2IOHandler.hpp

@@ -1084,9 +1084,15 @@ namespace detail
          * @brief Begin or end an ADIOS step.
          *
          * @param mode Whether to begin or end a step.
+         * @param calledExplicitly True if called due to a public API call.
+         *     False if called from requireActiveStep.
+         *     Some engines (BP5) require that every interaction happens within
+         *     an active step, meaning that we need to call advance()
+         *     implicitly at times. When doing that, do not tag the dataset
+         *     with __openPMD_internal/useSteps (yet).
          * @return AdvanceStatus
          */
-        AdvanceStatus advance(AdvanceMode mode);
+        AdvanceStatus advance(AdvanceMode mode, bool calledExplicitly);
 
         /*
          * Delete all buffered actions without running them.

include/openPMD/config.hpp.in

@@ -21,23 +21,23 @@
 #pragma once
 
 #ifndef openPMD_HAS_CXX17
-#   cmakedefine01 openPMD_HAS_CXX17
+#cmakedefine01 openPMD_HAS_CXX17
 #endif
 
 #ifndef openPMD_HAVE_MPI
-#   cmakedefine01 openPMD_HAVE_MPI
+#cmakedefine01 openPMD_HAVE_MPI
 #endif
 
 #define openPMD_HAVE_JSON 1
 
 #ifndef openPMD_HAVE_HDF5
-#   cmakedefine01 openPMD_HAVE_HDF5
+#cmakedefine01 openPMD_HAVE_HDF5
 #endif
 
 #ifndef openPMD_HAVE_ADIOS1
-#   cmakedefine01 openPMD_HAVE_ADIOS1
+#cmakedefine01 openPMD_HAVE_ADIOS1
 #endif
 
 #ifndef openPMD_HAVE_ADIOS2
-#   cmakedefine01 openPMD_HAVE_ADIOS2
+#cmakedefine01 openPMD_HAVE_ADIOS2
 #endif

src/IO/ADIOS/ADIOS2IOHandler.cpp

@@ -1062,7 +1062,8 @@ void ADIOS2IOHandlerImpl::advance(
 {
     auto file = m_files[writable];
     auto &ba = getFileData(file, IfFileNotOpen::ThrowError);
-    *parameters.status = ba.advance(parameters.mode);
+    *parameters.status =
+        ba.advance(parameters.mode, /* calledExplicitly = */ true);
 }
 
 void ADIOS2IOHandlerImpl::closePath(
@@ -2580,7 +2581,8 @@ namespace detail
          */
         if (streamStatus == StreamStatus::OutsideOfStep)
         {
-            switch (advance(AdvanceMode::BEGINSTEP))
+            switch (
+                advance(AdvanceMode::BEGINSTEP, /* calledExplicitly = */ false))
             {
             case AdvanceStatus::OVER:
                 throw std::runtime_error(
@@ -2741,7 +2743,8 @@ namespace detail
             /* flushUnconditionally = */ false);
     }
 
-    AdvanceStatus BufferedActions::advance(AdvanceMode mode)
+    AdvanceStatus
+    BufferedActions::advance(AdvanceMode mode, bool calledExplicitly)
     {
         if (streamStatus == StreamStatus::Undecided)
         {
@@ -2757,8 +2760,12 @@ namespace detail
             return AdvanceStatus::OK;
         }
 
-        m_IO.DefineAttribute<bool_representation>(
-            ADIOS2Defaults::str_usesstepsAttribute, 1);
+        if (calledExplicitly)
+        {
+            m_IO.DefineAttribute<bool_representation>(
+                ADIOS2Defaults::str_usesstepsAttribute, 1);
+        }
+
         switch (mode)
         {
         case AdvanceMode::ENDSTEP: {
@@ -2795,13 +2802,16 @@ namespace detail
 
             if (streamStatus != StreamStatus::DuringStep)
             {
-                flush(
-                    FlushLevel::UserFlush,
-                    [&adiosStatus](BufferedActions &, adios2::Engine &engine) {
-                        adiosStatus = engine.BeginStep();
-                    },
-                    /* writeAttributes = */ false,
-                    /* flushUnconditionally = */ true);
+                adiosStatus = getEngine().BeginStep();
+                // if (adiosStatus != adios2::StepStatus::OK)
+                // {
+                //     throw std::runtime_error(
+                //         "[ADIOS2] Failure when trying to open a step.");
+                // }
+                // else
+                // {
+                //     streamStatus = StreamStatus::DuringStep;
+                // }
                 if (adiosStatus == adios2::StepStatus::OK &&
                     m_mode == adios2::Mode::Read &&
                     attributeLayout() == AttributeLayout::ByAdiosVariables)