add back logicalTopology param

Author: plavin

src/sst/elements/astra/astraWorkload.cc

@@ -40,7 +40,26 @@ AstraWorkload::AstraWorkload(ComponentId_t id, Params& params) : Component(id) {
     injectionScale_        = params.find<double>("injectionScale", 1.0);
     rendezvousProtocol_    = params.find<bool>("rendezvousProtocol", false);
 
-    // TODO: What am I actually supposed to put in logicalDims?
+    // Users may optionally specify a logical mesh topology. Otherwise a ring will be assumed.
+    if (params.contains("logicalTopology")) {
+        if (params.is_value_array("logicalTopology")) {
+            params.find_array<int>("logicalTopology", logicalDims_);
+        } else {
+            out_->fatal(CALL_INFO, 1, "logicalTopology was given but is not a valid array\n");
+        }
+    } else {
+        logicalDims_.push_back(numNPUs_);
+    }
+
+    int prod = 1;
+    for (int d : logicalDims_) {
+        prod *= d;
+    }
+    if (prod != numNPUs_) {
+        out_->fatal(CALL_INFO, 1, "The product of the logicalTopology mesh dimensions must match numNPUs. Product=%d, numNPUs=%d\n", prod, numNPUs_);
+    }
+
+    params.find_array<int>("logicalTopologyConfig", logicalDims_);
     logicalDims_.push_back(numNPUs_);
     queuesPerDim_ = std::vector<int>(logicalDims_.size(), numQueuesPerDim_);
 

src/sst/elements/astra/astraWorkload.h

@@ -50,17 +50,17 @@ class AstraWorkload : public SST::Component
     )
 
 	SST_ELI_DOCUMENT_PARAMS(
-        {"numNPUs",               "Number of NPUs to model",               NULL    },
-        {"workloadConfig",        "Workload config file",                  NULL    },
-        {"systemConfig",          "System config file",                    NULL    },
-        {"memoryConfig",          "Remote memory config file",             NULL    },
-        {"commGroupConfig",       "Communicator group config file",        "empty" },
-        {"logicalTopologyConfig", "Logical topology config string",        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" },
+        {"numNPUs",            "Number of NPUs to model",                  NULL       },
+        {"workloadConfig",     "Workload config file",                     NULL       },
+        {"systemConfig",       "System config file",                       NULL       },
+        {"memoryConfig",       "Remote memory config file",                NULL       },
+        {"commGroupConfig",    "Communicator group config file",           "empty"    },
+        {"logicalTopology",    "Logical topology mesh dimensions (array)", "[numNPUs]"},
+        {"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_SUBCOMPONENT_SLOTS( { "nic", "Network interface(s). One per endpoint.", "SST::Astra::AstraNIC"} )
@@ -85,7 +85,6 @@ class AstraWorkload : public SST::Component
     std::string systemConfig_;
     std::string memoryConfig_;
     std::string commGroupConfig_;
-    std::string logicalTopologyConfig_;
     std::string loggingConfig_;
     int numQueuesPerDim_;
     double commScale_;

src/sst/elements/astra/tests/astra-test.py

@@ -82,6 +82,7 @@ def build(self, nID, extraKeys):
         "systemConfig":          system_file,
         "memoryConfig":          memory_file,
         "commGroupConfig":       comm_group_file,
+        #"logicalTopology":       [2, 2],
     })
 
     ep = AstraJob(0, numNPUs, workload)