remove need for make_space_iterator

NVIDIA · Aug 31, 2022 · 5708e6c · 5708e6c
1 parent dc7e2b7
commit 5708e6c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 33 deletions.
diff --git a/examples/custom_iteration_spaces.cu b/examples/custom_iteration_spaces.cu
@@ -130,7 +130,7 @@ struct under_diag final : nvbench::user_axis_space
       };
 
     const size_t iteration_length = ((info[0].size * (info[1].size + 1)) / 2);
-    return nvbench::detail::make_space_iterator(2,
+    return nvbench::detail::axis_space_iterator(2,
                                                 iteration_length,
                                                 adv_func,
                                                 diag_under);
@@ -201,7 +201,7 @@ struct gauss final : nvbench::user_axis_space
       indices[locs[0]]                 = temp;
     };
 
-    return nvbench::detail::make_space_iterator(1,
+    return nvbench::detail::axis_space_iterator(1,
                                                 iteration_length,
                                                 gauss_func);
   }

diff --git a/nvbench/detail/axes_iterator.cuh b/nvbench/detail/axes_iterator.cuh
@@ -60,6 +60,26 @@ struct axis_space_iterator
   using UpdateSignature  = void(std::size_t index,
                                std::vector<axis_index> &indices);
 
+  axis_space_iterator(
+    std::size_t axes_count,
+    std::size_t iter_count,
+    std::function<axis_space_iterator::AdvanceSignature> &&advance,
+    std::function<axis_space_iterator::UpdateSignature> &&update)
+      : m_number_of_axes(axes_count)
+      , m_iteration_size(iter_count)
+      , m_advance(std::move(advance))
+      , m_update(std::move(update))
+  {}
+
+  axis_space_iterator(
+    std::size_t axes_count,
+    std::size_t iter_count,
+    std::function<axis_space_iterator::UpdateSignature> &&update)
+      : m_number_of_axes(axes_count)
+      , m_iteration_size(iter_count)
+      , m_update(std::move(update))
+  {}
+
   [[nodiscard]] bool inc()
   {
     return this->m_advance(m_current_index, m_iteration_size);
@@ -83,31 +103,5 @@ private:
   std::size_t m_current_index = 0;
 };
 
-inline axis_space_iterator make_space_iterator(
-  std::size_t axes_count,
-  std::size_t iter_count,
-  std::function<axis_space_iterator::AdvanceSignature> &&advance,
-  std::function<axis_space_iterator::UpdateSignature> &&update)
-{
-  axis_space_iterator iter;
-  iter.m_number_of_axes = axes_count;
-  iter.m_iteration_size = iter_count;
-  iter.m_advance        = std::move(advance);
-  iter.m_update         = std::move(update);
-  return iter;
-}
-
-inline axis_space_iterator make_space_iterator(
-  std::size_t axes_count,
-  std::size_t iter_count,
-  std::function<axis_space_iterator::UpdateSignature> &&update)
-{
-  axis_space_iterator iter;
-  iter.m_number_of_axes = axes_count;
-  iter.m_iteration_size = iter_count;
-  iter.m_update         = std::move(update);
-  return iter;
-}
-
 } // namespace detail
 } // namespace nvbench
diff --git a/nvbench/linear_axis_space.cxx b/nvbench/linear_axis_space.cxx
@@ -32,14 +32,14 @@ linear_axis_space::~linear_axis_space() = default;
 
 detail::axis_space_iterator linear_axis_space::do_get_iterator(axes_info info) const
 {
-  std::size_t loc(m_output_indices[0]);
+  std::size_t loc{m_output_indices[0]};
   auto update_func = [=](std::size_t inc_index,
                          std::vector<detail::axis_index> &indices) {
     indices[loc]       = info[0];
     indices[loc].index = inc_index;
   };
 
-  return detail::make_space_iterator(1, info[0].size, update_func);
+  return detail::axis_space_iterator(1, info[0].size, update_func);
 }
 
 std::size_t linear_axis_space::do_get_size(const axes_info &info) const

diff --git a/nvbench/user_axis_space.cuh b/nvbench/user_axis_space.cuh
@@ -60,7 +60,7 @@ namespace nvbench
  *         indices[locs[i]]        = temp;
  *       }
  *     };
- *    return detail::make_space_iterator(locs.size(), (info[0].size/3), adv_func, update_func);
+ *    return detail::axis_space_iterator(locs.size(), (info[0].size/3), adv_func, update_func);
  *   }
  *
  *   std::size_t do_get_size(const axes_info &info) const { return (info[0].size/3); }

diff --git a/nvbench/zip_axis_space.cxx b/nvbench/zip_axis_space.cxx
@@ -43,7 +43,7 @@ detail::axis_space_iterator zip_axis_space::do_get_iterator(axes_info info) cons
     }
   };
 
-  return detail::make_space_iterator(locs.size(), info[0].size, update_func);
+  return detail::axis_space_iterator(locs.size(), info[0].size, update_func);
 }
 
 std::size_t zip_axis_space::do_get_size(const axes_info &info) const

diff --git a/testing/axes_iteration_space.cu b/testing/axes_iteration_space.cu
@@ -222,7 +222,7 @@ struct under_diag final : nvbench::user_axis_space
       };
 
     const size_t iteration_length = ((info[0].size * (info[1].size + 1)) / 2);
-    return nvbench::detail::make_space_iterator(2,
+    return nvbench::detail::axis_space_iterator(2,
                                                 iteration_length,
                                                 adv_func,
                                                 diag_under);