Skip to content

Mercury: fix warnings #2308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sst-autotester merged 1 commit into from
Jan 22, 2024
Merged

Mercury: fix warnings #2308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/sst/elements/iris/sumi/collective_actor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,8 @@ DagCollectiveActor::sendEagerMessage(Action* ac)
uint64_t num_bytes;
void* buf = getSendBuffer(ac, num_bytes);

output.output("Rank %s, collective %s(%p) sending eager message to %d on tag=%d offset=%d num_bytes=%lu",
rankStr().c_str(), toString().c_str(), this, ac->partner, tag_, ac->offset, num_bytes);
output.output("Rank %s, collective %s(%p) sending eager message to %d on tag=%d offset=%d num_bytes=%llu",
rankStr().c_str(), toString().c_str(), this, ac->partner, tag_, ac->offset, (long long unsigned int) num_bytes);

/*auto* msg =*/ my_api_->smsgSend<CollectiveWorkMessage>(ac->phys_partner, num_bytes, buf,
cq_id_, cq_id_, Message::collective, engine_->smsgQos(),
Expand Down Expand Up @@ -668,7 +668,7 @@ DagCollectiveActor::nextRoundReadyToPut(
Action* ac, CollectiveWorkMessage* header)
{
output.output("Rank %s, collective %s ready to put for round=%d tag=%d from rank %d",
rankStr().c_str(), toString().c_str(), header, header->round(), tag_, header->domSender());
rankStr().c_str(), toString().c_str(), header->round(), tag_, header->domSender());

header->reverse();

Expand Down
1 change: 1 addition & 0 deletions src/sst/elements/mask-mpi/mpi_api_comm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ Questions? Contact sst-macro-help@sandia.gov
// mpi_api_debug(sprockit::dbg::mpi, "%s(%s) start", #fxn, commStr(comm).c_str())

#define StartCommCall(fxn,comm)
#undef FinishMPICall
#define FinishMPICall(fxn)

namespace SST::MASKMPI {
Expand Down
1 change: 1 addition & 0 deletions src/sst/elements/mask-mpi/mpi_api_send_recv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Questions? Contact sst-macro-help@sandia.gov
// StartMPICall(fxn)
#define start_pt2pt_call(fxn, count, type, partner, tag, comm)
#define start_Ipt2pt_call(fxn,count,type,partner,tag,comm,reqPtr)
#undef FinishMPICall
#define FinishMPICall(fxn)

namespace SST::MASKMPI {
Expand Down
2 changes: 2 additions & 0 deletions src/sst/elements/mask-mpi/mpi_api_wait.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ Questions? Contact sst-macro-help@sandia.gov
//#include <sstmac/software/process/ftq_scope.h>
#include <cassert>

#undef StartMPICall
#define StartMPICall(fxn)
#undef FinishMPICall
#define FinishMPICall(fxn)

namespace SST::MASKMPI {
Expand Down
2 changes: 0 additions & 2 deletions src/sst/elements/mask-mpi/mpi_protocol/rendezvous_rdma.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ Questions? Contact sst-macro-help@sandia.gov
#include <sst/core/params.h>
//#include <mercury/common/null_buffer.h>

#pragma once

namespace SST::MASKMPI {

RendezvousProtocol::RendezvousProtocol(SST::Params& params, MpiQueue* queue) :
Expand Down
3 changes: 0 additions & 3 deletions src/sst/elements/mercury/common/component.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ namespace Hg {

static int _self_id_(-1);

template<> SST::TimeConverter* HgBase<SST::Component>::time_converter_ = nullptr;
template<> SST::TimeConverter* HgBase<SST::SubComponent>::time_converter_ = nullptr;

template<> int HgBase<SST::Component>::self_id() {
++_self_id_;
return _self_id_;
Expand Down
3 changes: 3 additions & 0 deletions src/sst/elements/mercury/common/component.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ HgBase(uint32_t id) :
SST::Link* self_link_;
};

template <typename CoreBase>
SST::TimeConverter* HgBase<CoreBase>::time_converter_ = nullptr;

class Component : public HgBase<SST::Component>
{
protected:
Expand Down
2 changes: 0 additions & 2 deletions src/sst/elements/mercury/common/event_link.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Questions? Contact sst-macro-help@sandia.gov
*/

#pragma once

#include <mercury/common/event_link.h>

#define connect_str_case(x) case x: return #x
Expand Down