Merge pull request #3955 from spyridon97/fix-engine-type-initializati…

…on-with-config adios2::core::ADIOS: Initialize new IO objects with config file
ornladios · Dec 8, 2023 · 53235b3 · 53235b3
2 parents 68c23fc + 5525115
commit 53235b3
Show file tree

Hide file tree

Showing 8 changed files with 342 additions and 200 deletions.
diff --git a/source/adios2/core/ADIOS.cpp b/source/adios2/core/ADIOS.cpp
@@ -130,11 +130,11 @@ ADIOS::ADIOS(const std::string configFile, helper::Comm comm, const std::string
         }
         if (helper::EndsWith(configFile, ".xml"))
         {
-            XMLInit(configFile);
+            m_ConfigFileContents = XMLInit(configFile);
         }
         else if (helper::EndsWith(configFile, ".yaml") || helper::EndsWith(configFile, ".yml"))
         {
-            YAMLInit(configFile);
+            m_ConfigFileContents = YAMLInit(configFile);
         }
     }
 #ifdef ADIOS2_HAVE_KOKKOS
@@ -189,6 +189,20 @@ IO &ADIOS::DeclareIO(const std::string name, const ArrayOrdering ArrayOrder)
     IO &io = ioPair.first->second;
     io.SetDeclared();
     io.SetArrayOrder(ArrayOrder);
+
+    // Configure new IO objects with config file (if present)
+    if (!m_ConfigFile.empty() && !m_ConfigFileContents.empty())
+    {
+        if (helper::EndsWith(m_ConfigFile, ".xml"))
+        {
+            XMLIOInit(m_ConfigFile, m_ConfigFileContents, io);
+        }
+        else if (helper::EndsWith(m_ConfigFile, ".yaml") || helper::EndsWith(m_ConfigFile, ".yml"))
+        {
+            YAMLInitIO(m_ConfigFile, m_ConfigFileContents, io);
+        }
+    }
+
     return io;
 }
 
@@ -286,14 +300,26 @@ void ADIOS::CheckOperator(const std::string name) const
     }
 }
 
-void ADIOS::XMLInit(const std::string &configFileXML)
+std::string ADIOS::XMLInit(const std::string &configFileXML)
+{
+    return helper::ParseConfigXML(*this, configFileXML, m_IOs, m_Operators);
+}
+
+void ADIOS::XMLIOInit(const std::string &configFileXML, const std::string &configFileContents,
+                      core::IO &io)
+{
+    helper::ParseConfigXMLIO(*this, configFileXML, configFileContents, io, m_Operators);
+}
+
+std::string ADIOS::YAMLInit(const std::string &configFileYAML)
 {
-    helper::ParseConfigXML(*this, configFileXML, m_IOs, m_Operators);
+    return helper::ParseConfigYAML(*this, configFileYAML, m_IOs);
 }
 
-void ADIOS::YAMLInit(const std::string &configFileYAML)
+void ADIOS::YAMLInitIO(const std::string &configFileYAML, const std::string &configFileContents,
+                       core::IO &io)
 {
-    helper::ParseConfigYAML(*this, configFileYAML, m_IOs);
+    helper::ParseConfigYAMLIO(*this, configFileYAML, configFileContents, io);
 }
 
 void ADIOS::Global_init_AWS_API()

diff --git a/source/adios2/core/ADIOS.h b/source/adios2/core/ADIOS.h
@@ -164,6 +164,7 @@ class ADIOS
 
     /** XML File to be read containing configuration information */
     const std::string m_ConfigFile;
+    std::string m_ConfigFileContents;
 
     /**
      * @brief List of IO class objects defined from either ADIOS
@@ -184,9 +185,15 @@ class ADIOS
 
     void CheckOperator(const std::string name) const;
 
-    void XMLInit(const std::string &configFileXML);
+    std::string XMLInit(const std::string &configFileXML);
 
-    void YAMLInit(const std::string &configFileYAML);
+    void XMLIOInit(const std::string &configFileXML, const std::string &configFileContents,
+                   core::IO &io);
+
+    std::string YAMLInit(const std::string &configFileYAML);
+
+    void YAMLInitIO(const std::string &configFileYAML, const std::string &configFileContents,
+                    core::IO &io);
 
 private:
     /* Global services that we want to initialize at most once and shutdown