Skip to content

Commit

Permalink
Merge pull request #2327 from DARMA-tasking/2318-testobjgrouptest_pro…
Browse files Browse the repository at this point in the history
…xy_multicast_proc_32-fails

#2318: Fix and issue with multicast not sending to all required nodes
  • Loading branch information
lifflander authored Jul 17, 2024
2 parents e057b12 + c080704 commit 0a89430
Showing 1 changed file with 23 additions and 6 deletions.
29 changes: 23 additions & 6 deletions src/vt/objgroup/proxy/proxy_objgroup.impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ Proxy<ObjT>::multicast(GroupType type, Params&&... params) const{
template <typename ObjT>
template <auto f, typename... Params>
typename Proxy<ObjT>::PendingSendType Proxy<ObjT>::multicast(
group::region::Region::RegionUPtrType&& nodes, Params&&... params) const {
group::region::Region::RegionUPtrType&& nodes, Params&&... params
) const {
vtAssert(
not dynamic_cast<group::region::ShallowList*>(nodes.get()),
"multicast: range of nodes is not supported for ShallowList!"
Expand All @@ -150,13 +151,29 @@ typename Proxy<ObjT>::PendingSendType Proxy<ObjT>::multicast(

auto groupID = theGroup()->GetTempGroupForRange(range);
if (!groupID.has_value()) {
groupID = theGroup()->newGroup(
std::move(nodes), []([[maybe_unused]] GroupType type) {}
);
theGroup()->AddNewTempGroup(range, groupID.value());
return typename Proxy<ObjT>::PendingSendType{
theTerm()->getCurrentEpoch(),
[&, this,
args = std::make_tuple(std::forward<Params>(params)...)] {
std::apply(
[&, this](auto&&... unpackedArgs) {
// Explicit copy, we move 'nodes' in group creation
auto range_copy = nodes->makeList();
auto id =
theGroup()->newGroup(std::move(nodes), [&, this](GroupType type) {
multicast<f>(
type, std::forward<decltype(unpackedArgs)>(unpackedArgs)...);
});
theGroup()->AddNewTempGroup(range_copy, id);
},
std::move(args));
}};
} else {
return multicast<f>(groupID.value(), std::forward<Params>(params)...);
}

return multicast<f>(groupID.value(), std::forward<Params>(params)...);
// Silence nvcc warning (no longer needed for CUDA 11.7 and up)
return typename Proxy<ObjT>::PendingSendType{std::nullptr_t{}};
}

template <typename ObjT>
Expand Down

0 comments on commit 0a89430

Please sign in to comment.