Skip to content

Commit

Permalink
#1024: Remove warnings introduced after deprecating send functions fo…
Browse files Browse the repository at this point in the history
…r collection proxy
  • Loading branch information
JacobDomagala authored and Braden Mailloux committed Oct 15, 2020
1 parent 6a99126 commit 9091621
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions examples/collection/jacobi1d_vt.cc
Original file line number Diff line number Diff line change
Expand Up @@ -260,13 +260,13 @@ struct LinearPb1DJacobi : vt::Collection<LinearPb1DJacobi,vt::Index1D> {
auto proxy = this->getCollectionProxy();
if (myIdx > 0) {
auto leftMsg = vt::makeMessage<VecMsg>(myIdx, told_[1]);
proxy[myIdx-1].send<VecMsg, &LinearPb1DJacobi::exchange>(leftMsg.get());
proxy[myIdx-1].sendMsg<VecMsg, &LinearPb1DJacobi::exchange>(leftMsg.get());
}

//--- Send values to the right
if (size_t(myIdx) < numObjs_ - 1) {
auto rightMsg = vt::makeMessage<VecMsg>(myIdx, told_[numRowsPerObject_]);
proxy[myIdx+1].send<VecMsg, &LinearPb1DJacobi::exchange>(rightMsg.get());
proxy[myIdx+1].sendMsg<VecMsg, &LinearPb1DJacobi::exchange>(rightMsg.get());
}
}

Expand Down
8 changes: 4 additions & 4 deletions examples/collection/jacobi2d_vt.cc
Original file line number Diff line number Diff line change
Expand Up @@ -313,15 +313,15 @@ struct LinearPb2DJacobi : vt::Collection<LinearPb2DJacobi,vt::Index2D> {
for (size_t jy = 1; jy <= numRowsPerObject_; ++jy)
tcopy[jy] = told_[1 + jy * (numRowsPerObject_ + 2)];
auto leftX = vt::makeMessage<VecMsg>(idx, tcopy);
proxy(x-1, y).send<VecMsg, &LinearPb2DJacobi::exchange>(leftX.get());
proxy(x-1, y).sendMsg<VecMsg, &LinearPb2DJacobi::exchange>(leftX.get());
}

if (y > 0) {
std::vector<double> tcopy(numRowsPerObject_ + 2, 0.0);
for (size_t jx = 1; jx <= numRowsPerObject_; ++jx)
tcopy[jx] = told_[jx + (numRowsPerObject_ + 2)];
auto bottomY = vt::makeMessage<VecMsg>(idx, tcopy);
proxy(x, y-1).send<VecMsg, &LinearPb2DJacobi::exchange>(bottomY.get());
proxy(x, y-1).sendMsg<VecMsg, &LinearPb2DJacobi::exchange>(bottomY.get());
}

if (size_t(x) < numObjsX_ - 1) {
Expand All @@ -331,15 +331,15 @@ struct LinearPb2DJacobi : vt::Collection<LinearPb2DJacobi,vt::Index2D> {
jy * (numRowsPerObject_ + 2)];
}
auto rightX = vt::makeMessage<VecMsg>(idx, tcopy);
proxy(x+1, y).send<VecMsg, &LinearPb2DJacobi::exchange>(rightX.get());
proxy(x+1, y).sendMsg<VecMsg, &LinearPb2DJacobi::exchange>(rightX.get());
}

if (size_t(y) < numObjsY_ - 1) {
std::vector<double> tcopy(numRowsPerObject_ + 2, 0.0);
for (size_t jx = 1; jx <= numRowsPerObject_; ++jx)
tcopy[jx] = told_[jx + numRowsPerObject_ * (numRowsPerObject_ + 2)];
auto topY = vt::makeMessage<VecMsg>(idx, tcopy);
proxy(x, y+1).send<VecMsg, &LinearPb2DJacobi::exchange>(topY.get());
proxy(x, y+1).sendMsg<VecMsg, &LinearPb2DJacobi::exchange>(topY.get());
}

}
Expand Down
2 changes: 1 addition & 1 deletion examples/collection/transpose.cc
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ vt::NodeType my_map(IndexT* idx, IndexT* max_idx, vt::NodeType num_nodes) {
// Here we will send "this_node" to indicate which nod it should come back
// to. Eventually, I will implement a "sub_rank" in VT which can use the
// sub-rank instead of the global node id.
proxy[block_id].send<RequestDataMsg<Block>,&Block::dataRequest>(msg2.get());
proxy[block_id].sendMsg<RequestDataMsg<Block>,&Block::dataRequest>(msg2.get());
}
}

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/collection/test_index_types.extended.cc
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ TYPED_TEST_P(TestCollectionIndexTypes, test_collection_index_1) {
for (BaseIndexType i = 0; i < static_cast<BaseIndexType>(col_size); i++) {
auto msg = makeMessage<MsgType>(34);
if (i % 2 == 0) {
proxy[i].template send<MsgType,&ColType::handler>(msg.get());
proxy[i].template sendMsg<MsgType,&ColType::handler>(msg.get());
} else {
theCollection()->sendMsg<MsgType,&ColType::handler>(
proxy[i], msg.get()
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/collection/test_insert.extended.cc
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ TEST_F(TestInsert, test_insert_send_dense_node_1) {
for (auto i = 0; i < range.x(); i++) {
proxy[i].insert((this_node + 1) % num_nodes);
auto msg = makeMessage<WorkMsg>();
proxy[i].send<WorkMsg,&InsertTest::work>(msg.get());
proxy[i].sendMsg<WorkMsg,&InsertTest::work>(msg.get());
// ::fmt::print("sending to {}\n", i);
}
}
Expand All @@ -201,7 +201,7 @@ TEST_F(TestInsert, test_insert_send_sparse_node_1) {
for (auto i = 0; i < range.x(); i+=16) {
proxy[i].insert((this_node + 1) % num_nodes);
auto msg = makeMessage<WorkMsg>();
proxy[i].send<WorkMsg,&InsertTest::work>(msg.get());
proxy[i].sendMsg<WorkMsg,&InsertTest::work>(msg.get());
}
}
});
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/collection/test_send.h
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ TYPED_TEST_P(TestCollectionSend, test_collection_send_1) {
auto msg = makeMessage<MsgType>(args);
//proxy[i].template send<MsgType,SendHandlers<ColType>::handler>(msg);
if (i % 2 == 0) {
proxy[i].template send<MsgType,SendHandlers<ColType>::handler>(msg.get());
proxy[i].template sendMsg<MsgType,SendHandlers<ColType>::handler>(msg.get());
} else {
theCollection()->sendMsg<MsgType,SendHandlers<ColType>::handler>(
proxy[i], msg.get()
Expand All @@ -178,7 +178,7 @@ TYPED_TEST_P(TestCollectionSendMem, test_collection_send_ptm_1) {
auto msg = makeMessage<MsgType>(args);
//proxy[i].template send<MsgType,SendHandlers<ColType>::handler>(msg);
if (i % 2 == 0) {
proxy[i].template send<MsgType,&ColType::handler>(msg.get());
proxy[i].template sendMsg<MsgType,&ColType::handler>(msg.get());
} else {
theCollection()->sendMsg<MsgType,&ColType::handler>(
proxy[i], msg.get()
Expand Down
2 changes: 1 addition & 1 deletion tutorial/tutorial_2a.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ static inline void collection() {

// Send a message to the 5th element of the collection
auto msg2 = ::vt::makeMessage<MyCollMsg>();
proxy[5].send<MyCollMsg,&MyCol::msgHandler>(msg2.get());
proxy[5].sendMsg<MyCollMsg,&MyCol::msgHandler>(msg2.get());
}
}
/// [Tutorial2A]
Expand Down

0 comments on commit 9091621

Please sign in to comment.