From 67c1d9419c41e7939be0e52e7d8d0f7a477aaac5 Mon Sep 17 00:00:00 2001 From: Jakub Domagala Date: Tue, 6 Oct 2020 16:35:46 +0200 Subject: [PATCH] #1024: Rename newly added communication type for collective bcast --- docs/md/node-stats.md | 2 +- src/vt/vrt/collection/balance/lb_comm.h | 2 +- src/vt/vrt/collection/balance/node_stats.cc | 2 +- src/vt/vrt/collection/manager.impl.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/md/node-stats.md b/docs/md/node-stats.md index e792c8d056..059ef216b8 100644 --- a/docs/md/node-stats.md +++ b/docs/md/node-stats.md @@ -55,7 +55,7 @@ the code. | 4 | `CommCategory::Broadcast` | A broadcast from a collection element to a whole collection (receive-side) | | 5 | `CommCategory::CollectionToNodeBcast` | A broadcast from a collection element to all nodes (receive-side) | | 6 | `CommCategory::NodeToCollectionBcast` | A broadcast from a node to a whole collection (receive-side) | -| 7 | `CommCategory::CollectiveNodeToCollectionEdges` | Collective broadcast from a node to all its edges (receive-side) | +| 7 | `CommCategory::CollectiveToCollectionBcast` | Collective 'broadcast' from every node to the local collection elements (receive-side) | For all the broadcast-like edges, the communication logging will occur on the receive of the broadcast side (one entry per broadcast recipient). diff --git a/src/vt/vrt/collection/balance/lb_comm.h b/src/vt/vrt/collection/balance/lb_comm.h index d2be7c79f4..c71a43ebec 100644 --- a/src/vt/vrt/collection/balance/lb_comm.h +++ b/src/vt/vrt/collection/balance/lb_comm.h @@ -59,7 +59,7 @@ enum struct CommCategory : int8_t { Broadcast = 4, CollectionToNodeBcast = 5, NodeToCollectionBcast = 6, - CollectiveNodeToCollectionEdges = 7 + CollectiveToCollectionBcast = 7 }; inline NodeType objGetNode(ElementIDType const id) { diff --git a/src/vt/vrt/collection/balance/node_stats.cc b/src/vt/vrt/collection/balance/node_stats.cc index 15f07bc09e..b97ae5b2fd 100644 --- a/src/vt/vrt/collection/balance/node_stats.cc +++ b/src/vt/vrt/collection/balance/node_stats.cc @@ -243,7 +243,7 @@ getRecvSendDirection(CommKeyType const& comm) { // Comm stats are not recorded for collective bcast // this case is just to avoid warning of not handled enum - case CommCategory::CollectiveNodeToCollectionEdges: + case CommCategory::CollectiveToCollectionBcast: return std::make_pair(ElementIDType{}, ElementIDType{}); } diff --git a/src/vt/vrt/collection/manager.impl.h b/src/vt/vrt/collection/manager.impl.h index 82a90bd274..cb66f597a5 100644 --- a/src/vt/vrt/collection/manager.impl.h +++ b/src/vt/vrt/collection/manager.impl.h @@ -908,7 +908,7 @@ messaging::PendingSend CollectionManager::broadcastCollectiveMsgImpl( #if vt_check_enabled(lblite) msg->setLBLiteInstrument(instrument); - msg->setCat(balance::CommCategory::NodeToCollectionBcast); + msg->setCat(balance::CommCategory::CollectiveToCollectionBcast); #endif auto const cur_epoch = theMsg()->setupEpochMsg(msg);