all tests passing with ComputeLibrary

jpkenny · Dec 9, 2024 · 4318fa6 · 4318fa6
1 parent e3cd2ba
commit 4318fa6
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 8 deletions.
diff --git a/src/sst/elements/mask-mpi/tests/refFiles/test_allgather.out b/src/sst/elements/mask-mpi/tests/refFiles/test_allgather.out
@@ -6,4 +6,4 @@ recv_values[4]=4
 recv_values[5]=5
 recv_values[6]=6
 recv_values[7]=7
-Simulation is complete, simulated time: 5.29731 us
+Simulation is complete, simulated time: 5.31955 us
diff --git a/src/sst/elements/mask-mpi/tests/refFiles/test_alltoall.out b/src/sst/elements/mask-mpi/tests/refFiles/test_alltoall.out
@@ -1022,4 +1022,4 @@ recv_values[1020]=7
 recv_values[1021]=7
 recv_values[1022]=7
 recv_values[1023]=7
-Simulation is complete, simulated time: 269.784 us
+Simulation is complete, simulated time: 270.652 us
diff --git a/src/sst/elements/mask-mpi/tests/refFiles/test_halo3d26.out b/src/sst/elements/mask-mpi/tests/refFiles/test_halo3d26.out
@@ -1,2 +1,2 @@
 halo3d-26 executed successfully
-Simulation is complete, simulated time: 53.4722 ms
+Simulation is complete, simulated time: 53.626 ms
diff --git a/src/sst/elements/mask-mpi/tests/refFiles/test_reduce.out b/src/sst/elements/mask-mpi/tests/refFiles/test_reduce.out
@@ -6,4 +6,4 @@ recv_values[4]=4
 recv_values[5]=5
 recv_values[6]=6
 recv_values[7]=7
-Simulation is complete, simulated time: 6.62163 us
+Simulation is complete, simulated time: 6.63955 us
diff --git a/src/sst/elements/mercury/components/node.cc b/src/sst/elements/mercury/components/node.cc
@@ -26,7 +26,6 @@ extern template SST::TimeConverter* HgBase<SST::Component>::time_converter_;
 
 Node::Node(ComponentId_t id, Params &params)
     : SST::Hg::NodeBase(id,params) {
-  std::cerr << "Node::Node()\n";
   out_->debug(CALL_INFO, 1, 0, "loading hg.operating_system\n");
   os_ = loadUserSubComponent<OperatingSystem>(
       "os_slot", SST::ComponentInfo::SHARE_NONE, this);

diff --git a/src/sst/elements/mercury/libraries/compute/memory_model.cc b/src/sst/elements/mercury/libraries/compute/memory_model.cc
@@ -35,7 +35,7 @@ MemoryModel::MemoryModel(SST::Params &params, NodeCL* parent) :
   auto max_bw = params.find<SST::UnitAlgebra>("channel_bandwidth", "11.2 GB/s");
   channel_byte_delay_ = TimeDelta(max_bw.getValue().inverse().toDouble());
 
-  int num_channels = params.find<int>("num_channels");
+  int num_channels = params.find<int>("num_channels",1);
   channels_.resize(num_channels);
   for (ChannelQueue& q : channels_){
     q.byte_delay = channel_byte_delay_;

diff --git a/src/sst/elements/mercury/tests/ostest.py b/src/sst/elements/mercury/tests/ostest.py
@@ -3,8 +3,8 @@
 
 node0 = sst.Component("Node0", "hg.Node")
 node1 = sst.Component("Node1", "hg.Node")
-os0 = node0.setSubComponent("os_slot", "hg.operating_system")
-os1 = node1.setSubComponent("os_slot", "hg.operating_system")
+os0 = node0.setSubComponent("os_slot", "hg.OperatingSystem")
+os1 = node1.setSubComponent("os_slot", "hg.OperatingSystem")
 
 link0 = sst.Link("link0")
 link0.connect( (node0,"network","1ns"), (node1,"network","1ns") )