#2281: Add unit tests for new callback (BcastCollective)

DARMA-tasking · Sep 3, 2024 · ee1a15e · ee1a15e
1 parent 0880641
commit ee1a15e
Show file tree

Hide file tree

Showing 12 changed files with 317 additions and 14 deletions.
diff --git a/src/vt/collective/reduce/allreduce/rabenseifner.h b/src/vt/collective/reduce/allreduce/rabenseifner.h
@@ -41,7 +41,6 @@
 //@HEADER
 */
 
-
 #if !defined INCLUDED_VT_COLLECTIVE_REDUCE_ALLREDUCE_RABENSEIFNER_H
 #define INCLUDED_VT_COLLECTIVE_REDUCE_ALLREDUCE_RABENSEIFNER_H
 

diff --git a/src/vt/collective/reduce/allreduce/rabenseifner_msg.h b/src/vt/collective/reduce/allreduce/rabenseifner_msg.h
@@ -41,7 +41,6 @@
 //@HEADER
 */
 
-
 #if !defined INCLUDED_VT_COLLECTIVE_REDUCE_ALLREDUCE_RABENSEIFNER_MSG_H
 #define INCLUDED_VT_COLLECTIVE_REDUCE_ALLREDUCE_RABENSEIFNER_MSG_H
 #include "vt/config.h"

diff --git a/src/vt/collective/reduce/allreduce/recursive_doubling.impl.h b/src/vt/collective/reduce/allreduce/recursive_doubling.impl.h
@@ -41,7 +41,6 @@
 //@HEADER
 */
 
-
 #if !defined INCLUDED_VT_COLLECTIVE_REDUCE_ALLREDUCE_RECURSIVE_DOUBLING_IMPL_H
 #define INCLUDED_VT_COLLECTIVE_REDUCE_ALLREDUCE_RECURSIVE_DOUBLING_IMPL_H
 

diff --git a/src/vt/group/group_manager.impl.h b/src/vt/group/group_manager.impl.h
@@ -41,7 +41,6 @@
 //@HEADER
 */
 
-#include "vt/objgroup/proxy/proxy_objgroup.h"
 #if !defined INCLUDED_VT_GROUP_GROUP_MANAGER_IMPL_H
 #define INCLUDED_VT_GROUP_GROUP_MANAGER_IMPL_H
 

diff --git a/src/vt/objgroup/manager.impl.h b/src/vt/objgroup/manager.impl.h
@@ -41,8 +41,6 @@
 //@HEADER
 */
 
-#include "vt/group/group_manager.h"
-#include "vt/utils/fntraits/fntraits.h"
 #if !defined INCLUDED_VT_OBJGROUP_MANAGER_IMPL_H
 #define INCLUDED_VT_OBJGROUP_MANAGER_IMPL_H
 

diff --git a/src/vt/pipe/pipe_manager.h b/src/vt/pipe/pipe_manager.h
@@ -135,6 +135,16 @@ struct PipeManager
   template <auto f, typename ProxyT>
   auto makeBcast(ProxyT proxy);
 
+  /**
+   * \brief Make collective broadcast callback to collection
+   *
+   * \param[in] proxy the proxy to target
+   *
+   * \return a callback
+   */
+  template <auto f, typename ProxyT>
+  auto makeBcastCollective(ProxyT proxy);
+
   /**
    * \brief Make callback to a function (including lambdas) with a context
    * pointer to any object on this node.

diff --git a/src/vt/pipe/pipe_manager.impl.h b/src/vt/pipe/pipe_manager.impl.h
@@ -154,6 +154,11 @@ auto PipeManager::makeBcast(ProxyT proxy) {
   return makeCallbackProxy<f, true>(proxy);
 }
 
+template <auto f, typename ProxyT>
+auto PipeManager::makeBcastCollective(ProxyT proxy) {
+  return makeCallbackBcastCollectiveProxy<f>(proxy);
+}
+
 template <typename MsgT, ActiveTypedFnType<MsgT>* f>
 Callback<MsgT> PipeManager::makeBcast() {
   return makeCallbackSingle<f, true>();

diff --git a/src/vt/pipe/pipe_manager_tl.h b/src/vt/pipe/pipe_manager_tl.h
@@ -114,7 +114,7 @@ struct PipeManagerTL : virtual PipeManagerBase {
   auto makeCallbackProxy(ProxyT proxy);
 
   template <auto f, typename ProxyT>
-  auto makeCallbackBcastProxy(ProxyT proxy);
+  auto makeCallbackBcastCollectiveProxy(ProxyT proxy);
 
   // Multi-staged callback
   template <typename=void>

diff --git a/src/vt/pipe/pipe_manager_tl.impl.h b/src/vt/pipe/pipe_manager_tl.impl.h
@@ -142,7 +142,7 @@ template <typename U>
 using hasIdx_t = typename U::IndexType;
 
 template <auto f, typename ProxyT>
-auto PipeManagerTL::makeCallbackBcastProxy(ProxyT proxy) {
+auto PipeManagerTL::makeCallbackBcastCollectiveProxy(ProxyT proxy) {
   bool const persist = true;
   bool const send_back = false;
   bool const dispatch = true;

diff --git a/src/vt/vrt/collection/manager.h b/src/vt/vrt/collection/manager.h
@@ -41,8 +41,6 @@
 //@HEADER
 */
 
-#include "vt/configs/types/types_type.h"
-#include <cstdint>
 #if !defined INCLUDED_VT_VRT_COLLECTION_MANAGER_H
 #define INCLUDED_VT_VRT_COLLECTION_MANAGER_H
 

diff --git a/src/vt/vrt/collection/manager.impl.h b/src/vt/vrt/collection/manager.impl.h
@@ -41,9 +41,6 @@
 //@HEADER
 */
 
-#include "vt/collective/reduce/scoping/strong_types.h"
-#include "vt/messaging/message/smart_ptr.h"
-#include "vt/vrt/collection/manager.fwd.h"
 #if !defined INCLUDED_VT_VRT_COLLECTION_MANAGER_IMPL_H
 #define INCLUDED_VT_VRT_COLLECTION_MANAGER_IMPL_H
 
@@ -936,7 +933,7 @@ messaging::PendingSend CollectionManager::reduceLocal(
       auto* obj = obj_proxy[theContext()->getNode()].get();
       obj->proxy_ = obj_proxy;
 
-      auto cb = vt::theCB()->makeCallbackBcastProxy<f>(proxy);
+      auto cb = vt::theCB()->makeCallbackBcastCollectiveProxy<f>(proxy);
       obj->setFinalHandler(cb);
 
       if(num_elms == 1){