From da1a19b134ae3a6140d06400b83fcb29de3dfd0f Mon Sep 17 00:00:00 2001
From: "Min W. Priest (they/them)" <bwpriester@gmail.com>
Date: Mon, 9 Sep 2024 16:19:38 -0700
Subject: [PATCH 1/4] added dnnd::add_points method that accepts a YGM
 container

---
 include/saltatlas/dnnd/dnnd_simple.hpp | 27 ++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/include/saltatlas/dnnd/dnnd_simple.hpp b/include/saltatlas/dnnd/dnnd_simple.hpp
index 3446a96..7fcf01a 100644
--- a/include/saltatlas/dnnd/dnnd_simple.hpp
+++ b/include/saltatlas/dnnd/dnnd_simple.hpp
@@ -144,6 +144,18 @@ class dnnd {
     m_comm.barrier();
   }
 
+  /// \brief Add points to the internal point store.
+  /// All ranks must call this function although some ranks add no points.
+  /// \tparam container_type Associative YGM container type for key-value store.
+  /// \param container Associative YGM container.
+  template <template <typename, typename> class container_type>
+  void add_points(container_type<id_type, point_type>& container) {
+    container.for_all([this](const id_type id, const point_type& point) {
+      this->add_point(id, point);
+    });
+    m_comm.barrier();
+  }
+
   /// \brief Load points from files and add to the internal point store.
   /// All ranks must call this function although some ranks load no points.
   /// \tparam paths_iterator Iterator type for file paths.
@@ -420,6 +432,21 @@ class dnnd {
     return [size](const id_type& id) { return id % size; };
   };
 
+  /// \brief Add a single point. Only to be used by add_points.
+  void add_point(const id_type id, const point_type& point) {
+    auto receiver = [](auto, auto this_ptr, const id_t id,
+                       const auto& sent_point) {
+      if (this_ptr->m_pstore.contains(id)) {
+        std::cerr << "Duplicate ID " << id << std::endl;
+        MPI_Abort(MPI_COMM_WORLD, EXIT_FAILURE);
+      }
+      this_ptr->m_pstore[id] = sent_point;
+    };
+
+    const auto dst = priv_get_point_partitioner()(id);
+    m_comm.async(dst, receiver, m_this, id, point);
+  }
+
   distance_function_type  m_distance_func;
   ygm::comm&              m_comm;
   uint64_t                m_rnd_seed;

From ae383e16083a568a4a4fe2ee60c982599b486e1f Mon Sep 17 00:00:00 2001
From: "Min W. Priest (they/them)" <bwpriester@gmail.com>
Date: Tue, 10 Sep 2024 10:17:21 -0700
Subject: [PATCH 2/4] added ygm concept constraints to dnnd::add_points()

---
 include/saltatlas/dnnd/dnnd_simple.hpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/include/saltatlas/dnnd/dnnd_simple.hpp b/include/saltatlas/dnnd/dnnd_simple.hpp
index 7fcf01a..85ba9a2 100644
--- a/include/saltatlas/dnnd/dnnd_simple.hpp
+++ b/include/saltatlas/dnnd/dnnd_simple.hpp
@@ -14,6 +14,7 @@
 #include <string_view>
 
 #include <ygm/comm.hpp>
+#include <ygm/container/detail/base_concepts.hpp>
 
 #include "saltatlas/dnnd/data_reader.hpp"
 #include "saltatlas/dnnd/detail/distance.hpp"
@@ -146,10 +147,16 @@ class dnnd {
 
   /// \brief Add points to the internal point store.
   /// All ranks must call this function although some ranks add no points.
-  /// \tparam container_type Associative YGM container type for key-value store.
+  /// \tparam ygm_container_type Associative YGM container type for key-value
+  /// store.
   /// \param container Associative YGM container.
-  template <template <typename, typename> class container_type>
-  void add_points(container_type<id_type, point_type>& container) {
+  template <template <typename, typename> class ygm_container_type>
+  void add_points(ygm_container_type<id_type, point_type>& container)
+    requires ygm::container::detail::HasForAll<
+                 ygm_container_type<id_type, point_type>> &&
+             ygm::container::detail::DoubleItemTuple<
+                 typename ygm_container_type<id_type, point_type>::for_all_args>
+  {
     container.for_all([this](const id_type id, const point_type& point) {
       this->add_point(id, point);
     });

From ace4241b1703f25133d0d8940891f01c823cdee1 Mon Sep 17 00:00:00 2001
From: "Min W. Priest (they/them)" <bwpriester@gmail.com>
Date: Tue, 10 Sep 2024 10:22:40 -0700
Subject: [PATCH 3/4] changed dnnd::add_point -> dnnd::priv_add_point to be
 more clear about usage.

---
 include/saltatlas/dnnd/dnnd_simple.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/saltatlas/dnnd/dnnd_simple.hpp b/include/saltatlas/dnnd/dnnd_simple.hpp
index 85ba9a2..f583d7e 100644
--- a/include/saltatlas/dnnd/dnnd_simple.hpp
+++ b/include/saltatlas/dnnd/dnnd_simple.hpp
@@ -158,7 +158,7 @@ class dnnd {
                  typename ygm_container_type<id_type, point_type>::for_all_args>
   {
     container.for_all([this](const id_type id, const point_type& point) {
-      this->add_point(id, point);
+      this->priv_add_point(id, point);
     });
     m_comm.barrier();
   }
@@ -440,7 +440,7 @@ class dnnd {
   };
 
   /// \brief Add a single point. Only to be used by add_points.
-  void add_point(const id_type id, const point_type& point) {
+  void priv_add_point(const id_type id, const point_type& point) {
     auto receiver = [](auto, auto this_ptr, const id_t id,
                        const auto& sent_point) {
       if (this_ptr->m_pstore.contains(id)) {

From ecb650517f0860f779e86024ce71becc90461aa6 Mon Sep 17 00:00:00 2001
From: "Min W. Priest (they/them)" <bwpriester@gmail.com>
Date: Wed, 9 Oct 2024 15:12:04 -0700
Subject: [PATCH 4/4] added array signature accepting add_points method to
 dnnd_simple API.

---
 include/saltatlas/dnnd/dnnd_simple.hpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/include/saltatlas/dnnd/dnnd_simple.hpp b/include/saltatlas/dnnd/dnnd_simple.hpp
index f583d7e..8f9b60b 100644
--- a/include/saltatlas/dnnd/dnnd_simple.hpp
+++ b/include/saltatlas/dnnd/dnnd_simple.hpp
@@ -163,6 +163,24 @@ class dnnd {
     m_comm.barrier();
   }
 
+  /// \brief Add points to the internal point store.
+  /// All ranks must call this function although some ranks add no points.
+  /// \tparam ygm_container_type Associative YGM container type for key-value
+  /// store (with array-type template signature).
+  /// \param container Associative YGM container.
+  template <template <typename, typename> class ygm_container_type>
+  void add_points(ygm_container_type<point_type, id_type>& container)
+    requires ygm::container::detail::HasForAll<
+                 ygm_container_type<id_type, point_type>> &&
+             ygm::container::detail::DoubleItemTuple<
+                 typename ygm_container_type<id_type, point_type>::for_all_args>
+  {
+    container.for_all([this](const id_type id, const point_type& point) {
+      this->priv_add_point(id, point);
+    });
+    m_comm.barrier();
+  }
+
   /// \brief Load points from files and add to the internal point store.
   /// All ranks must call this function although some ranks load no points.
   /// \tparam paths_iterator Iterator type for file paths.