Header file cleanup for ELI and serialization headers.

sstsimulator · Oct 28, 2024 · 77cefbc · 77cefbc
1 parent 6ee77fb
commit 77cefbc
Show file tree

Hide file tree

Showing 22 changed files with 216 additions and 54 deletions.
diff --git a/src/sst/core/baseComponent.cc b/src/sst/core/baseComponent.cc
@@ -106,8 +106,7 @@ BaseComponent::setDefaultTimeBaseForLinks(TimeConverter* tc)
 void
 BaseComponent::pushValidParams(Params& params, const std::string& type)
 {
-    const Params::KeySet_t& keyset = Factory::getFactory()->getParamNames(type);
-    params.pushAllowedKeys(keyset);
+    params.pushAllowedKeys(Factory::getFactory()->getParamNames(type));
 }
 
 void
@@ -790,12 +789,12 @@ void
 BaseComponent::configureAllowedStatParams(SST::Params& params)
 {
     // Identify what keys are Allowed in the parameters
-    Params::KeySet_t allowedKeySet;
-    allowedKeySet.insert("type");
-    allowedKeySet.insert("rate");
-    allowedKeySet.insert("startat");
-    allowedKeySet.insert("stopat");
-    allowedKeySet.insert("resetOnRead");
+    std::vector<std::string> allowedKeySet;
+    allowedKeySet.push_back("type");
+    allowedKeySet.push_back("rate");
+    allowedKeySet.push_back("startat");
+    allowedKeySet.push_back("stopat");
+    allowedKeySet.push_back("resetOnRead");
     params.pushAllowedKeys(allowedKeySet);
 }
 

diff --git a/src/sst/core/eli/defaultInfo.h b/src/sst/core/eli/defaultInfo.h
@@ -12,6 +12,8 @@
 #ifndef SST_CORE_ELI_DEFAULTINFO_H
 #define SST_CORE_ELI_DEFAULTINFO_H
 
+#include "sst/core/eli/elibase.h"
+
 #include <string>
 #include <vector>
 

diff --git a/src/sst/core/eli/elementinfo.cc b/src/sst/core/eli/elementinfo.cc
@@ -15,6 +15,10 @@
 
 #include "sst/core/eli/elibase.h"
 
+#include <sstream>
+#include <string>
+#include <vector>
+
 namespace SST {
 
 /**************************************************************************
@@ -128,7 +132,7 @@ void
 ProvidesParams::init()
 {
     for ( auto& item : params_ ) {
-        allowedKeys.insert(item.name);
+        allowedKeys.push_back(item.name);
     }
 }
 

diff --git a/src/sst/core/eli/elementinfo.h b/src/sst/core/eli/elementinfo.h
@@ -24,7 +24,6 @@
 #include "sst/core/eli/simpleInfo.h"
 #include "sst/core/eli/statsInfo.h"
 #include "sst/core/eli/subcompSlotInfo.h"
-#include "sst/core/params.h"
 #include "sst/core/sst_types.h"
 #include "sst/core/warnmacros.h"
 

diff --git a/src/sst/core/eli/interfaceInfo.h b/src/sst/core/eli/interfaceInfo.h
@@ -12,6 +12,9 @@
 #ifndef SST_CORE_ELI_INTERFACE_INFO_H
 #define SST_CORE_ELI_INTERFACE_INFO_H
 
+#include <iostream>
+#include <string>
+
 namespace SST {
 namespace ELI {
 

diff --git a/src/sst/core/eli/paramsInfo.h b/src/sst/core/eli/paramsInfo.h
@@ -13,7 +13,6 @@
 #define SST_CORE_ELI_PARAMS_INFO_H
 
 #include "sst/core/eli/elibase.h"
-#include "sst/core/params.h"
 
 #include <string>
 #include <vector>
@@ -62,7 +61,7 @@ class ProvidesParams
         }
     }
 
-    const Params::KeySet_t& getParamNames() const { return allowedKeys; }
+    const std::vector<std::string>& getParamNames() const { return allowedKeys; }
 
 protected:
     template <class T>
@@ -74,7 +73,7 @@ class ProvidesParams
 private:
     void init();
 
-    Params::KeySet_t              allowedKeys;
+    std::vector<std::string>      allowedKeys;
     std::vector<ElementInfoParam> params_;
 };
 

diff --git a/src/sst/core/factory.cc b/src/sst/core/factory.cc
@@ -145,12 +145,12 @@ Factory::isPortNameValid(const std::string& type, const std::string& port_name)
     return false;
 }
 
-const Params::KeySet_t&
+const std::vector<std::string>&
 Factory::getParamNames(const std::string& type)
 {
     // This is only needed so we can return something in the error
     // case.  It is never used.
-    static Params::KeySet_t empty_keyset;
+    static std::vector<std::string> empty_keyset;
 
     std::string elemlib, elem;
     std::tie(elemlib, elem) = parseLoadName(type);

diff --git a/src/sst/core/factory.h b/src/sst/core/factory.h
@@ -13,6 +13,7 @@
 #define SST_CORE_FACTORY_H
 
 #include "sst/core/eli/elementinfo.h"
+#include "sst/core/output.h"
 #include "sst/core/params.h"
 #include "sst/core/sst_types.h"
 #include "sst/core/sstpart.h"
@@ -53,9 +54,9 @@ class Factory
 
     /** Get a list of allowed param keys for a given component type.
      * @param type - Name of component in lib.name format
-     * @return True if this is a valid portname
+     * @return Allowed parameter names
      */
-    const Params::KeySet_t& getParamNames(const std::string& type);
+    const std::vector<std::string>& getParamNames(const std::string& type);
 
     /** Attempt to create a new Component instantiation
      * @param id - The unique ID of the component instantiation

diff --git a/src/sst/core/impl/timevortex/timeVortexBinnedMap.h b/src/sst/core/impl/timevortex/timeVortexBinnedMap.h
@@ -12,6 +12,8 @@
 #ifndef SST_CORE_IMPL_TIMEVORTEX_TIMEVORTEXBINNEDMAP_H
 #define SST_CORE_IMPL_TIMEVORTEX_TIMEVORTEXBINNEDMAP_H
 
+#include "sst/core/threadsafe.h"
+
 #include <atomic>
 #include <queue>
 #include <sst/core/timeVortex.h>

diff --git a/src/sst/core/impl/timevortex/timeVortexPQ.h b/src/sst/core/impl/timevortex/timeVortexPQ.h
@@ -13,6 +13,7 @@
 #define SST_CORE_IMPL_TIMEVORTEX_TIMEVORTEXPQ_H
 
 #include "sst/core/eli/elementinfo.h"
+#include "sst/core/threadsafe.h"
 #include "sst/core/timeVortex.h"
 
 #include <functional>

diff --git a/src/sst/core/interactiveConsole.h b/src/sst/core/interactiveConsole.h
@@ -26,6 +26,7 @@
 
 namespace SST {
 
+class Params;
 class Simulation_impl;
 class TimeConverter;
 

diff --git a/src/sst/core/model/sstmodel.h b/src/sst/core/model/sstmodel.h
@@ -13,6 +13,7 @@
 #define SST_CORE_MODEL_SSTMODEL_H
 
 #include "sst/core/eli/elementinfo.h"
+#include "sst/core/params.h"
 #include "sst/core/warnmacros.h"
 
 namespace SST {

diff --git a/src/sst/core/module.h b/src/sst/core/module.h
@@ -16,6 +16,9 @@
 #include "sst/core/serialization/serializable.h"
 
 namespace SST {
+
+class Params;
+
 /**
    Module is a tag class used with the loadModule function.
  */

diff --git a/src/sst/core/params.cc b/src/sst/core/params.cc
@@ -14,6 +14,7 @@
 
 #include "sst/core/params.h"
 
+#include "sst/core/output.h"
 #include "sst/core/unitAlgebra.h"
 
 #include <map>
@@ -223,9 +224,13 @@ Params::contains(const key_type& k) const
 }
 
 void
-Params::pushAllowedKeys(const KeySet_t& keys)
+Params::pushAllowedKeys(const std::vector<std::string>& keys)
 {
-    allowedKeys.push_back(keys);
+    KeySet_t key_set;
+    for ( auto x : keys ) {
+        key_set.insert(x);
+    }
+    allowedKeys.push_back(key_set);
 }
 
 void

diff --git a/src/sst/core/params.h b/src/sst/core/params.h
@@ -13,7 +13,6 @@
 #define SST_CORE_PARAM_H
 
 #include "sst/core/from_string.h"
-#include "sst/core/output.h"
 #include "sst/core/serialization/serializable.h"
 #include "sst/core/serialization/serializer.h"
 #include "sst/core/threadsafe.h"
@@ -34,6 +33,7 @@ namespace SST {
 
 class ConfigGraph;
 class ConfigComponent;
+class Output;
 class SSTModelDescription;
 
 namespace Core {
@@ -834,7 +834,7 @@ class Params : public SST::Core::Serialization::serializable
      * @param keys   Set of keys to consider valid to add to the stack
      *               of legal keys
      */
-    void pushAllowedKeys(const KeySet_t& keys);
+    void pushAllowedKeys(const std::vector<std::string>& keys);
 
     /**
      * Removes the most recent set of keys considered allowed

diff --git a/src/sst/core/profile/clockHandlerProfileTool.cc b/src/sst/core/profile/clockHandlerProfileTool.cc
@@ -14,6 +14,7 @@
 #include "sst/core/profile/clockHandlerProfileTool.h"
 
 #include "sst/core/output.h"
+#include "sst/core/params.h"
 #include "sst/core/sst_types.h"
 
 #include <chrono>

diff --git a/src/sst/core/profile/componentProfileTool.cc b/src/sst/core/profile/componentProfileTool.cc
@@ -14,6 +14,7 @@
 #include "sst/core/profile/componentProfileTool.h"
 
 #include "sst/core/output.h"
+#include "sst/core/params.h"
 #include "sst/core/sst_types.h"
 
 #include <chrono>

diff --git a/src/sst/core/profile/eventHandlerProfileTool.cc b/src/sst/core/profile/eventHandlerProfileTool.cc
@@ -14,6 +14,7 @@
 #include "sst/core/profile/eventHandlerProfileTool.h"
 
 #include "sst/core/output.h"
+#include "sst/core/params.h"
 #include "sst/core/sst_types.h"
 
 #include <chrono>