From 90916214838fbd0c9e1abb0f8dfd281d17a50a07 Mon Sep 17 00:00:00 2001 From: Jakub Domagala Date: Thu, 1 Oct 2020 18:14:47 +0200 Subject: [PATCH] #1024: Remove warnings introduced after deprecating send functions for collection proxy --- examples/collection/jacobi1d_vt.cc | 4 ++-- examples/collection/jacobi2d_vt.cc | 8 ++++---- examples/collection/transpose.cc | 2 +- tests/unit/collection/test_index_types.extended.cc | 2 +- tests/unit/collection/test_insert.extended.cc | 4 ++-- tests/unit/collection/test_send.h | 4 ++-- tutorial/tutorial_2a.h | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/collection/jacobi1d_vt.cc b/examples/collection/jacobi1d_vt.cc index 3ab3deedc4..54239d4dc0 100644 --- a/examples/collection/jacobi1d_vt.cc +++ b/examples/collection/jacobi1d_vt.cc @@ -260,13 +260,13 @@ struct LinearPb1DJacobi : vt::Collection { auto proxy = this->getCollectionProxy(); if (myIdx > 0) { auto leftMsg = vt::makeMessage(myIdx, told_[1]); - proxy[myIdx-1].send(leftMsg.get()); + proxy[myIdx-1].sendMsg(leftMsg.get()); } //--- Send values to the right if (size_t(myIdx) < numObjs_ - 1) { auto rightMsg = vt::makeMessage(myIdx, told_[numRowsPerObject_]); - proxy[myIdx+1].send(rightMsg.get()); + proxy[myIdx+1].sendMsg(rightMsg.get()); } } diff --git a/examples/collection/jacobi2d_vt.cc b/examples/collection/jacobi2d_vt.cc index 3ba7f62b38..a0c4de023e 100644 --- a/examples/collection/jacobi2d_vt.cc +++ b/examples/collection/jacobi2d_vt.cc @@ -313,7 +313,7 @@ struct LinearPb2DJacobi : vt::Collection { for (size_t jy = 1; jy <= numRowsPerObject_; ++jy) tcopy[jy] = told_[1 + jy * (numRowsPerObject_ + 2)]; auto leftX = vt::makeMessage(idx, tcopy); - proxy(x-1, y).send(leftX.get()); + proxy(x-1, y).sendMsg(leftX.get()); } if (y > 0) { @@ -321,7 +321,7 @@ struct LinearPb2DJacobi : vt::Collection { for (size_t jx = 1; jx <= numRowsPerObject_; ++jx) tcopy[jx] = told_[jx + (numRowsPerObject_ + 2)]; auto bottomY = vt::makeMessage(idx, tcopy); - proxy(x, y-1).send(bottomY.get()); + proxy(x, y-1).sendMsg(bottomY.get()); } if (size_t(x) < numObjsX_ - 1) { @@ -331,7 +331,7 @@ struct LinearPb2DJacobi : vt::Collection { jy * (numRowsPerObject_ + 2)]; } auto rightX = vt::makeMessage(idx, tcopy); - proxy(x+1, y).send(rightX.get()); + proxy(x+1, y).sendMsg(rightX.get()); } if (size_t(y) < numObjsY_ - 1) { @@ -339,7 +339,7 @@ struct LinearPb2DJacobi : vt::Collection { for (size_t jx = 1; jx <= numRowsPerObject_; ++jx) tcopy[jx] = told_[jx + numRowsPerObject_ * (numRowsPerObject_ + 2)]; auto topY = vt::makeMessage(idx, tcopy); - proxy(x, y+1).send(topY.get()); + proxy(x, y+1).sendMsg(topY.get()); } } diff --git a/examples/collection/transpose.cc b/examples/collection/transpose.cc index 82aeeda834..bae60b1bbb 100644 --- a/examples/collection/transpose.cc +++ b/examples/collection/transpose.cc @@ -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,&Block::dataRequest>(msg2.get()); + proxy[block_id].sendMsg,&Block::dataRequest>(msg2.get()); } } diff --git a/tests/unit/collection/test_index_types.extended.cc b/tests/unit/collection/test_index_types.extended.cc index c7391b8806..a168edd08f 100644 --- a/tests/unit/collection/test_index_types.extended.cc +++ b/tests/unit/collection/test_index_types.extended.cc @@ -109,7 +109,7 @@ TYPED_TEST_P(TestCollectionIndexTypes, test_collection_index_1) { for (BaseIndexType i = 0; i < static_cast(col_size); i++) { auto msg = makeMessage(34); if (i % 2 == 0) { - proxy[i].template send(msg.get()); + proxy[i].template sendMsg(msg.get()); } else { theCollection()->sendMsg( proxy[i], msg.get() diff --git a/tests/unit/collection/test_insert.extended.cc b/tests/unit/collection/test_insert.extended.cc index a5333b4eed..07ccd766db 100644 --- a/tests/unit/collection/test_insert.extended.cc +++ b/tests/unit/collection/test_insert.extended.cc @@ -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(); - proxy[i].send(msg.get()); + proxy[i].sendMsg(msg.get()); // ::fmt::print("sending to {}\n", i); } } @@ -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(); - proxy[i].send(msg.get()); + proxy[i].sendMsg(msg.get()); } } }); diff --git a/tests/unit/collection/test_send.h b/tests/unit/collection/test_send.h index f89a5fdd56..8bbb4b2376 100644 --- a/tests/unit/collection/test_send.h +++ b/tests/unit/collection/test_send.h @@ -153,7 +153,7 @@ TYPED_TEST_P(TestCollectionSend, test_collection_send_1) { auto msg = makeMessage(args); //proxy[i].template send::handler>(msg); if (i % 2 == 0) { - proxy[i].template send::handler>(msg.get()); + proxy[i].template sendMsg::handler>(msg.get()); } else { theCollection()->sendMsg::handler>( proxy[i], msg.get() @@ -178,7 +178,7 @@ TYPED_TEST_P(TestCollectionSendMem, test_collection_send_ptm_1) { auto msg = makeMessage(args); //proxy[i].template send::handler>(msg); if (i % 2 == 0) { - proxy[i].template send(msg.get()); + proxy[i].template sendMsg(msg.get()); } else { theCollection()->sendMsg( proxy[i], msg.get() diff --git a/tutorial/tutorial_2a.h b/tutorial/tutorial_2a.h index 1dfb892832..4bf874b348 100644 --- a/tutorial/tutorial_2a.h +++ b/tutorial/tutorial_2a.h @@ -98,7 +98,7 @@ static inline void collection() { // Send a message to the 5th element of the collection auto msg2 = ::vt::makeMessage(); - proxy[5].send(msg2.get()); + proxy[5].sendMsg(msg2.get()); } } /// [Tutorial2A]