Use AdiosAttributes struct

Author: franzpoeschel

include/openPMD/IO/ADIOS/ADIOS2File.hpp

@@ -21,6 +21,7 @@
 #pragma once
 
 #include "openPMD/IO/ADIOS/ADIOS2Auxiliary.hpp"
+#include "openPMD/IO/ADIOS/ADIOS2PreloadAttributes.hpp"
 #include "openPMD/IO/AbstractIOHandler.hpp"
 #include "openPMD/IO/IOTask.hpp"
 #include "openPMD/IO/InvalidatableFile.hpp"
@@ -325,16 +326,9 @@ class ADIOS2File
      */
     void drop();
 
-    AttributeMap_t const &availableAttributes();
-
     std::vector<std::string>
     availableAttributesPrefixed(std::string const &prefix);
 
-    /*
-     * See description below.
-     */
-    void invalidateAttributesMap();
-
     AttributeMap_t const &availableVariables();
 
     std::vector<std::string>
@@ -442,7 +436,7 @@ class ADIOS2File
      * the map that would be returned by a call to
      * IO::Available(Attributes|Variables).
      */
-    std::optional<AttributeMap_t> m_availableAttributes;
+    AdiosAttributes m_attributes;
     std::optional<AttributeMap_t> m_availableVariables;
 
     std::set<Writable *> m_pathsMarkedAsActive;

include/openPMD/IO/ADIOS/ADIOS2PreloadAttributes.hpp

@@ -20,7 +20,9 @@
  */
 #pragma once
 
+#include "openPMD/auxiliary/Variant.hpp"
 #include "openPMD/config.hpp"
+#include <variant>
 #if openPMD_HAVE_ADIOS2
 
 #include <adios2.h>
@@ -133,6 +135,12 @@ class PreloadAdiosAttributes
     AttributeWithShape<T> getAttribute(std::string const &name) const;
 
     Datatype attributeType(std::string const &name) const;
+
+    std::map<std::string, AttributeLocation> const &
+    availableAttributes() const &
+    {
+        return m_offsets;
+    }
 };
 
 struct AdiosAttributes
@@ -144,7 +152,32 @@ struct AdiosAttributes
         std::optional<std::map<std::string, adios2::Params>> m_attributes;
     };
 
-    std::variant<RandomAccess_t, StreamAccess_t> m_data;
+    std::variant<RandomAccess_t, StreamAccess_t> m_data = StreamAccess_t{};
+
+    template <typename Functor>
+    auto withAvailableAttributes(size_t step, adios2::IO &IO, Functor &&f)
+        -> decltype(std::forward<Functor>(f)(
+            std::declval<std::map<std::string, adios2::Params> &>()))
+    {
+        using ret_t = decltype(std::forward<Functor>(f)(
+            std::declval<std::map<std::string, adios2::Params> &>()));
+        return std::visit(
+            auxiliary::overloaded{
+                [step, &f](RandomAccess_t &ra) -> ret_t {
+                    auto &attribute_data = ra.at(step);
+                    return std::forward<Functor>(f)(
+                        attribute_data.availableAttributes());
+                },
+                [step, &f, &IO](StreamAccess_t &sa) -> ret_t {
+                    if (!sa.m_attributes.has_value() ||
+                        sa.m_currentStep != step)
+                    {
+                        sa = StreamAccess_t{step, IO.AvailableAttributes()};
+                    }
+                    return std::forward<Functor>(f)(*sa.m_attributes);
+                }},
+            m_data);
+    }
 };
 } // namespace openPMD::detail
 

src/IO/ADIOS/ADIOS2File.cpp

@@ -759,19 +759,21 @@ void ADIOS2File::configure_IO()
 
 auto ADIOS2File::detectGroupTable() -> UseGroupTable
 {
-    auto const &attributes = availableAttributes();
-    auto lower_bound =
-        attributes.lower_bound(adios_defaults::str_activeTablePrefix);
-    if (lower_bound != attributes.end() &&
-        auxiliary::starts_with(
-            lower_bound->first, adios_defaults::str_activeTablePrefix))
-    {
-        return UseGroupTable::Yes;
-    }
-    else
-    {
-        return UseGroupTable::No;
-    }
+    return m_attributes.withAvailableAttributes(
+        currentStep(), m_IO, [&](auto const &attributes) {
+            auto lower_bound =
+                attributes.lower_bound(adios_defaults::str_activeTablePrefix);
+            if (lower_bound != attributes.end() &&
+                auxiliary::starts_with(
+                    lower_bound->first, adios_defaults::str_activeTablePrefix))
+            {
+                return UseGroupTable::Yes;
+            }
+            else
+            {
+                return UseGroupTable::No;
+            }
+        });
 }
 
 adios2::Engine &ADIOS2File::getEngine()
@@ -1264,7 +1266,6 @@ AdvanceStatus ADIOS2File::advance(AdvanceMode mode)
         case adios2::StepStatus::OtherError:
             throw std::runtime_error("[ADIOS2] Unexpected step status.");
         }
-        invalidateAttributesMap();
         invalidateVariablesMap();
         m_pathsMarkedAsActive.clear();
         return res;
@@ -1280,13 +1281,11 @@ void ADIOS2File::drop()
     assert(m_buffer.empty());
 }
 
+template <typename AttributesMap>
 static std::vector<std::string> availableAttributesOrVariablesPrefixed(
-    std::string const &prefix,
-    ADIOS2File::AttributeMap_t const &(ADIOS2File::*getBasicMap)(),
-    ADIOS2File &ba)
+    std::string const &prefix, AttributesMap const &attributes)
 {
     std::string var = auxiliary::ends_with(prefix, '/') ? prefix : prefix + '/';
-    ADIOS2File::AttributeMap_t const &attributes = (ba.*getBasicMap)();
     std::vector<std::string> ret;
     for (auto it = attributes.lower_bound(prefix); it != attributes.end(); ++it)
     {
@@ -1305,33 +1304,17 @@ static std::vector<std::string> availableAttributesOrVariablesPrefixed(
 std::vector<std::string>
 ADIOS2File::availableAttributesPrefixed(std::string const &prefix)
 {
-    return availableAttributesOrVariablesPrefixed(
-        prefix, &ADIOS2File::availableAttributes, *this);
+    return m_attributes.withAvailableAttributes(
+        currentStep(), m_IO, [&](auto const &attributes) {
+            return availableAttributesOrVariablesPrefixed(prefix, attributes);
+        });
 }
 
 std::vector<std::string>
 ADIOS2File::availableVariablesPrefixed(std::string const &prefix)
 {
     return availableAttributesOrVariablesPrefixed(
-        prefix, &ADIOS2File::availableVariables, *this);
-}
-
-void ADIOS2File::invalidateAttributesMap()
-{
-    m_availableAttributes = std::optional<AttributeMap_t>();
-}
-
-ADIOS2File::AttributeMap_t const &ADIOS2File::availableAttributes()
-{
-    if (m_availableAttributes)
-    {
-        return m_availableAttributes.value();
-    }
-    else
-    {
-        m_availableAttributes = std::make_optional(m_IO.AvailableAttributes());
-        return m_availableAttributes.value();
-    }
+        prefix, ADIOS2File::availableVariables());
 }
 
 void ADIOS2File::invalidateVariablesMap()

src/IO/ADIOS/ADIOS2IOHandler.cpp

@@ -2148,7 +2148,6 @@ namespace detail
 
         auto &filedata = impl->getFileData(
             file, ADIOS2IOHandlerImpl::IfFileNotOpen::ThrowError);
-        filedata.invalidateAttributesMap();
         adios2::IO IO = filedata.m_IO;
         impl->m_dirty.emplace(std::move(file));
 

src/IO/ADIOS/ADIOS2PreloadAttributes.cpp

@@ -27,13 +27,9 @@
 
 #include "openPMD/Datatype.hpp"
 #include "openPMD/IO/ADIOS/ADIOS2Auxiliary.hpp"
-#include "openPMD/auxiliary/StringManip.hpp"
 
 #include <cstddef>
 #include <cstdlib>
-#include <iostream>
-#include <numeric>
-#include <type_traits>
 
 namespace openPMD::detail
 {