Commit 9bfe670e authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot

Merge topic 'correct_more_diy2_warnings'

f4a96cf1 Correct warning in StorageBasic logging when using 32bit ids.
28128429 Merge branch 'upstream-diy' into correct_more_diy2_warnings
3c130d16 diy 2019-01-09 (149953b0)
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1513
parents 0241201d f4a96cf1
......@@ -227,7 +227,7 @@ void StorageBasicBase::AllocateValues(vtkm::Id numberOfValues, vtkm::UInt64 size
VTKM_LOG_F(vtkm::cont::LogLevel::MemCont,
"Allocated control array of %s. [element count %llu]",
vtkm::cont::GetSizeString(allocsize).c_str(),
numberOfValues);
static_cast<std::int64_t>(numberOfValues));
}
else
{
......
......@@ -671,6 +671,7 @@ diy::Master::
iexchange_(const ICallback<Block>& f)
{
auto scoped = prof.scoped("iexchange");
DIY_UNUSED(scoped);
// prepare for next round
incoming_.erase(exchange_round_);
......@@ -696,7 +697,7 @@ iexchange_(const ICallback<Block>& f)
int nundeq_after = 0;
int nunenq_after = 0;
for (size_t j = 0; j < cp.link()->size(); j++)
for (size_t j = 0; j < static_cast<size_t>(cp.link()->size()); j++)
{
if (cp.incoming(cp.link()->target(j).gid))
++nundeq_after;
......@@ -737,6 +738,7 @@ diy::Master::
comm_exchange(GidSendOrder& gid_order, IExchangeInfo* iexchange)
{
auto scoped = prof.scoped("comm-exchange");
DIY_UNUSED(scoped);
send_outgoing_queues(gid_order, false, iexchange);
while(nudge()); // kick requests
check_incoming_queues(iexchange);
......@@ -846,6 +848,7 @@ diy::Master::
icommunicate(IExchangeInfo* iexchange)
{
auto scoped = prof.scoped("icommunicate");
DIY_UNUSED(scoped);
log->debug("Entering icommunicate()");
......@@ -877,6 +880,7 @@ send_outgoing_queues(GidSendOrder& gid_order,
IExchangeInfo* iexchange)
{
auto scoped = prof.scoped("send-outgoing-queues");
DIY_UNUSED(scoped);
while (inflight_sends().size() < gid_order.limit && !gid_order.empty())
{
......@@ -1089,6 +1093,7 @@ diy::Master::
check_incoming_queues(IExchangeInfo* iexchange)
{
auto scoped = prof.scoped("check-incoming-queues");
DIY_UNUSED(scoped);
mpi::optional<mpi::status> ostatus = comm_.iprobe(mpi::any_source, mpi::any_tag);
while (ostatus)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment