Add geometry_generator factory for programmatic generation of geometry arrays

cpp/include/cuspatial/experimental/detail/ranges/multipolygon_range.cuh

@@ -16,18 +16,18 @@
 
 #pragma once
 
-#include <thrust/binary_search.h>
-#include <thrust/distance.h>
-#include <thrust/iterator/transform_iterator.h>
-#include <thrust/pair.h>
-
 #include <cuspatial/cuda_utils.hpp>
 #include <cuspatial/detail/iterator.hpp>
 #include <cuspatial/experimental/geometry/segment.cuh>
 #include <cuspatial/experimental/geometry_collection/multipolygon_ref.cuh>
 #include <cuspatial/traits.hpp>
 #include <cuspatial/vec_2d.hpp>
 
+#include <thrust/binary_search.h>
+#include <thrust/distance.h>
+#include <thrust/iterator/transform_iterator.h>
+#include <thrust/pair.h>
+
 #include <iterator>
 #include <optional>
 
@@ -170,6 +170,26 @@ multipolygon_range<GeometryIterator, PartIterator, RingIterator, VecIterator>::m
   return multipolygon_begin() + num_multipolygons();
 }
 
+template <typename GeometryIterator,
+          typename PartIterator,
+          typename RingIterator,
+          typename VecIterator>
+CUSPATIAL_HOST_DEVICE auto
+multipolygon_range<GeometryIterator, PartIterator, RingIterator, VecIterator>::point_begin()
+{
+  return _point_begin;
+}
+
+template <typename GeometryIterator,
+          typename PartIterator,
+          typename RingIterator,
+          typename VecIterator>
+CUSPATIAL_HOST_DEVICE auto
+multipolygon_range<GeometryIterator, PartIterator, RingIterator, VecIterator>::point_end()
+{
+  return _point_end;
+}
+
 template <typename GeometryIterator,
           typename PartIterator,
           typename RingIterator,

cpp/include/cuspatial/experimental/ranges/multipolygon_range.cuh

@@ -101,13 +101,32 @@ class multipolygon_range {
   /// Return the iterator to the one past the last multipolygon in the range.
   CUSPATIAL_HOST_DEVICE auto end() { return multipolygon_end(); }
 
+  /// Return the iterator to the first point in the range.
+  CUSPATIAL_HOST_DEVICE auto point_begin();
+
+  /// Return the iterator to the one past the last point in the range.
+  CUSPATIAL_HOST_DEVICE auto point_end();
+
   /// Given the index of a segment, return the index of the geometry (multipolygon) that contains
   /// the segment. Segment index is the index to the starting point of the segment. If the index is
   /// the last point of the ring, then it is not a valid index. This function returns
   /// multipolygon_range::INVALID_INDEX if the index is invalid.
   template <typename IndexType>
   CUSPATIAL_HOST_DEVICE auto geometry_idx_from_segment_idx(IndexType segment_idx);
 
+  /// Given the index of a point, return the index of the ring that contains the point.
+  template <typename IndexType>
+  CUSPATIAL_HOST_DEVICE auto ring_idx_from_point_idx(IndexType point_idx);
+
+  /// Given the index of a ring, return the index of the part (polygon) that contains the point.
+  template <typename IndexType>
+  CUSPATIAL_HOST_DEVICE auto part_idx_from_ring_idx(IndexType ring_idx);
+
+  /// Given the index of a part (polygon), return the index of the geometry (multipolygon) that
+  /// contains the part.
+  template <typename IndexType>
+  CUSPATIAL_HOST_DEVICE auto geometry_idx_from_part_idx(IndexType part_idx);
+
   /// Returns the `multipolygon_idx`th multipolygon in the range.
   template <typename IndexType>
   CUSPATIAL_HOST_DEVICE auto operator[](IndexType multipolygon_idx);
@@ -133,21 +152,6 @@ class multipolygon_range {
   VecIterator _point_end;
 
  private:
-  /// Given the index of a point, return the ring index
-  /// where the point locates.
-  template <typename IndexType>
-  CUSPATIAL_HOST_DEVICE auto ring_idx_from_point_idx(IndexType point_idx);
-
-  /// Given the index of a ring, return the part (polygon) index
-  /// where the ring locates.
-  template <typename IndexType>
-  CUSPATIAL_HOST_DEVICE auto part_idx_from_ring_idx(IndexType ring_idx);
-
-  /// Given the index of a part (polygon), return the geometry (multipolygon) index
-  /// where the polygon locates.
-  template <typename IndexType>
-  CUSPATIAL_HOST_DEVICE auto geometry_idx_from_part_idx(IndexType part_idx);
-
   template <typename IndexType1, typename IndexType2>
   CUSPATIAL_HOST_DEVICE bool is_valid_segment_id(IndexType1 segment_idx, IndexType2 ring_idx);
 };

cpp/include/cuspatial_test/base_fixture.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.
+ * Copyright (c) 2022-2023, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <rmm/cuda_stream_view.hpp>
 #include <rmm/mr/device/per_device_resource.hpp>
 
 #include <gtest/gtest.h>
@@ -22,15 +23,11 @@ namespace cuspatial {
 namespace test {
 
 /**
- * @brief Base test fixture class from which all libcuspatial tests should inherit.
- *
- * Example:
- * ```
- * class MyTestFixture : public cuspatial::test::BaseFixture {};
- * ```
+ * @brief Mixin to supply rmm resources for fixtures
  */
-class BaseFixture : public ::testing::Test {
+class RMMResourceMixin {
   rmm::mr::device_memory_resource* _mr{rmm::mr::get_current_device_resource()};
+  rmm::cuda_stream_view _stream{rmm::cuda_stream_default};
 
  public:
   /**
@@ -39,6 +36,50 @@ class BaseFixture : public ::testing::Test {
    * @return pointer to memory resource
    */
   rmm::mr::device_memory_resource* mr() { return _mr; }
+
+  /**
+   * @brief Returns `cuda_stream_view` that should be used for computation in
+   * tests inheriting from this fixture.
+   * @return view to cuda stream
+   */
+  rmm::cuda_stream_view stream() { return _stream; }
+};
+
+/**
+ * @brief Base test fixture class from which libcuspatial test with no parameterization or only with
+ * type parameterization should inherit.
+ *
+ * Example:
+ * ```
+ * class MyTestFixture : public cuspatial::test::BaseFixture {};
+ * ```
+ */
+class BaseFixture : public RMMResourceMixin, public ::testing::Test {
+};
+
+/**
+ * @brief Base test fixture class from which libcuspatial test with only value parameterization
+ * should inherit.
+ *
+ * Example:
+ * ```
+ * template<int, int, int>
+ * class MyTest : public cuspatial::test::BaseFixtureWithParam {};
+ *
+ * TEST_P(MyTest, TestParamterGet) {
+ *  auto [a, b, c] = GetParam();
+ *  ...
+ * }
+ *
+ * INSTANTIATE_TEST_SUITE_P(MyTests, MyTest, ::testing::Values(
+ *    std::make_tuple(1, 2, 3),
+ *    std::make_tuple(4, 5, 6, 9),
+ *    std::make_tuple(7, 8)))
+ * ```
+ */
+template <typename... Ts>
+class BaseFixtureWithParam : public RMMResourceMixin,
+                             public ::testing::TestWithParam<std::tuple<Ts...>> {
 };
 
 }  // namespace test