fix alltoall tests (fails for the right reasons now)

jmlapre · Aug 21, 2024 · 547715f · 547715f
1 parent 424ff31
commit 547715f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 8 deletions.
diff --git a/src/sst/elements/iris/sumi/sim_transport.cc b/src/sst/elements/iris/sumi/sim_transport.cc
@@ -229,7 +229,8 @@ SimTransport::SimTransport(SST::Params& params, SST::Hg::App* parent, SST::Compo
   nic_ioctl_(parent->os()->nicDataIoctl()),
   qos_analysis_(nullptr),
   pragma_block_set_(false),
-  pragma_timeout_(-1)
+  pragma_timeout_(-1),
+  os_(parent->os())
 {
   completion_queues_[0] = std::bind(&DefaultProgressQueue::incoming,
                                     &default_progress_queue_, 0, std::placeholders::_1);
@@ -263,8 +264,10 @@ SimTransport::SimTransport(SST::Params& params, SST::Hg::App* parent, SST::Compo
   RankMapping::addGlobalMapping(sid().app_, "foo", bar);
 
   output.output("%d", sid().app_);
-  rank_mapper_ = RankMapping::globalMapping(sid().app_);
-  nproc_ = rank_mapper_->nproc();
+  // rank_mapper_ = RankMapping::globalMapping(sid().app_);
+  // nproc_ = rank_mapper_->nproc();
+  nproc_ = 2;
+  //nproc_ = os_->nranks();
 
   auto qos_params = params.get_scoped_params("qos");
   auto qos_name = qos_params.find<std::string>("name", "null");
@@ -363,7 +366,8 @@ SimTransport::nidlist() const
   //just cast an int* - it's fine
   //the types are the same size and the bits can be
   //interpreted correctly
-  return (int*) rank_mapper_->rankToNode().data();
+  //return (int*) rank_mapper_->rankToNode().data();
+  return nullptr;
 }
 
 void

diff --git a/src/sst/elements/iris/sumi/sim_transport.h b/src/sst/elements/iris/sumi/sim_transport.h
@@ -53,6 +53,7 @@ Questions? Contact [email protected]
 #include <mercury/operating_system/process/progress_queue.h>
 #include <mercury/hardware/network/network_message_fwd.h>
 #include <mercury/components/node_fwd.h>
+#include <mercury/components/operating_system.h>
 
 #include <iris/sumi/message_fwd.h>
 #include <iris/sumi/collective.h>
@@ -122,7 +123,9 @@ class SimTransport : public Transport, public SST::Hg::API {
   Output output;
 
   SST::Hg::NodeId rankToNode(int rank) const override {
-    return rank_mapper_->rankToNode(rank);
+    //return SST::Hg::NodeId(rank);
+    //return rank_mapper_->rankToNode(rank);
+    return os_->rankToNode(rank);
   }
 
   /**
@@ -302,7 +305,7 @@ class SimTransport : public Transport, public SST::Hg::API {
 
   SST::Hg::App* parent_app_;
 
-  SST::Iris::sumi::RankMapping::ptr rank_mapper_;
+  //SST::Iris::sumi::RankMapping::ptr rank_mapper_;
 
   DefaultProgressQueue default_progress_queue_;
 
@@ -315,6 +318,8 @@ class SimTransport : public Transport, public SST::Hg::API {
 
   double pragma_timeout_;
 
+  SST::Hg::OperatingSystem* os_;
+
   void drop(Message*){}
 };
 

diff --git a/src/sst/elements/mask-mpi/tests/alltoall.cc b/src/sst/elements/mask-mpi/tests/alltoall.cc
@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 Questions? Contact [email protected]
 */
 
-#define ssthg_app_name sendrecv
+#define ssthg_app_name alltoall
 
 #include <stddef.h>
 #include <stdio.h>

diff --git a/src/sst/elements/mask-mpi/tests/test_alltoall.py b/src/sst/elements/mask-mpi/tests/test_alltoall.py
@@ -35,7 +35,7 @@
     topo.link_latency = "20ns"
     topo.num_ports = 32
 
-    ep = HgJob(0,2)
+    ep = HgJob(0,8)
 
     system = System()
     system.setTopology(topo)

diff --git a/src/sst/elements/mercury/components/operating_system.h b/src/sst/elements/mercury/components/operating_system.h
@@ -238,6 +238,16 @@ class OperatingSystem : public SST::Hg::SubComponent {
     compute_sched_->releaseCores(ncore,thr);
   }
 
+//  NodeId rankToNode(int rank) {
+//    return NodeId( rank_mapper_->mapRank(rank) );
+//  }
+
+//  int32_t nranks() {
+//    return rank_mapper_->getWorldSize();
+//  }
+
+//  SST::Ember::EmberRankMap*	rank_mapper_;
+
 //
 // LIBRARIES
 //