Skip to content

Commit

Permalink
#1024: Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
JacobDomagala authored and Braden Mailloux committed Oct 15, 2020
1 parent d654b66 commit a3b3282
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
6 changes: 4 additions & 2 deletions src/vt/vrt/collection/broadcast/broadcastable.impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ Broadcastable<ColT, IndexT, BaseProxyT>::broadcastCollective(MsgSharedPtr<MsgT>

template <typename ColT, typename IndexT, typename BaseProxyT>
template <
typename MsgT, ActiveColTypedFnType<MsgT, ColT> *f, typename... Args>
typename MsgT, ActiveColTypedFnType<MsgT, ColT> *f, typename... Args
>
messaging::PendingSend
Broadcastable<ColT, IndexT, BaseProxyT>::broadcastCollective(Args&&... args) const {
return broadcastCollective<MsgT, f>(makeMessage<MsgT>(std::forward<Args>(args)...));
Expand All @@ -136,7 +137,8 @@ Broadcastable<ColT, IndexT, BaseProxyT>::broadcastCollective(MsgSharedPtr<MsgT>

template <typename ColT, typename IndexT, typename BaseProxyT>
template <
typename MsgT, ActiveColMemberTypedFnType<MsgT, ColT> f, typename... Args>
typename MsgT, ActiveColMemberTypedFnType<MsgT, ColT> f, typename... Args
>
messaging::PendingSend
Broadcastable<ColT, IndexT, BaseProxyT>::broadcastCollective(Args&&... args) const {
return broadcastCollective<MsgT, f>(makeMessage<MsgT>(std::forward<Args>(args)...));
Expand Down
6 changes: 4 additions & 2 deletions src/vt/vrt/collection/manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,8 @@ struct CollectionManager
*/
template <
typename MsgT,
ActiveColTypedFnType<MsgT,typename MsgT::CollectionType> *f>
ActiveColTypedFnType<MsgT,typename MsgT::CollectionType> *f
>
messaging::PendingSend broadcastMsgCollective(
CollectionProxyWrapType<typename MsgT::CollectionType> const& proxy,
MsgT* msg, bool instrument = true);
Expand All @@ -977,7 +978,8 @@ struct CollectionManager
*/
template <
typename MsgT,
ActiveColMemberTypedFnType<MsgT, typename MsgT::CollectionType> f>
ActiveColMemberTypedFnType<MsgT, typename MsgT::CollectionType> f
>
messaging::PendingSend broadcastMsgCollective(
CollectionProxyWrapType<typename MsgT::CollectionType> const& proxy,
MsgT* msg, bool instrument = true);
Expand Down
11 changes: 7 additions & 4 deletions src/vt/vrt/collection/manager.impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,8 @@ messaging::PendingSend CollectionManager::broadcastMsgCollective(
using ColT = typename MsgT::CollectionType;

msg->setVrtHandler(
auto_registry::makeAutoHandlerCollectionMem<ColT, MsgT, f>());
auto_registry::makeAutoHandlerCollectionMem<ColT, MsgT, f>()
);
msg->setMember(true);

return broadcastMsgCollectiveImpl<MsgT, ColT>(proxy, msg, instrument);
Expand All @@ -899,7 +900,8 @@ messaging::PendingSend CollectionManager::broadcastMsgCollectiveImpl(
auto_registry::RegistryTypeEnum::RegVrtCollection;
auto msg_size = vt::serialization::MsgSizer<MsgT>::get(msg.get());
auto event = theMsg()->makeTraceCreationSend(
msg, msg->getVrtHandler(), reg_type, msg_size, true);
msg, msg->getVrtHandler(), reg_type, msg_size, true
);
msg->setFromTraceEvent(event);
#endif

Expand All @@ -911,7 +913,7 @@ messaging::PendingSend CollectionManager::broadcastMsgCollectiveImpl(
theMsg()->setupEpochMsg(msg);

return messaging::PendingSend(
msg, [proxy](MsgSharedPtr<BaseMsgType>& msgIn) {
msg, [proxy](MsgSharedPtr<BaseMsgType>& msgIn){
auto col_msg = reinterpret_cast<MsgT*>(msgIn.get());

auto elm_holder = theCollection()->findElmHolder<ColT, IndexT>(proxy);
Expand All @@ -921,7 +923,8 @@ messaging::PendingSend CollectionManager::broadcastMsgCollectiveImpl(
theMsg()->markAsCollectionMessage(col_msg);

collectionBcastHandler<ColT, IndexT, MsgT>(col_msg);
});
}
);
}

template <
Expand Down

0 comments on commit a3b3282

Please sign in to comment.