diff --git a/src/sst/elements/mask-mpi/tests/refFiles/test_allgather.out b/src/sst/elements/mask-mpi/tests/refFiles/test_allgather.out index cbf984667a..274ebbcc79 100644 --- 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 index 61cb723e0a..4c793f3a58 100644 --- 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 index c3f10c124e..5c2368244b 100644 --- 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 index 75632f6a2c..c34bad2e5f 100644 --- 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 index ca4fe60efd..7824d37a43 100644 --- 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::time_converter_; Node::Node(ComponentId_t id, Params ¶ms) : SST::Hg::NodeBase(id,params) { - std::cerr << "Node::Node()\n"; out_->debug(CALL_INFO, 1, 0, "loading hg.operating_system\n"); os_ = loadUserSubComponent( "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 index 1d7d4cb0ca..5abd7bdc20 100644 --- 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 ¶ms, NodeCL* parent) : auto max_bw = params.find("channel_bandwidth", "11.2 GB/s"); channel_byte_delay_ = TimeDelta(max_bw.getValue().inverse().toDouble()); - int num_channels = params.find("num_channels"); + int num_channels = params.find("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 index 78ad182a4f..b9338af1da 100644 --- 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") )