add params

Author: plavin

src/sst/elements/astra/Makefile.am

@@ -4,7 +4,8 @@
 
 AM_CPPFLAGS += \
 	$(MPI_CPPFLAGS)\
-	-I$(top_srcdir)/src
+	-I$(top_srcdir)/src \
+	@ASTRASIM_CPPFLAGS@
 
 compdir = $(pkglibdir)
 comp_LTLIBRARIES = libastra.la
@@ -13,7 +14,9 @@ libastra_la_SOURCES = \
 	astra.cc \
 	astra.h
 
-libastra_la_LDFLAGS = -module -avoid-version # -lAstraSim
+libastra_la_LDFLAGS = -module -avoid-version @ASTRASIM_LDFLAGS@
+
+libastra_la_LIBADD   = @ASTRASIM_LIBS@
 
 EXTRA_DIST =
 

src/sst/elements/astra/astra.cc

@@ -25,6 +25,26 @@ astraNetworkBridge::astraNetworkBridge(ComponentId_t id, Params& params) : Compo
     registerAsPrimaryComponent();
     primaryComponentDoNotEndSim();
 
+    workloadConfig_        = params.find<std::string>("workloadConfig");
+    systemConfig_          = params.find<std::string>("systemConfig");
+    networkConfig_         = params.find<std::string>("networkConfig");
+    memoryConfig_          = params.find<std::string>("memoryConfig");
+    commGroupConfig_       = params.find<std::string>("commGroupConfig", "empty");
+    logicalTopologyConfig_ = params.find<std::string>("logicalTopologyConfig");
+    loggingConfig_         = params.find<std::string>("loggingConfig", "empty");
+    numQueuesPerDim_       = params.find<int>("numQueuesPerDim",1);
+    commScale_             = params.find<double>("commScale", 1.0);
+    injectionScale_        = params.find<double>("injectionScale", 1.0);
+    rendezvousProtocol_    = params.find<bool>("rendezvousProtocol", false);
+/*
+    int numNPUs_ = 1;
+    std::vector<int> logicalDims_;
+    std::vector<int> queuesPerDim_;
+    */
+
+    AstraSim::LoggerFactory::init(loggingConfig_);
+    //TODO: parse topo config to get numNPUs_, logicalDims_, queuesPerDim_
+
 
 }
 

src/sst/elements/astra/astra.h

@@ -20,8 +20,12 @@
  * TODO: Add explanation
  */
 
+#include <string>
+#include <vector>
 #include <sst/core/component.h>
 #include <sst/core/link.h>
+#include "astra-sim/common/AstraNetworkAPI.hh"
+#include "astra-sim/system/Sys.hh"
 
 namespace SST {
 namespace astra {
@@ -39,7 +43,17 @@ class astraNetworkBridge : public SST::Component
     )
 
 	SST_ELI_DOCUMENT_PARAMS(
-        { "testParam", "test parameter" }
+        {"workloadConfig",        "Workload config file",                  NULL    },
+        {"systemConfig",          "System config file",                    NULL    },
+        {"networkConfig",         "Network config file",                   NULL    },
+        {"memoryConfig",          "Remote memory config file",             NULL    },
+        {"commGroupConfig",       "Communicator group config file",        "empty" },
+        {"logicalTopologyConfig", "Logical topology config file",          NULL    },
+        {"loggingConfig",         "Logging config file",                   "empty" },
+        {"numQueuesPerDim",       "Number of queues per dimension",        "1"     },
+        {"commScale",             "Communication scale",                   "1.0"   },
+        {"injectionScale",        "Injection scale",                       "1.0"   },
+        {"rendezvousProtocol",    "Whether to enable rendezvous protocol", "false" },
     )
 
     SST_ELI_DOCUMENT_PORTS(
@@ -57,6 +71,21 @@ class astraNetworkBridge : public SST::Component
 private:
     SST::Output* out;
 
+    std::string workloadConfig_;
+    std::string systemConfig_;
+    std::string networkConfig_;
+    std::string memoryConfig_;
+    std::string commGroupConfig_;
+    std::string logicalTopologyConfig_;
+    std::string loggingConfig_;
+    int numQueuesPerDim_;
+    double commScale_;
+    double injectionScale_;
+    bool rendezvousProtocol_;
+
+    int numNPUs_;
+    std::vector<int> logicalDims_;
+    std::vector<int> queuesPerDim_;
 
 };