diff --git a/cpp/benchmarks/pairwise_linestring_distance.cu b/cpp/benchmarks/pairwise_linestring_distance.cu index e70c72cee..8abc97f96 100644 --- a/cpp/benchmarks/pairwise_linestring_distance.cu +++ b/cpp/benchmarks/pairwise_linestring_distance.cu @@ -18,10 +18,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/benchmarks/point_in_polygon.cu b/cpp/benchmarks/point_in_polygon.cu index 6567bd47c..13033f8c9 100644 --- a/cpp/benchmarks/point_in_polygon.cu +++ b/cpp/benchmarks/point_in_polygon.cu @@ -17,8 +17,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/benchmarks/points_in_range.cu b/cpp/benchmarks/points_in_range.cu index 1ebe6349f..f9c6d20f8 100644 --- a/cpp/benchmarks/points_in_range.cu +++ b/cpp/benchmarks/points_in_range.cu @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/benchmarks/quadtree_on_points.cu b/cpp/benchmarks/quadtree_on_points.cu index 58c527105..4984834f7 100644 --- a/cpp/benchmarks/quadtree_on_points.cu +++ b/cpp/benchmarks/quadtree_on_points.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include +#include #include #include diff --git a/cpp/doxygen/Doxyfile b/cpp/doxygen/Doxyfile index dfafd207d..1c66cb038 100644 --- a/cpp/doxygen/Doxyfile +++ b/cpp/doxygen/Doxyfile @@ -819,7 +819,7 @@ INPUT = main_page.md \ developer_guide/DOCUMENTATION.md \ developer_guide/DEVELOPER_GUIDE.md \ developer_guide/TESTING.md \ - developer_guide/REFACTORING_GUIDE.md \ + developer_guide/HEADER_ONLY_API_GUIDE.md \ ../include # This tag can be used to specify the character encoding of the source files @@ -1155,7 +1155,7 @@ HTML_FOOTER = # obsolete. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_STYLESHEET = +HTML_STYLESHEET = # The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined # cascading style sheets that are included after the standard style sheets diff --git a/cpp/doxygen/developer_guide/DEVELOPER_GUIDE.md b/cpp/doxygen/developer_guide/DEVELOPER_GUIDE.md index dbac80d46..586310b19 100644 --- a/cpp/doxygen/developer_guide/DEVELOPER_GUIDE.md +++ b/cpp/doxygen/developer_guide/DEVELOPER_GUIDE.md @@ -6,8 +6,8 @@ refer to these additional files for further documentation of libcuspatial best p * [Documentation Guide](DOCUMENTATION.md) for guidelines on documenting libcuspatial code. * [Testing Guide](TESTING.md) for guidelines on writing unit tests. * [Benchmarking Guide](BENCHMARKING.md) for guidelines on writing unit benchmarks. -* [Refactoring Guide](REFACTORING_GUIDE.md) for guidelines on refactoring legacy column-based APIs - into header-only APIs. +* [Header-only API Guide](HEADER_ONLY_API_GUIDE.md) for guidelines on the header-only API and + column-based API. # Overview @@ -38,17 +38,16 @@ TODO: add terms External/public libcuspatial APIs are grouped based on functionality into an appropriately titled header file in `cuspatial/cpp/include/cuspatial/`. For example, -`cuspatial/cpp/include/cuspatial/coordinate_transform.hpp` contains the declarations of public API -functions related to transforming coordinates. Note the `.hpp` file extension used to indicate a -C++ header file that can be included from a `.cpp` source file. +`cuspatial/cpp/include/cuspatial/projection.hpp` contains the declarations of public API +functions related to coordinate projection transforms. Note the `.hpp` file extension used to +indicate a C++ header file that can be included from a `.cpp` source file. Header files should use the `#pragma once` include guard. -The naming of public column-based cuSpatial API headers should be consistent with the name of the -folder that contains the source files that implement the API. For example, the implementation of the -APIs found in `cuspatial/cpp/include/cuspatial/trajectory.hpp` are located in -`cuspatial/src/trajectory`. This rule obviously does not apply to the header-only API, since the -headers are the source files. +The folder that contains the source files that implement an API should be named consistently with +the name of the of the header for the API. For example, the implementation of the APIs found in +`cuspatial/cpp/include/cuspatial/trajectory.hpp` are located in `cuspatial/src/trajectory`. This +rule obviously does not apply to the header-only API, since the headers are the source files. Likewise, unit tests reside in folders corresponding to the names of the API headers, e.g. trajectory.hpp tests are in `cuspatial/tests/trajectory/`. @@ -56,9 +55,9 @@ trajectory.hpp tests are in `cuspatial/tests/trajectory/`. Internal API headers containing `detail` namespace definitions that are used across translation units inside libcuspatial should be placed in `include/cuspatial/detail`. -Note that (currently) header-only API files are in `include/cuspatial/experimental`, and their tests -are in `tests/experimental`. When the header-only refactoring is complete these should be renamed or -split into a separate library. +Header-only API files and column-based API headers are stored together in `include/cuspatial`. The +former use the `.cuh` extension because they almost universally require CUDA compilation. The latter +use the `.hpp` extension because they can be compiled with a standard C++ compiler. ## File extensions diff --git a/cpp/doxygen/developer_guide/REFACTORING_GUIDE.md b/cpp/doxygen/developer_guide/HEADER_ONLY_API_GUIDE.md similarity index 86% rename from cpp/doxygen/developer_guide/REFACTORING_GUIDE.md rename to cpp/doxygen/developer_guide/HEADER_ONLY_API_GUIDE.md index 3a7e92b4d..65bf1b7ab 100644 --- a/cpp/doxygen/developer_guide/REFACTORING_GUIDE.md +++ b/cpp/doxygen/developer_guide/HEADER_ONLY_API_GUIDE.md @@ -1,33 +1,34 @@ -# cuSpatial C++ API Refactoring Guide +# cuSpatial C++ header-only API Guide The original cuSpatial C++ API (libcuspatial) was designed to depend on RAPIDS libcudf and use -its core data types, especially `cudf::column`. For users who do not also use libcudf or other -RAPIDS APIS, depending on libcudf could be a big barrier to adoption of libcuspatial. libcudf is +its core data types, especially `cudf::column`. For users who do not also use libcudf or other +RAPIDS APIS, depending on libcudf could be a big barrier to adoption of libcuspatial. libcudf is a very large library and building it takes a lot of time. -Therefore, we are developing a standalone libcuspatial C++ API that does not depend on libcudf. This -is a header-only template API with an iterator-based interface. This has a number of advantages +Therefore, the core of cuSpatial is now implemented in a standalone C++ API that does not depend on +libcudf. This is a header-only template API with an iterator- and range-based interface. This has a +number of advantages. 1. With a header-only API, users can include and build exactly what they use. - 2. With a templated API, the API can be flexible to support a variety of basic data types, such + 2. With a templated API, the API can be flexible to support a variety of basic data types, such as float and double for positional data, and different integer sizes for indices. 3. By templating on iterator types, cuSpatial algorithms can be fused with transformations of the input data, by using "fancy" iterators. Examples include transform iterators and counting iterators. 4. Memory resources only need to be part of APIs that allocate temporary intermediate storage. - Output storage is allocated outside the API and an output iterator is passed as an argument. + Output storage is allocated outside the API and an output iterator is passed as an argument. The main disadvantages of this type of API are 1. Header-only APIs can increase compilation time for code that depends on them. - 2. Some users (especially our Python API) may prefer a cuDF-based API. + 2. Some users (especially the cuSpatial Python API) may prefer a cuDF-based API. -The good news is that by maintaining the existing libcudf-based C++ API as a layer above the header- -only libcuspatial API, we can avoid problem 1 and problem 2 for users of the legacy API. +The good news is that maintaining the existing libcudf-based C++ API as a layer above the header- +only libcuspatial API avoids problem 1 and problem 2 for users of the column-based API. ## Example API -Following is an example iterator-based API for `cuspatial::haversine_distance`. (See below for +Following is an example iterator-based API for `cuspatial::haversine_distance`. (See below for discussion of API documentation.) ```c++ @@ -47,7 +48,7 @@ OutputIt haversine_distance(LonLatItA a_lonlat_first, There are a few key points to notice. 1. The API is very similar to STL algorithms such as `std::transform`. - 2. All array inputs and outputs are iterator type templates. + 2. All array inputs and outputs are iterator type templates. 3. Longitude/Latitude data is passed as array of structures, using the `cuspatial::vec_2d` type (include/cuspatial/vec_2d.hpp). This is enforced using a `static_assert` in the function body (discussed later). @@ -60,7 +61,7 @@ There are a few key points to notice. 7. The size of the input and output ranges in the example API are equal, so the start and end of only the A range is provided (`a_lonlat_first` and `a_lonlat_last`). This mirrors STL APIs. 8. This API returns an iterator to the element past the last element written to the output. This - is inspired by `std::transform`, even though as with `transform`, many uses of + is inspired by `std::transform`, even though as with `transform`, many uses of `haversine_distance` will not need this returned iterator. 9. All APIs that run CUDA device code (including Thrust algorithms) or allocate memory take a CUDA stream on which to execute the device code and allocate memory. @@ -103,7 +104,7 @@ Following is the (Doxygen) documentation for the above `cuspatial::haversine_dis * otherwise. * @pre `b_lonlat_first` may equal `distance_first`, but the range `[b_lonlat_first, b_lonlat_last)` * shall not overlap the range `[distance_first, distance_first + (b_lonlat_last - b_lonlat_last)) - * otherwise. + * otherwise. * @pre All iterators must have the same `Location` type, with the same underlying floating-point * coordinate type (e.g. `cuspatial::vec_2d`). * @@ -119,13 +120,13 @@ Key points: 2. All parameters and all template parameters are documented. 3. States the C++ standard iterator concepts that must be implemented, and that iterators must be device-accessible. - 4. Documents requirements as preconditions using `@pre`. + 4. Documents requirements as preconditions using `@pre`. 5. Uses preconditions to explicitly document what input ranges are allowed to overlap. 6. Documents the units of any inputs or outputs that have them. ## cuSpatial libcudf-based C++ API (legacy API) -This is the existing API, unchanged by refactoring. Here is the existing +This is the existing API, unchanged by refactoring. Here is the existing `cuspatial::haversine_distance`: ```c++ @@ -142,9 +143,9 @@ OutputIt haversine_distance(LonLatItA a_lonlat_first, ``` key points: - 1. All input data are `cudf::column_view`. This is a type-erased container so determining the + 1. All input data are `cudf::column_view`. This is a type-erased container so determining the type of data must be done at run time. - 2. All inputs are arrays of scalars. Longitude and latitude are separate. + 2. All inputs are arrays of scalars. Longitude and latitude are separate. 3. The output is a returned `unique_ptr`. 4. The output is allocated inside the function using the passed memory resource. 5. The public API does not take a stream. There is a `detail` version of the API that takes a @@ -152,37 +153,34 @@ key points: ## File Structure -For now, libcuspatial APIs should be defined in a header file in the -`cpp/include/cuspatial/experimental/` directory. Later, as we adopt the new API, we will rename -the `experimental` directory. The API header should be named after the API. In the example, -`haversine.hpp` defines the `cuspatial::haversine_distance` API. +libcuspatial APIs should be defined in a header file in the `cpp/include/cuspatial/` directory. +The API header should be named after the API. In the example, `haversine.hpp` defines the `cuspatial::haversine_distance` API. -The implementation must also be in a header, but should be in the `cuspatial/experimental/detail` -directory. The implementation should be included from the API definition file, at the end of the -file. Example: +The implementation must also be in a header, but should be in the `cuspatial/detail` directory. The +implementation should be included from the API definition file, at the end of the file. Example: ```c++ ... // declaration of API above this point -#include +#include ``` ## Namespaces Public APIs are in the `cuspatial` namespace. Note that both the header-only API and the libcudf- -based API can live in the same namespace, because they are non-ambiguous (very different +based API can live in the same namespace, because they are non-ambiguous (very different parameters). Implementation of the header-only API should be in a `cuspatial::detail` namespace. ## Implementation -The main implementation should be in detail headers. +The main implementation should be in detail headers. ### Header-only API Implementation -Because it is a statically typed API, the header-only implementation can be much simpler than the -libcudf-based API, which requires run-time type dispatching. In the case of `haversine_distance`, it is -a simple matter of a few static asserts and dynamic expectation checks, followed by a call to +Because it is a statically typed API, the header-only implementation can be much simpler than the +libcudf-based API, which requires run-time type dispatching. In the case of `haversine_distance`, +it is a simple matter of a few static asserts and dynamic expectation checks, followed by a call to `thrust::transform` with a custom transform functor. ```c++ @@ -216,17 +214,17 @@ OutputIt haversine_distance(LonLatItA a_lonlat_first, ``` Note that we `static_assert` that the types of the iterator inputs match documented expectations. -We also do a runtime check that the radius is positive. Finally we just call `thrust::transform`, +We also do a runtime check that the radius is positive. Finally we just call `thrust::transform`, passing it an instance of `haversine_distance_functor`, which is a function of two `vec_2d` inputs that implements the Haversine distance formula. ### libcudf-based API Implementation -The substance of the refactoring is making the libcudf-based API a wrapper around the header-only -API. This mostly involves replacing business logic implementation in the type-dispatched functor -with a call to the header-only API. We also need to convert disjoint latitude and longitude inputs +The substance of the refactoring is making the libcudf-based API a wrapper around the header-only +API. This mostly involves replacing business logic implementation in the type-dispatched functor +with a call to the header-only API. We also need to convert disjoint latitude and longitude inputs into `vec_2d` structs. This is easily done using the `cuspatial::make_vec_2d_iterator` utility -provided in `type_utils.hpp`. +provided in `type_utils.hpp`. So, to refactor the libcudf-based API, we remove the following code. @@ -271,6 +269,6 @@ cuspatial::haversine_distance(lonlat_a, Existing libcudf-based API tests can mostly be left alone. New tests should be added to exercise the header-only API separately in case the libcudf-based API is removed. -Note that tests, like the header-only API, should not depend on libcudf or libcudf_test. The +Note that tests, like the header-only API, should not depend on libcudf or libcudf_test. The cuDF-based API made the mistake of depending on libcudf_test, which results in breakages of cuSpatial sometimes when libcudf_test changes. diff --git a/cpp/doxygen/developer_guide/TESTING.md b/cpp/doxygen/developer_guide/TESTING.md index 0e75e9d83..8fcb58b25 100644 --- a/cpp/doxygen/developer_guide/TESTING.md +++ b/cpp/doxygen/developer_guide/TESTING.md @@ -26,21 +26,24 @@ and the main iterator and container types supported by algorithms. Here are som ## Header-only and Column-based API tests -libcuspatial currently has two C++ APIs: the column-based API uses libcudf data structures as -input and output. These tests live in `cpp/tests/` and can use libcudf features for constructing -columns and tables. The header-only API does not depend on libcudf at all and so tests of these -APIs should not include any libcudf headers. These tests currently live in `cpp/tests/experimental`. - -Generally, we test algorithms and business logic in the header-only API's unit tests. -Column-based API tests should only cover specifics of the column-based API, such as type -handling, input validation, and exceptions that are only thrown by that API. +libcuspatial currently has two C++ APIs: the column-based API uses libcudf data structures as +input and output. These tests can use libcudf features for constructing columns and tables. The +header-only API does not depend on libcudf at all and so tests of these APIs should not include any +libcudf headers. Header-only and column-based API tests are located together in `cuspatial/tests`, +however header-only API tests are `.cu` files and column-based API files are `.cpp` files. + +Generally, we test algorithms and business logic in the header-only API's unit tests. +Column-based API tests should only cover specifics of the column-based API, such as type +handling, input validation, and exceptions that are only thrown by that API. Column-based API tests +typically also tests empty imputs, to ensure that empty column inputs result in empty column output +rather than throwing exceptions. ## Directory and File Naming The naming of unit test directories and source files should be consistent with the feature being -tested. For example, the tests for APIs in `point_in_polygon.hpp` should live in +tested. For example, the tests for APIs in `point_in_polygon.hpp` should live in `cuspatial/cpp/tests/point_in_polygon_test.cpp`. Each feature (or set of related features) should -have its own test source file named `_test.cu/cpp`. +have its own test source file named `_test.cu/cpp`. In the interest of improving compile time, whenever possible, test source files should be `.cpp` files because `nvcc` is slower than `gcc` in compiling host code. Note that `thrust::device_vector` @@ -52,7 +55,7 @@ Testing header-only APIs requires CUDA compilation so should be done in `.cu` fi ## Base Fixture -All libcuspatial unit tests should make use of a GTest +All libcuspatial unit tests should make use of a GTest ["Test Fixture"](https://github.com/google/googletest/blob/master/docs/primer.md#test-fixtures-using-the-same-data-configuration-for-multiple-tests-same-data-multiple-tests). Even if the fixture is empty, it should inherit from the base fixture `cuspatial::test::BaseFixture` found in `cpp/tests/base_fixture.hpp`. This ensures that RMM is properly initialized and @@ -65,7 +68,7 @@ Example: ## Typed Tests -In general, libcuspatial features must work across all supported types (for cuspatial this +In general, libcuspatial features must work across all supported types (for cuspatial this typically just means `float` and `double`). In order to automate the process of running the same tests across multiple types, we use GTest's [Typed Tests](https://github.com/google/googletest/blob/master/docs/advanced.md#typed-tests). @@ -91,10 +94,10 @@ list defined in `TestTypes` (`float, double`). ## Utilities libcuspatial test utilities include `cuspatial::test::expect_vector_equivalent()` in -`cpp/tests/utility/vector_equality()`. This function compares two containers using Google Test's +`cpp/tests/utility/vector_equality()`. This function compares two containers using Google Test's approximate matching for floating-point values. It can handle vectors of `cuspatial::vec_2d`, -where `T` is `float` or `double`. It automatically copies data in device containers to host -containers before comparing, so you can pass it one host and one device vector, for example. +where `T` is `float` or `double`. It automatically copies data in device containers to host +containers before comparing, so you can pass it one host and one device vector, for example. Example: diff --git a/cpp/include/cuspatial/experimental/bounding_box.cuh b/cpp/include/cuspatial/bounding_box.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/bounding_box.cuh rename to cpp/include/cuspatial/bounding_box.cuh index 176463bf8..78c213f96 100644 --- a/cpp/include/cuspatial/experimental/bounding_box.cuh +++ b/cpp/include/cuspatial/bounding_box.cuh @@ -79,4 +79,4 @@ BoundingBoxOutputIt point_bounding_boxes(IdInputIt ids_first, } // namespace cuspatial -#include "detail/bounding_box.cuh" +#include diff --git a/cpp/include/cuspatial/column/geometry_column_view.hpp b/cpp/include/cuspatial/column/geometry_column_view.hpp index 7d6ca6352..1c50cc253 100644 --- a/cpp/include/cuspatial/column/geometry_column_view.hpp +++ b/cpp/include/cuspatial/column/geometry_column_view.hpp @@ -16,7 +16,7 @@ #pragma once -#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/derive_trajectories.cuh b/cpp/include/cuspatial/derive_trajectories.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/derive_trajectories.cuh rename to cpp/include/cuspatial/derive_trajectories.cuh index c5dbf64f5..e647f28bc 100644 --- a/cpp/include/cuspatial/experimental/derive_trajectories.cuh +++ b/cpp/include/cuspatial/derive_trajectories.cuh @@ -94,4 +94,4 @@ std::unique_ptr> derive_trajectories( } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/detail/algorithm/is_point_in_polygon.cuh b/cpp/include/cuspatial/detail/algorithm/is_point_in_polygon.cuh similarity index 96% rename from cpp/include/cuspatial/experimental/detail/algorithm/is_point_in_polygon.cuh rename to cpp/include/cuspatial/detail/algorithm/is_point_in_polygon.cuh index 40c5cce33..ef40f714f 100644 --- a/cpp/include/cuspatial/experimental/detail/algorithm/is_point_in_polygon.cuh +++ b/cpp/include/cuspatial/detail/algorithm/is_point_in_polygon.cuh @@ -16,12 +16,12 @@ #pragma once -#include +#include +#include #include -#include #include -#include +#include namespace cuspatial { namespace detail { diff --git a/cpp/include/cuspatial/experimental/detail/algorithm/point_linestring_distance.cuh b/cpp/include/cuspatial/detail/algorithm/point_linestring_distance.cuh similarity index 91% rename from cpp/include/cuspatial/experimental/detail/algorithm/point_linestring_distance.cuh rename to cpp/include/cuspatial/detail/algorithm/point_linestring_distance.cuh index 4b8cf4a6c..732e11990 100644 --- a/cpp/include/cuspatial/experimental/detail/algorithm/point_linestring_distance.cuh +++ b/cpp/include/cuspatial/detail/algorithm/point_linestring_distance.cuh @@ -16,9 +16,9 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace cuspatial { namespace detail { diff --git a/cpp/include/cuspatial/experimental/detail/bounding_box.cuh b/cpp/include/cuspatial/detail/bounding_box.cuh similarity index 97% rename from cpp/include/cuspatial/experimental/detail/bounding_box.cuh rename to cpp/include/cuspatial/detail/bounding_box.cuh index adfa56a96..7855ed91f 100644 --- a/cpp/include/cuspatial/experimental/detail/bounding_box.cuh +++ b/cpp/include/cuspatial/detail/bounding_box.cuh @@ -16,9 +16,9 @@ #pragma once -#include +#include +#include #include -#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/derive_trajectories.cuh b/cpp/include/cuspatial/detail/derive_trajectories.cuh similarity index 100% rename from cpp/include/cuspatial/experimental/detail/derive_trajectories.cuh rename to cpp/include/cuspatial/detail/derive_trajectories.cuh diff --git a/cpp/include/cuspatial/experimental/detail/distance_utils.cuh b/cpp/include/cuspatial/detail/distance_utils.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/detail/distance_utils.cuh rename to cpp/include/cuspatial/detail/distance_utils.cuh index db07dcb7d..5d1de5eca 100644 --- a/cpp/include/cuspatial/experimental/detail/distance_utils.cuh +++ b/cpp/include/cuspatial/detail/distance_utils.cuh @@ -15,9 +15,9 @@ */ #include -#include +#include +#include #include -#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/find/find_and_combine_segment.cuh b/cpp/include/cuspatial/detail/find/find_and_combine_segment.cuh similarity index 99% rename from cpp/include/cuspatial/experimental/detail/find/find_and_combine_segment.cuh rename to cpp/include/cuspatial/detail/find/find_and_combine_segment.cuh index ef6bb0d3b..b05e71b03 100644 --- a/cpp/include/cuspatial/experimental/detail/find/find_and_combine_segment.cuh +++ b/cpp/include/cuspatial/detail/find/find_and_combine_segment.cuh @@ -29,6 +29,7 @@ namespace cuspatial { namespace detail { /** + * @internal * @brief Kernel to merge segments, naive n^2 algorithm. */ template diff --git a/cpp/include/cuspatial/experimental/detail/find/find_duplicate_points.cuh b/cpp/include/cuspatial/detail/find/find_duplicate_points.cuh similarity index 100% rename from cpp/include/cuspatial/experimental/detail/find/find_duplicate_points.cuh rename to cpp/include/cuspatial/detail/find/find_duplicate_points.cuh diff --git a/cpp/include/cuspatial/experimental/detail/find/find_points_on_segments.cuh b/cpp/include/cuspatial/detail/find/find_points_on_segments.cuh similarity index 99% rename from cpp/include/cuspatial/experimental/detail/find/find_points_on_segments.cuh rename to cpp/include/cuspatial/detail/find/find_points_on_segments.cuh index 6239404e4..fcf7a6283 100644 --- a/cpp/include/cuspatial/experimental/detail/find/find_points_on_segments.cuh +++ b/cpp/include/cuspatial/detail/find/find_points_on_segments.cuh @@ -33,6 +33,7 @@ namespace cuspatial { namespace detail { /** + * @internal * @brief Functor to find if the given point is on any of the segments in the same pair */ template @@ -65,6 +66,7 @@ struct find_point_on_segment_functor { }; /** + * @internal * @brief Given a multipoint and a set of segments, for each point, if the point is * on any of the segments, set the `mergeable_flag` of the point to `1`. */ diff --git a/cpp/include/cuspatial/experimental/detail/functors.cuh b/cpp/include/cuspatial/detail/functors.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/detail/functors.cuh rename to cpp/include/cuspatial/detail/functors.cuh index e3f37156c..1f390753d 100644 --- a/cpp/include/cuspatial/experimental/detail/functors.cuh +++ b/cpp/include/cuspatial/detail/functors.cuh @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/geometry/linestring_ref.cuh b/cpp/include/cuspatial/detail/geometry/linestring_ref.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/detail/geometry/linestring_ref.cuh rename to cpp/include/cuspatial/detail/geometry/linestring_ref.cuh index 251b33f21..f18fab4d8 100644 --- a/cpp/include/cuspatial/experimental/detail/geometry/linestring_ref.cuh +++ b/cpp/include/cuspatial/detail/geometry/linestring_ref.cuh @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/geometry/polygon_ref.cuh b/cpp/include/cuspatial/detail/geometry/polygon_ref.cuh similarity index 95% rename from cpp/include/cuspatial/experimental/detail/geometry/polygon_ref.cuh rename to cpp/include/cuspatial/detail/geometry/polygon_ref.cuh index 3c1dfeb68..35374e23c 100644 --- a/cpp/include/cuspatial/experimental/detail/geometry/polygon_ref.cuh +++ b/cpp/include/cuspatial/detail/geometry/polygon_ref.cuh @@ -17,8 +17,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/geometry_collection/multilinestring_ref.cuh b/cpp/include/cuspatial/detail/geometry_collection/multilinestring_ref.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/detail/geometry_collection/multilinestring_ref.cuh rename to cpp/include/cuspatial/detail/geometry_collection/multilinestring_ref.cuh index b4c76ec32..f3894515d 100644 --- a/cpp/include/cuspatial/experimental/detail/geometry_collection/multilinestring_ref.cuh +++ b/cpp/include/cuspatial/detail/geometry_collection/multilinestring_ref.cuh @@ -18,7 +18,7 @@ #include #include -#include +#include #include diff --git a/cpp/include/cuspatial/experimental/detail/geometry_collection/multipoint_ref.cuh b/cpp/include/cuspatial/detail/geometry_collection/multipoint_ref.cuh similarity index 100% rename from cpp/include/cuspatial/experimental/detail/geometry_collection/multipoint_ref.cuh rename to cpp/include/cuspatial/detail/geometry_collection/multipoint_ref.cuh diff --git a/cpp/include/cuspatial/experimental/detail/geometry_collection/multipolygon_ref.cuh b/cpp/include/cuspatial/detail/geometry_collection/multipolygon_ref.cuh similarity index 96% rename from cpp/include/cuspatial/experimental/detail/geometry_collection/multipolygon_ref.cuh rename to cpp/include/cuspatial/detail/geometry_collection/multipolygon_ref.cuh index 940c6ef83..d033722e2 100644 --- a/cpp/include/cuspatial/experimental/detail/geometry_collection/multipolygon_ref.cuh +++ b/cpp/include/cuspatial/detail/geometry_collection/multipolygon_ref.cuh @@ -2,8 +2,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/cpp/include/cuspatial/experimental/detail/hausdorff.cuh b/cpp/include/cuspatial/detail/hausdorff.cuh similarity index 99% rename from cpp/include/cuspatial/experimental/detail/hausdorff.cuh rename to cpp/include/cuspatial/detail/hausdorff.cuh index b5a2b2329..022c4490b 100644 --- a/cpp/include/cuspatial/experimental/detail/hausdorff.cuh +++ b/cpp/include/cuspatial/detail/hausdorff.cuh @@ -18,8 +18,8 @@ #include #include +#include #include -#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/haversine.cuh b/cpp/include/cuspatial/detail/haversine.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/detail/haversine.cuh rename to cpp/include/cuspatial/detail/haversine.cuh index 3ec9b1afb..06ebb191a 100644 --- a/cpp/include/cuspatial/experimental/detail/haversine.cuh +++ b/cpp/include/cuspatial/detail/haversine.cuh @@ -18,8 +18,8 @@ #include #include +#include #include -#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/indexing/construction/phase_1.cuh b/cpp/include/cuspatial/detail/index/construction/phase_1.cuh similarity index 99% rename from cpp/include/cuspatial/experimental/detail/indexing/construction/phase_1.cuh rename to cpp/include/cuspatial/detail/index/construction/phase_1.cuh index f6281a900..83866e01f 100644 --- a/cpp/include/cuspatial/experimental/detail/indexing/construction/phase_1.cuh +++ b/cpp/include/cuspatial/detail/index/construction/phase_1.cuh @@ -16,10 +16,10 @@ #pragma once +#include #include -#include +#include #include -#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/indexing/construction/phase_2.cuh b/cpp/include/cuspatial/detail/index/construction/phase_2.cuh similarity index 99% rename from cpp/include/cuspatial/experimental/detail/indexing/construction/phase_2.cuh rename to cpp/include/cuspatial/detail/index/construction/phase_2.cuh index ea95beba8..ffbb79c0d 100644 --- a/cpp/include/cuspatial/experimental/detail/indexing/construction/phase_2.cuh +++ b/cpp/include/cuspatial/detail/index/construction/phase_2.cuh @@ -16,7 +16,7 @@ #pragma once -#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/indexing/construction/utilities.cuh b/cpp/include/cuspatial/detail/index/construction/utilities.cuh similarity index 100% rename from cpp/include/cuspatial/experimental/detail/indexing/construction/utilities.cuh rename to cpp/include/cuspatial/detail/index/construction/utilities.cuh diff --git a/cpp/include/cuspatial/experimental/detail/join/get_quad_and_local_point_indices.cuh b/cpp/include/cuspatial/detail/join/get_quad_and_local_point_indices.cuh similarity index 100% rename from cpp/include/cuspatial/experimental/detail/join/get_quad_and_local_point_indices.cuh rename to cpp/include/cuspatial/detail/join/get_quad_and_local_point_indices.cuh diff --git a/cpp/include/cuspatial/experimental/detail/join/intersection.cuh b/cpp/include/cuspatial/detail/join/intersection.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/detail/join/intersection.cuh rename to cpp/include/cuspatial/detail/join/intersection.cuh index e6fbc03e4..cf137311e 100644 --- a/cpp/include/cuspatial/experimental/detail/join/intersection.cuh +++ b/cpp/include/cuspatial/detail/join/intersection.cuh @@ -17,8 +17,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/join/traversal.cuh b/cpp/include/cuspatial/detail/join/traversal.cuh similarity index 100% rename from cpp/include/cuspatial/experimental/detail/join/traversal.cuh rename to cpp/include/cuspatial/detail/join/traversal.cuh diff --git a/cpp/include/cuspatial/experimental/detail/linestring_bounding_boxes.cuh b/cpp/include/cuspatial/detail/linestring_bounding_boxes.cuh similarity index 96% rename from cpp/include/cuspatial/experimental/detail/linestring_bounding_boxes.cuh rename to cpp/include/cuspatial/detail/linestring_bounding_boxes.cuh index ea86f17ef..cc88c3053 100644 --- a/cpp/include/cuspatial/experimental/detail/linestring_bounding_boxes.cuh +++ b/cpp/include/cuspatial/detail/linestring_bounding_boxes.cuh @@ -16,8 +16,8 @@ #pragma once -#include -#include +#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/linestring_distance.cuh b/cpp/include/cuspatial/detail/linestring_distance.cuh similarity index 99% rename from cpp/include/cuspatial/experimental/detail/linestring_distance.cuh rename to cpp/include/cuspatial/detail/linestring_distance.cuh index 97648d74b..02eed59f0 100644 --- a/cpp/include/cuspatial/experimental/detail/linestring_distance.cuh +++ b/cpp/include/cuspatial/detail/linestring_distance.cuh @@ -19,8 +19,8 @@ #include #include #include +#include #include -#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/linestring_intersection.cuh b/cpp/include/cuspatial/detail/linestring_intersection.cuh similarity index 96% rename from cpp/include/cuspatial/experimental/detail/linestring_intersection.cuh rename to cpp/include/cuspatial/detail/linestring_intersection.cuh index 17bd3ad36..984e753e8 100644 --- a/cpp/include/cuspatial/experimental/detail/linestring_intersection.cuh +++ b/cpp/include/cuspatial/detail/linestring_intersection.cuh @@ -17,16 +17,16 @@ #pragma once #include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/linestring_intersection_count.cuh b/cpp/include/cuspatial/detail/linestring_intersection_count.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/detail/linestring_intersection_count.cuh rename to cpp/include/cuspatial/detail/linestring_intersection_count.cuh index 155d5c1c3..0985253ad 100644 --- a/cpp/include/cuspatial/experimental/detail/linestring_intersection_count.cuh +++ b/cpp/include/cuspatial/detail/linestring_intersection_count.cuh @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include diff --git a/cpp/include/cuspatial/experimental/detail/linestring_intersection_with_duplicates.cuh b/cpp/include/cuspatial/detail/linestring_intersection_with_duplicates.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/detail/linestring_intersection_with_duplicates.cuh rename to cpp/include/cuspatial/detail/linestring_intersection_with_duplicates.cuh index c56c4bfbe..3971ba085 100644 --- a/cpp/include/cuspatial/experimental/detail/linestring_intersection_with_duplicates.cuh +++ b/cpp/include/cuspatial/detail/linestring_intersection_with_duplicates.cuh @@ -15,14 +15,14 @@ */ #include +#include #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/linestring_polygon_distance.cuh b/cpp/include/cuspatial/detail/linestring_polygon_distance.cuh similarity index 96% rename from cpp/include/cuspatial/experimental/detail/linestring_polygon_distance.cuh rename to cpp/include/cuspatial/detail/linestring_polygon_distance.cuh index 8e3eaac1c..aa0c7cc11 100644 --- a/cpp/include/cuspatial/experimental/detail/linestring_polygon_distance.cuh +++ b/cpp/include/cuspatial/detail/linestring_polygon_distance.cuh @@ -19,14 +19,14 @@ #include "distance_utils.cuh" #include +#include +#include #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/pairwise_point_in_polygon.cuh b/cpp/include/cuspatial/detail/pairwise_point_in_polygon.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/detail/pairwise_point_in_polygon.cuh rename to cpp/include/cuspatial/detail/pairwise_point_in_polygon.cuh index 8d0ce9cc9..14951b711 100644 --- a/cpp/include/cuspatial/experimental/detail/pairwise_point_in_polygon.cuh +++ b/cpp/include/cuspatial/detail/pairwise_point_in_polygon.cuh @@ -17,11 +17,11 @@ #pragma once #include +#include #include #include -#include +#include #include -#include #include diff --git a/cpp/include/cuspatial/experimental/detail/point_distance.cuh b/cpp/include/cuspatial/detail/point_distance.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/detail/point_distance.cuh rename to cpp/include/cuspatial/detail/point_distance.cuh index a48acdac1..72cd4634b 100644 --- a/cpp/include/cuspatial/experimental/detail/point_distance.cuh +++ b/cpp/include/cuspatial/detail/point_distance.cuh @@ -17,8 +17,8 @@ #pragma once #include +#include #include -#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/point_in_polygon.cuh b/cpp/include/cuspatial/detail/point_in_polygon.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/detail/point_in_polygon.cuh rename to cpp/include/cuspatial/detail/point_in_polygon.cuh index 4a1d9fff4..bf841391a 100644 --- a/cpp/include/cuspatial/experimental/detail/point_in_polygon.cuh +++ b/cpp/include/cuspatial/detail/point_in_polygon.cuh @@ -16,11 +16,11 @@ #pragma once +#include #include #include -#include +#include #include -#include #include diff --git a/cpp/include/cuspatial/experimental/detail/point_linestring_distance.cuh b/cpp/include/cuspatial/detail/point_linestring_distance.cuh similarity index 99% rename from cpp/include/cuspatial/experimental/detail/point_linestring_distance.cuh rename to cpp/include/cuspatial/detail/point_linestring_distance.cuh index baf17070d..c245cd83c 100644 --- a/cpp/include/cuspatial/experimental/detail/point_linestring_distance.cuh +++ b/cpp/include/cuspatial/detail/point_linestring_distance.cuh @@ -19,8 +19,8 @@ #include #include #include +#include #include -#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/point_linestring_nearest_points.cuh b/cpp/include/cuspatial/detail/point_linestring_nearest_points.cuh similarity index 99% rename from cpp/include/cuspatial/experimental/detail/point_linestring_nearest_points.cuh rename to cpp/include/cuspatial/detail/point_linestring_nearest_points.cuh index da1c3e14e..12464f645 100644 --- a/cpp/include/cuspatial/experimental/detail/point_linestring_nearest_points.cuh +++ b/cpp/include/cuspatial/detail/point_linestring_nearest_points.cuh @@ -19,8 +19,8 @@ #include #include #include +#include #include -#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/point_polygon_distance.cuh b/cpp/include/cuspatial/detail/point_polygon_distance.cuh similarity index 94% rename from cpp/include/cuspatial/experimental/detail/point_polygon_distance.cuh rename to cpp/include/cuspatial/detail/point_polygon_distance.cuh index b015f09c8..0a244aadc 100644 --- a/cpp/include/cuspatial/experimental/detail/point_polygon_distance.cuh +++ b/cpp/include/cuspatial/detail/point_polygon_distance.cuh @@ -19,15 +19,15 @@ #include "distance_utils.cuh" #include +#include #include #include #include #include #include -#include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/point_quadtree.cuh b/cpp/include/cuspatial/detail/point_quadtree.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/detail/point_quadtree.cuh rename to cpp/include/cuspatial/detail/point_quadtree.cuh index 3cda7a0dc..3e70d1fe2 100644 --- a/cpp/include/cuspatial/experimental/detail/point_quadtree.cuh +++ b/cpp/include/cuspatial/detail/point_quadtree.cuh @@ -16,10 +16,10 @@ #pragma once +#include +#include #include -#include -#include -#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/points_in_range.cuh b/cpp/include/cuspatial/detail/points_in_range.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/detail/points_in_range.cuh rename to cpp/include/cuspatial/detail/points_in_range.cuh index 0bf61d2a3..7a4432b51 100644 --- a/cpp/include/cuspatial/experimental/detail/points_in_range.cuh +++ b/cpp/include/cuspatial/detail/points_in_range.cuh @@ -17,8 +17,8 @@ #pragma once #include +#include #include -#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/polygon_bounding_boxes.cuh b/cpp/include/cuspatial/detail/polygon_bounding_boxes.cuh similarity index 97% rename from cpp/include/cuspatial/experimental/detail/polygon_bounding_boxes.cuh rename to cpp/include/cuspatial/detail/polygon_bounding_boxes.cuh index 618fb05cf..0d4844329 100644 --- a/cpp/include/cuspatial/experimental/detail/polygon_bounding_boxes.cuh +++ b/cpp/include/cuspatial/detail/polygon_bounding_boxes.cuh @@ -16,9 +16,9 @@ #pragma once +#include #include -#include -#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/quadtree_bbox_filtering.cuh b/cpp/include/cuspatial/detail/quadtree_bbox_filtering.cuh similarity index 97% rename from cpp/include/cuspatial/experimental/detail/quadtree_bbox_filtering.cuh rename to cpp/include/cuspatial/detail/quadtree_bbox_filtering.cuh index c6768720a..f7a39fd9f 100644 --- a/cpp/include/cuspatial/experimental/detail/quadtree_bbox_filtering.cuh +++ b/cpp/include/cuspatial/detail/quadtree_bbox_filtering.cuh @@ -17,9 +17,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/quadtree_point_in_polygon.cuh b/cpp/include/cuspatial/detail/quadtree_point_in_polygon.cuh similarity index 96% rename from cpp/include/cuspatial/experimental/detail/quadtree_point_in_polygon.cuh rename to cpp/include/cuspatial/detail/quadtree_point_in_polygon.cuh index db507b76a..54977fa7c 100644 --- a/cpp/include/cuspatial/experimental/detail/quadtree_point_in_polygon.cuh +++ b/cpp/include/cuspatial/detail/quadtree_point_in_polygon.cuh @@ -14,12 +14,12 @@ * limitations under the License. */ +#include #include +#include #include -#include -#include -#include -#include +#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/quadtree_point_to_nearest_linestring.cuh b/cpp/include/cuspatial/detail/quadtree_point_to_nearest_linestring.cuh similarity index 97% rename from cpp/include/cuspatial/experimental/detail/quadtree_point_to_nearest_linestring.cuh rename to cpp/include/cuspatial/detail/quadtree_point_to_nearest_linestring.cuh index 112942edf..3ac8a6338 100644 --- a/cpp/include/cuspatial/experimental/detail/quadtree_point_to_nearest_linestring.cuh +++ b/cpp/include/cuspatial/detail/quadtree_point_to_nearest_linestring.cuh @@ -14,13 +14,13 @@ * limitations under the License. */ +#include #include +#include #include #include -#include -#include -#include -#include +#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/ranges/enumerate_range.cuh b/cpp/include/cuspatial/detail/range/enumerate_range.cuh similarity index 100% rename from cpp/include/cuspatial/experimental/detail/ranges/enumerate_range.cuh rename to cpp/include/cuspatial/detail/range/enumerate_range.cuh diff --git a/cpp/include/cuspatial/experimental/detail/ranges/multilinestring_range.cuh b/cpp/include/cuspatial/detail/range/multilinestring_range.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/detail/ranges/multilinestring_range.cuh rename to cpp/include/cuspatial/detail/range/multilinestring_range.cuh index 2d16ddc58..775037c42 100644 --- a/cpp/include/cuspatial/experimental/detail/ranges/multilinestring_range.cuh +++ b/cpp/include/cuspatial/detail/range/multilinestring_range.cuh @@ -23,13 +23,13 @@ #include #include +#include #include #include -#include -#include -#include +#include +#include +#include #include -#include #include diff --git a/cpp/include/cuspatial/experimental/detail/ranges/multipoint_range.cuh b/cpp/include/cuspatial/detail/range/multipoint_range.cuh similarity index 97% rename from cpp/include/cuspatial/experimental/detail/ranges/multipoint_range.cuh rename to cpp/include/cuspatial/detail/range/multipoint_range.cuh index 5b1ab4ec8..3caad3a1d 100644 --- a/cpp/include/cuspatial/experimental/detail/ranges/multipoint_range.cuh +++ b/cpp/include/cuspatial/detail/range/multipoint_range.cuh @@ -23,9 +23,9 @@ #include #include -#include +#include +#include #include -#include namespace cuspatial { diff --git a/cpp/include/cuspatial/experimental/detail/ranges/multipolygon_range.cuh b/cpp/include/cuspatial/detail/range/multipolygon_range.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/detail/ranges/multipolygon_range.cuh rename to cpp/include/cuspatial/detail/range/multipolygon_range.cuh index ec6e466ce..ad276fee9 100644 --- a/cpp/include/cuspatial/experimental/detail/ranges/multipolygon_range.cuh +++ b/cpp/include/cuspatial/detail/range/multipolygon_range.cuh @@ -17,13 +17,13 @@ #pragma once #include +#include #include #include -#include -#include -#include +#include +#include +#include #include -#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/sinusoidal_projection.cuh b/cpp/include/cuspatial/detail/sinusoidal_projection.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/detail/sinusoidal_projection.cuh rename to cpp/include/cuspatial/detail/sinusoidal_projection.cuh index 87d350c38..03fa2128c 100644 --- a/cpp/include/cuspatial/experimental/detail/sinusoidal_projection.cuh +++ b/cpp/include/cuspatial/detail/sinusoidal_projection.cuh @@ -17,8 +17,8 @@ #pragma once #include +#include #include -#include #include #include diff --git a/cpp/include/cuspatial/experimental/detail/trajectory_distances_and_speeds.cuh b/cpp/include/cuspatial/detail/trajectory_distances_and_speeds.cuh similarity index 100% rename from cpp/include/cuspatial/experimental/detail/trajectory_distances_and_speeds.cuh rename to cpp/include/cuspatial/detail/trajectory_distances_and_speeds.cuh diff --git a/cpp/include/cuspatial/detail/utility/linestring.cuh b/cpp/include/cuspatial/detail/utility/linestring.cuh index 1a0d427ba..c64dfdc1c 100644 --- a/cpp/include/cuspatial/detail/utility/linestring.cuh +++ b/cpp/include/cuspatial/detail/utility/linestring.cuh @@ -17,8 +17,8 @@ #pragma once #include -#include -#include +#include +#include #include #include diff --git a/cpp/include/cuspatial/experimental/geometry/box.hpp b/cpp/include/cuspatial/geometry/box.hpp similarity index 97% rename from cpp/include/cuspatial/experimental/geometry/box.hpp rename to cpp/include/cuspatial/geometry/box.hpp index 993e29683..1041c4de2 100644 --- a/cpp/include/cuspatial/experimental/geometry/box.hpp +++ b/cpp/include/cuspatial/geometry/box.hpp @@ -16,7 +16,7 @@ #pragma once -#include +#include namespace cuspatial { diff --git a/cpp/include/cuspatial/experimental/geometry/linestring_ref.cuh b/cpp/include/cuspatial/geometry/linestring_ref.cuh similarity index 94% rename from cpp/include/cuspatial/experimental/geometry/linestring_ref.cuh rename to cpp/include/cuspatial/geometry/linestring_ref.cuh index 4d0092420..9637e870a 100644 --- a/cpp/include/cuspatial/experimental/geometry/linestring_ref.cuh +++ b/cpp/include/cuspatial/geometry/linestring_ref.cuh @@ -16,7 +16,7 @@ #pragma once #include -#include +#include namespace cuspatial { @@ -61,4 +61,5 @@ class linestring_ref { }; } // namespace cuspatial -#include + +#include diff --git a/cpp/include/cuspatial/experimental/geometry/polygon_ref.cuh b/cpp/include/cuspatial/geometry/polygon_ref.cuh similarity index 97% rename from cpp/include/cuspatial/experimental/geometry/polygon_ref.cuh rename to cpp/include/cuspatial/geometry/polygon_ref.cuh index 5905eab2c..1d51f45a7 100644 --- a/cpp/include/cuspatial/experimental/geometry/polygon_ref.cuh +++ b/cpp/include/cuspatial/geometry/polygon_ref.cuh @@ -65,4 +65,5 @@ class polygon_ref { }; } // namespace cuspatial -#include + +#include diff --git a/cpp/include/cuspatial/experimental/geometry/segment.cuh b/cpp/include/cuspatial/geometry/segment.cuh similarity index 97% rename from cpp/include/cuspatial/experimental/geometry/segment.cuh rename to cpp/include/cuspatial/geometry/segment.cuh index 91c9ac5a4..9cfaf3b8e 100644 --- a/cpp/include/cuspatial/experimental/geometry/segment.cuh +++ b/cpp/include/cuspatial/geometry/segment.cuh @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #include diff --git a/cpp/include/cuspatial/vec_2d.hpp b/cpp/include/cuspatial/geometry/vec_2d.hpp similarity index 100% rename from cpp/include/cuspatial/vec_2d.hpp rename to cpp/include/cuspatial/geometry/vec_2d.hpp diff --git a/cpp/include/cuspatial/experimental/geometry_collection/multilinestring_ref.cuh b/cpp/include/cuspatial/geometry_collection/multilinestring_ref.cuh similarity index 94% rename from cpp/include/cuspatial/experimental/geometry_collection/multilinestring_ref.cuh rename to cpp/include/cuspatial/geometry_collection/multilinestring_ref.cuh index f6acc917d..872135f72 100644 --- a/cpp/include/cuspatial/experimental/geometry_collection/multilinestring_ref.cuh +++ b/cpp/include/cuspatial/geometry_collection/multilinestring_ref.cuh @@ -16,7 +16,7 @@ #pragma once #include -#include +#include namespace cuspatial { @@ -69,4 +69,4 @@ class multilinestring_ref { } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/geometry_collection/multipoint_ref.cuh b/cpp/include/cuspatial/geometry_collection/multipoint_ref.cuh similarity index 96% rename from cpp/include/cuspatial/experimental/geometry_collection/multipoint_ref.cuh rename to cpp/include/cuspatial/geometry_collection/multipoint_ref.cuh index 3d44a75ce..0ebe2f71b 100644 --- a/cpp/include/cuspatial/experimental/geometry_collection/multipoint_ref.cuh +++ b/cpp/include/cuspatial/geometry_collection/multipoint_ref.cuh @@ -56,4 +56,4 @@ class multipoint_ref { } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/geometry_collection/multipolygon_ref.cuh b/cpp/include/cuspatial/geometry_collection/multipolygon_ref.cuh similarity index 95% rename from cpp/include/cuspatial/experimental/geometry_collection/multipolygon_ref.cuh rename to cpp/include/cuspatial/geometry_collection/multipolygon_ref.cuh index 9affb3fba..e4ff5010f 100644 --- a/cpp/include/cuspatial/experimental/geometry_collection/multipolygon_ref.cuh +++ b/cpp/include/cuspatial/geometry_collection/multipolygon_ref.cuh @@ -16,7 +16,7 @@ #pragma once #include -#include +#include namespace cuspatial { @@ -79,4 +79,4 @@ class multipolygon_ref { } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/hausdorff.cuh b/cpp/include/cuspatial/hausdorff.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/hausdorff.cuh rename to cpp/include/cuspatial/hausdorff.cuh index 18724530b..6fe38a006 100644 --- a/cpp/include/cuspatial/experimental/hausdorff.cuh +++ b/cpp/include/cuspatial/hausdorff.cuh @@ -102,4 +102,4 @@ OutputIt directed_hausdorff_distance(PointIt points_first, } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/haversine.cuh b/cpp/include/cuspatial/haversine.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/haversine.cuh rename to cpp/include/cuspatial/haversine.cuh index a9345505b..dc1436fde 100644 --- a/cpp/include/cuspatial/experimental/haversine.cuh +++ b/cpp/include/cuspatial/haversine.cuh @@ -76,4 +76,4 @@ OutputIt haversine_distance(LonLatItA a_lonlat_first, } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/iterator_factory.cuh b/cpp/include/cuspatial/iterator_factory.cuh similarity index 99% rename from cpp/include/cuspatial/experimental/iterator_factory.cuh rename to cpp/include/cuspatial/iterator_factory.cuh index 67c35e3fc..a409cc6da 100644 --- a/cpp/include/cuspatial/experimental/iterator_factory.cuh +++ b/cpp/include/cuspatial/iterator_factory.cuh @@ -18,9 +18,9 @@ #include #include -#include +#include +#include #include -#include #include #include diff --git a/cpp/include/cuspatial/experimental/linestring_bounding_boxes.cuh b/cpp/include/cuspatial/linestring_bounding_boxes.cuh similarity index 97% rename from cpp/include/cuspatial/experimental/linestring_bounding_boxes.cuh rename to cpp/include/cuspatial/linestring_bounding_boxes.cuh index 4401161aa..62e18f3cd 100644 --- a/cpp/include/cuspatial/experimental/linestring_bounding_boxes.cuh +++ b/cpp/include/cuspatial/linestring_bounding_boxes.cuh @@ -70,4 +70,4 @@ BoundingBoxIterator linestring_bounding_boxes( } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/linestring_distance.cuh b/cpp/include/cuspatial/linestring_distance.cuh similarity index 96% rename from cpp/include/cuspatial/experimental/linestring_distance.cuh rename to cpp/include/cuspatial/linestring_distance.cuh index 31c7eaa6b..c6f0de964 100644 --- a/cpp/include/cuspatial/experimental/linestring_distance.cuh +++ b/cpp/include/cuspatial/linestring_distance.cuh @@ -47,4 +47,4 @@ OutputIt pairwise_linestring_distance(MultiLinestringRange1 multilinestrings1, rmm::cuda_stream_view stream = rmm::cuda_stream_default); } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/linestring_intersection.cuh b/cpp/include/cuspatial/linestring_intersection.cuh similarity index 95% rename from cpp/include/cuspatial/experimental/linestring_intersection.cuh rename to cpp/include/cuspatial/linestring_intersection.cuh index 76e21b2ac..cbc7c03dc 100644 --- a/cpp/include/cuspatial/experimental/linestring_intersection.cuh +++ b/cpp/include/cuspatial/linestring_intersection.cuh @@ -16,8 +16,8 @@ #pragma once -#include -#include +#include +#include #include #include @@ -92,4 +92,4 @@ linestring_intersection_result pairwise_linestring_intersection( } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/linestring_polygon_distance.cuh b/cpp/include/cuspatial/linestring_polygon_distance.cuh similarity index 96% rename from cpp/include/cuspatial/experimental/linestring_polygon_distance.cuh rename to cpp/include/cuspatial/linestring_polygon_distance.cuh index 1674ad54c..a1adf9222 100644 --- a/cpp/include/cuspatial/experimental/linestring_polygon_distance.cuh +++ b/cpp/include/cuspatial/linestring_polygon_distance.cuh @@ -45,4 +45,4 @@ OutputIt pairwise_linestring_polygon_distance( rmm::cuda_stream_view stream = rmm::cuda_stream_default); } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/pairwise_point_in_polygon.cuh b/cpp/include/cuspatial/pairwise_point_in_polygon.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/pairwise_point_in_polygon.cuh rename to cpp/include/cuspatial/pairwise_point_in_polygon.cuh index 129c79324..ac921556a 100644 --- a/cpp/include/cuspatial/experimental/pairwise_point_in_polygon.cuh +++ b/cpp/include/cuspatial/pairwise_point_in_polygon.cuh @@ -109,4 +109,4 @@ OutputIt pairwise_point_in_polygon(Cart2dItA test_points_first, } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/point_distance.cuh b/cpp/include/cuspatial/point_distance.cuh similarity index 96% rename from cpp/include/cuspatial/experimental/point_distance.cuh rename to cpp/include/cuspatial/point_distance.cuh index 2dfad8b07..7d7321b53 100644 --- a/cpp/include/cuspatial/experimental/point_distance.cuh +++ b/cpp/include/cuspatial/point_distance.cuh @@ -38,4 +38,4 @@ OutputIt pairwise_point_distance(MultiPointArrayViewA multipoints1, rmm::cuda_stream_view stream = rmm::cuda_stream_default); } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/point_in_polygon.cuh b/cpp/include/cuspatial/point_in_polygon.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/point_in_polygon.cuh rename to cpp/include/cuspatial/point_in_polygon.cuh index 1d9c86c19..8fcda7f80 100644 --- a/cpp/include/cuspatial/experimental/point_in_polygon.cuh +++ b/cpp/include/cuspatial/point_in_polygon.cuh @@ -112,4 +112,4 @@ OutputIt point_in_polygon(Cart2dItA test_points_first, } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/point_linestring_distance.cuh b/cpp/include/cuspatial/point_linestring_distance.cuh similarity index 96% rename from cpp/include/cuspatial/experimental/point_linestring_distance.cuh rename to cpp/include/cuspatial/point_linestring_distance.cuh index c3fc8b2a1..e5d467265 100644 --- a/cpp/include/cuspatial/experimental/point_linestring_distance.cuh +++ b/cpp/include/cuspatial/point_linestring_distance.cuh @@ -44,4 +44,4 @@ OutputIt pairwise_point_linestring_distance( } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/point_linestring_nearest_points.cuh b/cpp/include/cuspatial/point_linestring_nearest_points.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/point_linestring_nearest_points.cuh rename to cpp/include/cuspatial/point_linestring_nearest_points.cuh index 5815c20da..2d655b0ef 100644 --- a/cpp/include/cuspatial/experimental/point_linestring_nearest_points.cuh +++ b/cpp/include/cuspatial/point_linestring_nearest_points.cuh @@ -100,4 +100,4 @@ OutputIt pairwise_point_linestring_nearest_points( rmm::cuda_stream_view stream = rmm::cuda_stream_default); } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/point_polygon_distance.cuh b/cpp/include/cuspatial/point_polygon_distance.cuh similarity index 96% rename from cpp/include/cuspatial/experimental/point_polygon_distance.cuh rename to cpp/include/cuspatial/point_polygon_distance.cuh index b2538a0ae..eb4674069 100644 --- a/cpp/include/cuspatial/experimental/point_polygon_distance.cuh +++ b/cpp/include/cuspatial/point_polygon_distance.cuh @@ -44,4 +44,4 @@ OutputIt pairwise_point_polygon_distance(MultiPointRange multipoints, rmm::cuda_stream_view stream = rmm::cuda_stream_default); } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/point_quadtree.cuh b/cpp/include/cuspatial/point_quadtree.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/point_quadtree.cuh rename to cpp/include/cuspatial/point_quadtree.cuh index cb130d93a..a84b07558 100644 --- a/cpp/include/cuspatial/experimental/point_quadtree.cuh +++ b/cpp/include/cuspatial/point_quadtree.cuh @@ -16,8 +16,8 @@ #pragma once +#include #include -#include #include #include @@ -184,4 +184,4 @@ std::pair, point_quadtree> quadtree_on_points( } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/points_in_range.cuh b/cpp/include/cuspatial/points_in_range.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/points_in_range.cuh rename to cpp/include/cuspatial/points_in_range.cuh index a7acbaf62..79205e417 100644 --- a/cpp/include/cuspatial/experimental/points_in_range.cuh +++ b/cpp/include/cuspatial/points_in_range.cuh @@ -16,7 +16,7 @@ #pragma once -#include +#include #include @@ -115,4 +115,4 @@ OutputIt copy_points_in_range(vec_2d vertex_1, } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/polygon_bounding_boxes.cuh b/cpp/include/cuspatial/polygon_bounding_boxes.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/polygon_bounding_boxes.cuh rename to cpp/include/cuspatial/polygon_bounding_boxes.cuh index 7cd61a3d6..7cee2be26 100644 --- a/cpp/include/cuspatial/experimental/polygon_bounding_boxes.cuh +++ b/cpp/include/cuspatial/polygon_bounding_boxes.cuh @@ -79,4 +79,4 @@ BoundingBoxIterator polygon_bounding_boxes(PolygonOffsetIterator polygon_offsets } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/ranges/multilinestring_range.cuh b/cpp/include/cuspatial/range/multilinestring_range.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/ranges/multilinestring_range.cuh rename to cpp/include/cuspatial/range/multilinestring_range.cuh index 3637c327e..04c280e04 100644 --- a/cpp/include/cuspatial/experimental/ranges/multilinestring_range.cuh +++ b/cpp/include/cuspatial/range/multilinestring_range.cuh @@ -17,11 +17,11 @@ #pragma once #include -#include -#include +#include +#include +#include #include #include -#include #include @@ -347,4 +347,4 @@ auto make_multilinestring_range(GeometryColumnView const& linestrings_column) } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/ranges/multipoint_range.cuh b/cpp/include/cuspatial/range/multipoint_range.cuh similarity index 99% rename from cpp/include/cuspatial/experimental/ranges/multipoint_range.cuh rename to cpp/include/cuspatial/range/multipoint_range.cuh index 82323e9ed..1277d62b0 100644 --- a/cpp/include/cuspatial/experimental/ranges/multipoint_range.cuh +++ b/cpp/include/cuspatial/range/multipoint_range.cuh @@ -267,4 +267,4 @@ auto make_multipoint_range(GeometryColumnView const& points_column) } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/ranges/multipolygon_range.cuh b/cpp/include/cuspatial/range/multipolygon_range.cuh similarity index 98% rename from cpp/include/cuspatial/experimental/ranges/multipolygon_range.cuh rename to cpp/include/cuspatial/range/multipolygon_range.cuh index 96129145f..4c0590c4b 100644 --- a/cpp/include/cuspatial/experimental/ranges/multipolygon_range.cuh +++ b/cpp/include/cuspatial/range/multipolygon_range.cuh @@ -19,10 +19,10 @@ #include #include -#include +#include +#include #include #include -#include namespace cuspatial { @@ -269,4 +269,4 @@ auto make_multipolygon_range(GeometryColumnView const& polygons_column) } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/ranges/range.cuh b/cpp/include/cuspatial/range/range.cuh similarity index 100% rename from cpp/include/cuspatial/experimental/ranges/range.cuh rename to cpp/include/cuspatial/range/range.cuh diff --git a/cpp/include/cuspatial/experimental/sinusoidal_projection.cuh b/cpp/include/cuspatial/sinusoidal_projection.cuh similarity index 96% rename from cpp/include/cuspatial/experimental/sinusoidal_projection.cuh rename to cpp/include/cuspatial/sinusoidal_projection.cuh index 8e1b7a2cd..885577287 100644 --- a/cpp/include/cuspatial/experimental/sinusoidal_projection.cuh +++ b/cpp/include/cuspatial/sinusoidal_projection.cuh @@ -16,7 +16,7 @@ #pragma once -#include +#include #include @@ -66,4 +66,4 @@ OutputIt sinusoidal_projection(InputIt lon_lat_first, } // namespace cuspatial -#include +#include diff --git a/cpp/include/cuspatial/experimental/spatial_join.cuh b/cpp/include/cuspatial/spatial_join.cuh similarity index 95% rename from cpp/include/cuspatial/experimental/spatial_join.cuh rename to cpp/include/cuspatial/spatial_join.cuh index a90d56b7c..1b960e32c 100644 --- a/cpp/include/cuspatial/experimental/spatial_join.cuh +++ b/cpp/include/cuspatial/spatial_join.cuh @@ -17,9 +17,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include #include #include @@ -189,6 +189,6 @@ quadtree_point_to_nearest_linestring( } // namespace cuspatial -#include -#include -#include +#include +#include +#include diff --git a/cpp/include/cuspatial/traits.hpp b/cpp/include/cuspatial/traits.hpp index d16a1e269..618f79487 100644 --- a/cpp/include/cuspatial/traits.hpp +++ b/cpp/include/cuspatial/traits.hpp @@ -16,7 +16,7 @@ #pragma once -#include +#include #include diff --git a/cpp/include/cuspatial/experimental/trajectory_distances_and_speeds.cuh b/cpp/include/cuspatial/trajectory_distances_and_speeds.cuh similarity index 97% rename from cpp/include/cuspatial/experimental/trajectory_distances_and_speeds.cuh rename to cpp/include/cuspatial/trajectory_distances_and_speeds.cuh index faadcb077..81fc9c5a2 100644 --- a/cpp/include/cuspatial/experimental/trajectory_distances_and_speeds.cuh +++ b/cpp/include/cuspatial/trajectory_distances_and_speeds.cuh @@ -73,4 +73,4 @@ OutputIt trajectory_distances_and_speeds(IndexT num_trajectories, } // namespace cuspatial -#include "detail/trajectory_distances_and_speeds.cuh" +#include diff --git a/cpp/include/cuspatial_test/geometry_generator.cuh b/cpp/include/cuspatial_test/geometry_generator.cuh index 209b4c545..d9214d447 100644 --- a/cpp/include/cuspatial_test/geometry_generator.cuh +++ b/cpp/include/cuspatial_test/geometry_generator.cuh @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/include/cuspatial_test/random.cuh b/cpp/include/cuspatial_test/random.cuh index bff8ddabf..8cd6b71e2 100644 --- a/cpp/include/cuspatial_test/random.cuh +++ b/cpp/include/cuspatial_test/random.cuh @@ -18,7 +18,7 @@ #include #include -#include +#include #include diff --git a/cpp/include/cuspatial_test/test_util.cuh b/cpp/include/cuspatial_test/test_util.cuh index e30089ba4..cb9e5cafe 100644 --- a/cpp/include/cuspatial_test/test_util.cuh +++ b/cpp/include/cuspatial_test/test_util.cuh @@ -16,8 +16,8 @@ #pragma once +#include #include -#include #include #include diff --git a/cpp/include/cuspatial_test/vector_equality.hpp b/cpp/include/cuspatial_test/vector_equality.hpp index 204a1589d..06ab03073 100644 --- a/cpp/include/cuspatial_test/vector_equality.hpp +++ b/cpp/include/cuspatial_test/vector_equality.hpp @@ -16,9 +16,9 @@ #pragma once -#include +#include +#include #include -#include #include diff --git a/cpp/include/cuspatial_test/vector_factories.cuh b/cpp/include/cuspatial_test/vector_factories.cuh index 0e5ae930a..99a0fea80 100644 --- a/cpp/include/cuspatial_test/vector_factories.cuh +++ b/cpp/include/cuspatial_test/vector_factories.cuh @@ -16,12 +16,12 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include #include #include diff --git a/cpp/include/doxygen_groups.h b/cpp/include/doxygen_groups.h index a80fbe9ab..4e7ea055e 100644 --- a/cpp/include/doxygen_groups.h +++ b/cpp/include/doxygen_groups.h @@ -104,14 +104,13 @@ * @{ * @brief Factory method to create coordinate iterators * - * CuSpatial functions inside `experimental` folder are header-only and only accepts - * input/output iterators on coordinates. These factory functions are convenient ways - * to create iterators from data in various format. + * CuSpatial header-only API functions only accept input/output iterators. These factory + * make it easier to create iterators from data in various formats. * @file iterator_factory.hpp * @} * @defgroup ranges Ranges * @{ - * @brief Abstract Data Type that Represents any containers represented by a start and end + * @brief Abstract Data Type that represents any containers represented by a start and end * iterator * * cuSpatial header only APIs accept ranges that provide flattened views of diff --git a/cpp/src/indexing/construction/point_quadtree.cu b/cpp/src/indexing/construction/point_quadtree.cu index a276d0b32..ce9623522 100644 --- a/cpp/src/indexing/construction/point_quadtree.cu +++ b/cpp/src/indexing/construction/point_quadtree.cu @@ -15,10 +15,10 @@ */ #include -#include -#include +#include +#include +#include #include -#include #include #include diff --git a/cpp/src/join/quadtree_bbox_filtering.cu b/cpp/src/join/quadtree_bbox_filtering.cu index 8c427fe63..d5e20c353 100644 --- a/cpp/src/join/quadtree_bbox_filtering.cu +++ b/cpp/src/join/quadtree_bbox_filtering.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include +#include #include #include diff --git a/cpp/src/join/quadtree_point_in_polygon.cu b/cpp/src/join/quadtree_point_in_polygon.cu index 87b99f28e..3a9be80bb 100644 --- a/cpp/src/join/quadtree_point_in_polygon.cu +++ b/cpp/src/join/quadtree_point_in_polygon.cu @@ -14,10 +14,10 @@ * limitations under the License. */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/join/quadtree_point_to_nearest_linestring.cu b/cpp/src/join/quadtree_point_to_nearest_linestring.cu index a1ea45cbc..1a8f93293 100644 --- a/cpp/src/join/quadtree_point_to_nearest_linestring.cu +++ b/cpp/src/join/quadtree_point_to_nearest_linestring.cu @@ -16,9 +16,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/src/spatial/hausdorff.cu b/cpp/src/spatial/hausdorff.cu index 02940db64..530e0ecad 100644 --- a/cpp/src/spatial/hausdorff.cu +++ b/cpp/src/spatial/hausdorff.cu @@ -15,8 +15,8 @@ */ #include -#include -#include +#include +#include #include #include diff --git a/cpp/src/spatial/haversine.cu b/cpp/src/spatial/haversine.cu index b3521f3ba..c85ec9957 100644 --- a/cpp/src/spatial/haversine.cu +++ b/cpp/src/spatial/haversine.cu @@ -16,8 +16,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/src/spatial/linestring_bounding_box.cu b/cpp/src/spatial/linestring_bounding_box.cu index 8a8f0504c..c47a6cf8d 100644 --- a/cpp/src/spatial/linestring_bounding_box.cu +++ b/cpp/src/spatial/linestring_bounding_box.cu @@ -14,10 +14,10 @@ * limitations under the License. */ +#include #include -#include -#include -#include +#include +#include #include #include diff --git a/cpp/src/spatial/linestring_distance.cu b/cpp/src/spatial/linestring_distance.cu index b9bd07b27..82cca68c2 100644 --- a/cpp/src/spatial/linestring_distance.cu +++ b/cpp/src/spatial/linestring_distance.cu @@ -18,10 +18,10 @@ #include "../utility/iterator.hpp" #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/spatial/linestring_intersection.cu b/cpp/src/spatial/linestring_intersection.cu index b0e8b42d3..e80adf442 100644 --- a/cpp/src/spatial/linestring_intersection.cu +++ b/cpp/src/spatial/linestring_intersection.cu @@ -20,12 +20,12 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include +#include #include -#include #include #include diff --git a/cpp/src/spatial/linestring_polygon_distance.cu b/cpp/src/spatial/linestring_polygon_distance.cu index ada232ea1..7e99fabd5 100644 --- a/cpp/src/spatial/linestring_polygon_distance.cu +++ b/cpp/src/spatial/linestring_polygon_distance.cu @@ -31,10 +31,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/spatial/pairwise_point_in_polygon.cu b/cpp/src/spatial/pairwise_point_in_polygon.cu index 8e7c45db3..b263c223b 100644 --- a/cpp/src/spatial/pairwise_point_in_polygon.cu +++ b/cpp/src/spatial/pairwise_point_in_polygon.cu @@ -15,9 +15,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/src/spatial/point_distance.cu b/cpp/src/spatial/point_distance.cu index b50f3d131..2b8776894 100644 --- a/cpp/src/spatial/point_distance.cu +++ b/cpp/src/spatial/point_distance.cu @@ -18,10 +18,10 @@ #include "../utility/iterator.hpp" #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/spatial/point_in_polygon.cu b/cpp/src/spatial/point_in_polygon.cu index c5e63b957..22ff97609 100644 --- a/cpp/src/spatial/point_in_polygon.cu +++ b/cpp/src/spatial/point_in_polygon.cu @@ -15,9 +15,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/src/spatial/point_linestring_distance.cu b/cpp/src/spatial/point_linestring_distance.cu index e1084fdd0..6f2786b51 100644 --- a/cpp/src/spatial/point_linestring_distance.cu +++ b/cpp/src/spatial/point_linestring_distance.cu @@ -27,10 +27,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/cpp/src/spatial/point_linestring_nearest_points.cu b/cpp/src/spatial/point_linestring_nearest_points.cu index 378598738..5843e9d5d 100644 --- a/cpp/src/spatial/point_linestring_nearest_points.cu +++ b/cpp/src/spatial/point_linestring_nearest_points.cu @@ -17,10 +17,10 @@ #include "../utility/double_boolean_dispatch.hpp" #include "../utility/iterator.hpp" -#include -#include +#include +#include +#include #include -#include #include #include diff --git a/cpp/src/spatial/point_polygon_distance.cu b/cpp/src/spatial/point_polygon_distance.cu index 798ee86ad..52eea1309 100644 --- a/cpp/src/spatial/point_polygon_distance.cu +++ b/cpp/src/spatial/point_polygon_distance.cu @@ -31,10 +31,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/spatial/polygon_bounding_box.cu b/cpp/src/spatial/polygon_bounding_box.cu index e02d7b932..f8b0c5f17 100644 --- a/cpp/src/spatial/polygon_bounding_box.cu +++ b/cpp/src/spatial/polygon_bounding_box.cu @@ -16,8 +16,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/cpp/src/spatial/sinusoidal_projection.cu b/cpp/src/spatial/sinusoidal_projection.cu index 72e134c95..522c8dea0 100644 --- a/cpp/src/spatial/sinusoidal_projection.cu +++ b/cpp/src/spatial/sinusoidal_projection.cu @@ -15,9 +15,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/src/spatial_window/spatial_window.cu b/cpp/src/spatial_window/spatial_window.cu index 99980ab7e..8ed1358a3 100644 --- a/cpp/src/spatial_window/spatial_window.cu +++ b/cpp/src/spatial_window/spatial_window.cu @@ -15,8 +15,8 @@ */ #include -#include -#include +#include +#include #include #include diff --git a/cpp/src/trajectory/derive_trajectories.cu b/cpp/src/trajectory/derive_trajectories.cu index f6c31c4f2..cb760f1be 100644 --- a/cpp/src/trajectory/derive_trajectories.cu +++ b/cpp/src/trajectory/derive_trajectories.cu @@ -14,9 +14,9 @@ * limitations under the License. */ +#include #include -#include -#include +#include #include #include diff --git a/cpp/src/trajectory/trajectory_bounding_boxes.cu b/cpp/src/trajectory/trajectory_bounding_boxes.cu index 92df0d38c..f790f86e8 100644 --- a/cpp/src/trajectory/trajectory_bounding_boxes.cu +++ b/cpp/src/trajectory/trajectory_bounding_boxes.cu @@ -14,9 +14,9 @@ * limitations under the License. */ +#include #include -#include -#include +#include #include #include diff --git a/cpp/src/trajectory/trajectory_distances_and_speeds.cu b/cpp/src/trajectory/trajectory_distances_and_speeds.cu index cd7c59db4..d239ec907 100644 --- a/cpp/src/trajectory/trajectory_distances_and_speeds.cu +++ b/cpp/src/trajectory/trajectory_distances_and_speeds.cu @@ -15,9 +15,9 @@ */ #include -#include -#include +#include #include +#include #include #include diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt index 654b364b0..8f2a26f34 100644 --- a/cpp/tests/CMakeLists.txt +++ b/cpp/tests/CMakeLists.txt @@ -48,14 +48,15 @@ endfunction(ConfigureTest) ### test sources ################################################################################## ################################################################################################### -ConfigureTest(SINUSOIDAL_PROJECTION_TEST - spatial/sinusoidal_projection_test.cu) +# Column-based API -ConfigureTest(HAVERSINE_TEST - spatial/haversine_test.cpp) +# index +ConfigureTest(POINT_QUADTREE_TEST + index/point_quadtree_test.cpp) -ConfigureTest(HAUSDORFF_TEST - spatial/hausdorff_test.cpp) +# join +ConfigureTest(JOIN_QUADTREE_AND_BOUNDING_BOXES_TEST + join/join_quadtree_and_bounding_boxes_test.cpp) ConfigureTest(JOIN_POINT_TO_NEAREST_LINESTRING_TEST join/quadtree_point_to_nearest_linestring_test.cpp) @@ -63,45 +64,59 @@ ConfigureTest(JOIN_POINT_TO_NEAREST_LINESTRING_TEST ConfigureTest(JOIN_POINT_IN_POLYGON_TEST join/quadtree_point_in_polygon_test.cpp) -ConfigureTest(POINT_IN_POLYGON_TEST - spatial/point_in_polygon_test.cpp) - -ConfigureTest(PAIRWISE_POINT_IN_POLYGON_TEST - spatial/pairwise_point_in_polygon_test.cpp) - -ConfigureTest(POINT_QUADTREE_TEST - indexing/point_quadtree_test.cpp) +# projection +ConfigureTest(SINUSOIDAL_PROJECTION_TEST + projection/sinusoidal_projection_test.cpp) +# bounding boxes ConfigureTest(LINESTRING_BOUNDING_BOXES_TEST - spatial/linestring_bounding_boxes_test.cpp) + spatial/bounding_boxes/linestring_bounding_boxes_test.cpp) ConfigureTest(POLYGON_BOUNDING_BOXES_TEST - spatial/polygon_bounding_boxes_test.cpp) + spatial/bounding_boxes/polygon_bounding_boxes_test.cpp) + +# distance +ConfigureTest(HAVERSINE_TEST + spatial/distance/haversine_test.cpp) + +ConfigureTest(HAUSDORFF_TEST + spatial/distance/hausdorff_test.cpp) ConfigureTest(POINT_DISTANCE_TEST - spatial/point_distance_test.cpp) + spatial/distance/point_distance_test.cpp) ConfigureTest(POINT_LINESTRING_DISTANCE_TEST - spatial/point_linestring_distance_test.cpp) + spatial/distance/point_linestring_distance_test.cpp) ConfigureTest(LINESTRING_DISTANCE_TEST - spatial/linestring_distance_test.cpp) - -ConfigureTest(POINT_POLYGON_DISTANCE_TEST - spatial/point_polygon_distance_test.cpp) + spatial/distance/linestring_distance_test.cpp) ConfigureTest(LINESTRING_POLYGON_DISTANCE_TEST spatial/linestring_polygon_distance_test.cpp) +ConfigureTest(POINT_POLYGON_DISTANCE_TEST + spatial/distance/point_polygon_distance_test.cpp) + +#intersection ConfigureTest(LINESTRING_INTERSECTION_TEST - spatial/linestring_intersection_test.cpp) + spatial/intersection/linestring_intersection_test.cpp) +# nearest points ConfigureTest(POINT_LINESTRING_NEAREST_POINT_TEST - spatial/point_linestring_nearest_points_test.cpp) + spatial/nearest_points/point_linestring_nearest_points_test.cpp) -ConfigureTest(JOIN_QUADTREE_AND_BOUNDING_BOXES_TEST - join/join_quadtree_and_bounding_boxes_test.cpp) +# point in polygon +ConfigureTest(POINT_IN_POLYGON_TEST + spatial/point_in_polygon/point_in_polygon_test.cpp) + +ConfigureTest(PAIRWISE_POINT_IN_POLYGON_TEST + spatial/point_in_polygon/pairwise_point_in_polygon_test.cpp) + +# points in range +ConfigureTest(SPATIAL_WINDOW_POINT_TEST + spatial/points_in_range/spatial_window_test.cpp) +# trajectory ConfigureTest(TRAJECTORY_DISTANCES_AND_SPEEDS_TEST trajectory/test_trajectory_distances_and_speeds.cu) @@ -111,9 +126,7 @@ ConfigureTest(DERIVE_TRAJECTORIES_TEST ConfigureTest(TRAJECTORY_BOUNDING_BOXES_TEST trajectory/test_trajectory_bounding_boxes.cu) -ConfigureTest(SPATIAL_WINDOW_POINT_TEST - spatial_window/spatial_window_test.cpp) - +# utility ConfigureTest(UTILITY_TEST utility_test/test_float_equivalent.cu utility_test/test_multipoint_factory.cu @@ -121,87 +134,101 @@ ConfigureTest(UTILITY_TEST ) # Header-only API -ConfigureTest(HAVERSINE_TEST_EXP - experimental/spatial/haversine_test.cu) - -ConfigureTest(POINT_DISTANCE_TEST_EXP - experimental/spatial/point_distance_test.cu) -ConfigureTest(POINT_LINESTRING_DISTANCE_TEST_EXP - experimental/spatial/point_linestring_distance_test.cu) +# find / intersection util +ConfigureTest(FIND_TEST_EXP + find/find_and_combine_segments_test.cu + find/find_points_on_segments_test.cu + find/find_duplicate_points_test.cu) -ConfigureTest(POINT_POLYGON_DISTANCE_TEST_EXP - experimental/spatial/point_polygon_distance_test.cu) +# index +ConfigureTest(POINT_QUADTREE_TEST_EXP + index/point_quadtree_test.cu) -ConfigureTest(LINESTRING_POLYGON_DISTANCE_TEST_EXP - experimental/spatial/linestring_polygon_distance_test.cu) +# join +ConfigureTest(JOIN_QUADTREE_AND_BOUNDING_BOXES_TEST_EXP + join/join_quadtree_and_bounding_boxes_test.cu) -ConfigureTest(HAUSDORFF_TEST_EXP - experimental/spatial/hausdorff_test.cu) +ConfigureTest(JOIN_POINT_IN_POLYGON_SMALL_TEST_EXP + join/quadtree_point_in_polygon_test_small.cu) -ConfigureTest(LINESTRING_DISTANCE_TEST_EXP - experimental/spatial/linestring_distance_test.cu - experimental/spatial/linestring_distance_test_medium.cu) +ConfigureTest(JOIN_POINT_IN_POLYGON_LARGE_TEST_EXP + join/quadtree_point_in_polygon_test_large.cu) -ConfigureTest(LINESTRING_INTERSECTION_TEST_EXP - experimental/spatial/linestring_intersection_count_test.cu - experimental/spatial/linestring_intersection_intermediates_remove_if_test.cu - experimental/spatial/linestring_intersection_with_duplicates_test.cu - experimental/spatial/linestring_intersection_test.cu) +ConfigureTest(JOIN_POINT_TO_LINESTRING_SMALL_TEST_EXP + join/quadtree_point_to_nearest_linestring_test_small.cu) -ConfigureTest(POINT_LINESTRING_NEAREST_POINT_TEST_EXP - experimental/spatial/point_linestring_nearest_points_test.cu) +# operators +ConfigureTest(OPERATOR_TEST_EXP + operators/linestrings_test.cu) +# projection ConfigureTest(SINUSOIDAL_PROJECTION_TEST_EXP - experimental/spatial/sinusoidal_projection_test.cu) - -ConfigureTest(POINTS_IN_RANGE_TEST_EXP - experimental/spatial/points_in_range_test.cu) - -ConfigureTest(POINT_IN_POLYGON_TEST_EXP - experimental/spatial/point_in_polygon_test.cu) - -ConfigureTest(PAIRWISE_POINT_IN_POLYGON_TEST_EXP - experimental/spatial/pairwise_point_in_polygon_test.cu) + projection/sinusoidal_projection_test.cu) -ConfigureTest(DERIVE_TRAJECTORIES_TEST_EXP - experimental/trajectory/derive_trajectories_test.cu) +# range +ConfigureTest(RANGE_TEST_EXP + range/multilinestring_range_test.cu + range/multipolygon_range_test.cu) +# bounding boxes ConfigureTest(POINT_BOUNDING_BOXES_TEST_EXP - experimental/spatial/point_bounding_boxes_test.cu) + spatial/bounding_boxes/point_bounding_boxes_test.cu) ConfigureTest(POLYGON_BOUNDING_BOXES_TEST_EXP - experimental/spatial/polygon_bounding_boxes_test.cu) + spatial/bounding_boxes/polygon_bounding_boxes_test.cu) ConfigureTest(LINESTRING_BOUNDING_BOXES_TEST_EXP - experimental/spatial/linestring_bounding_boxes_test.cu) + spatial/bounding_boxes/linestring_bounding_boxes_test.cu) -ConfigureTest(TRAJECTORY_DISTANCES_AND_SPEEDS_TEST_EXP - experimental/trajectory/trajectory_distances_and_speeds_test.cu) +# distance +ConfigureTest(HAUSDORFF_TEST_EXP + spatial/distance/hausdorff_test.cu) -ConfigureTest(POINT_QUADTREE_TEST_EXP - experimental/indexing/point_quadtree_test.cu) +ConfigureTest(HAVERSINE_TEST_EXP + spatial/distance/haversine_test.cu) -ConfigureTest(OPERATOR_TEST_EXP - experimental/operators/linestrings_test.cu) +ConfigureTest(POINT_DISTANCE_TEST_EXP + spatial/distance/point_distance_test.cu) -ConfigureTest(FIND_TEST_EXP - experimental/find/find_and_combine_segments_test.cu - experimental/find/find_points_on_segments_test.cu - experimental/find/find_duplicate_points_test.cu) +ConfigureTest(POINT_LINESTRING_DISTANCE_TEST_EXP + spatial/distance/point_linestring_distance_test.cu) -ConfigureTest(JOIN_QUADTREE_AND_BOUNDING_BOXES_TEST_EXP - experimental/join/join_quadtree_and_bounding_boxes_test.cu) +ConfigureTest(POINT_POLYGON_DISTANCE_TEST_EXP + spatial/distance/point_polygon_distance_test.cu) -ConfigureTest(JOIN_POINT_IN_POLYGON_SMALL_TEST_EXP - experimental/join/quadtree_point_in_polygon_test_small.cu) +ConfigureTest(LINESTRING_POLYGON_DISTANCE_TEST_EXP + spatial/distance/linestring_polygon_distance_test.cu) -ConfigureTest(JOIN_POINT_IN_POLYGON_LARGE_TEST_EXP - experimental/join/quadtree_point_in_polygon_test_large.cu) +ConfigureTest(LINESTRING_DISTANCE_TEST_EXP + spatial/distance/linestring_distance_test.cu + spatial/distance/linestring_distance_test_medium.cu) -ConfigureTest(JOIN_POINT_TO_LINESTRING_SMALL_TEST_EXP - experimental/join/quadtree_point_to_nearest_linestring_test_small.cu) +# intersection +ConfigureTest(LINESTRING_INTERSECTION_TEST_EXP + spatial/intersection/linestring_intersection_count_test.cu + spatial/intersection/linestring_intersection_intermediates_remove_if_test.cu + spatial/intersection/linestring_intersection_with_duplicates_test.cu + spatial/intersection/linestring_intersection_test.cu) -ConfigureTest(RANGE_TEST_EXP - experimental/range/multilinestring_range_test.cu - experimental/range/multipolygon_range_test.cu) +# nearest points +ConfigureTest(POINT_LINESTRING_NEAREST_POINT_TEST_EXP + spatial/nearest_points/point_linestring_nearest_points_test.cu) + +# point in polygon +ConfigureTest(POINT_IN_POLYGON_TEST_EXP + spatial/point_in_polygon/point_in_polygon_test.cu) + +ConfigureTest(PAIRWISE_POINT_IN_POLYGON_TEST_EXP + spatial/point_in_polygon/pairwise_point_in_polygon_test.cu) + +# points in range +ConfigureTest(POINTS_IN_RANGE_TEST_EXP + spatial/points_in_range/points_in_range_test.cu) + +# trajectory +ConfigureTest(DERIVE_TRAJECTORIES_TEST_EXP + trajectory/derive_trajectories_test.cu) + +ConfigureTest(TRAJECTORY_DISTANCES_AND_SPEEDS_TEST_EXP + trajectory/trajectory_distances_and_speeds_test.cu) diff --git a/cpp/tests/experimental/find/find_and_combine_segments_test.cu b/cpp/tests/find/find_and_combine_segments_test.cu similarity index 97% rename from cpp/tests/experimental/find/find_and_combine_segments_test.cu rename to cpp/tests/find/find_and_combine_segments_test.cu index fa63bf77c..ea01d7e53 100644 --- a/cpp/tests/experimental/find/find_and_combine_segments_test.cu +++ b/cpp/tests/find/find_and_combine_segments_test.cu @@ -18,10 +18,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/experimental/find/find_duplicate_points_test.cu b/cpp/tests/find/find_duplicate_points_test.cu similarity index 96% rename from cpp/tests/experimental/find/find_duplicate_points_test.cu rename to cpp/tests/find/find_duplicate_points_test.cu index 980e8282a..f4185227c 100644 --- a/cpp/tests/experimental/find/find_duplicate_points_test.cu +++ b/cpp/tests/find/find_duplicate_points_test.cu @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include using namespace cuspatial; using namespace cuspatial::detail; diff --git a/cpp/tests/experimental/find/find_points_on_segments_test.cu b/cpp/tests/find/find_points_on_segments_test.cu similarity index 98% rename from cpp/tests/experimental/find/find_points_on_segments_test.cu rename to cpp/tests/find/find_points_on_segments_test.cu index 7248d7650..8981986bc 100644 --- a/cpp/tests/experimental/find/find_points_on_segments_test.cu +++ b/cpp/tests/find/find_points_on_segments_test.cu @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/cpp/tests/indexing/point_quadtree_test.cpp b/cpp/tests/index/point_quadtree_test.cpp similarity index 100% rename from cpp/tests/indexing/point_quadtree_test.cpp rename to cpp/tests/index/point_quadtree_test.cpp diff --git a/cpp/tests/experimental/indexing/point_quadtree_test.cu b/cpp/tests/index/point_quadtree_test.cu similarity index 99% rename from cpp/tests/experimental/indexing/point_quadtree_test.cu rename to cpp/tests/index/point_quadtree_test.cu index 10278ea4a..dd22df218 100644 --- a/cpp/tests/experimental/indexing/point_quadtree_test.cu +++ b/cpp/tests/index/point_quadtree_test.cu @@ -17,8 +17,8 @@ #include #include -#include -#include +#include +#include template struct QuadtreeOnPointIndexingTest : public ::testing::Test { diff --git a/cpp/tests/experimental/join/join_quadtree_and_bounding_boxes_test.cu b/cpp/tests/join/join_quadtree_and_bounding_boxes_test.cu similarity index 96% rename from cpp/tests/experimental/join/join_quadtree_and_bounding_boxes_test.cu rename to cpp/tests/join/join_quadtree_and_bounding_boxes_test.cu index ddb8f7df5..c68492769 100644 --- a/cpp/tests/experimental/join/join_quadtree_and_bounding_boxes_test.cu +++ b/cpp/tests/join/join_quadtree_and_bounding_boxes_test.cu @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include // Note: the detailed correctness test of the join_quadtree_and_bounding_boxes() function is covered // by the quadtree_point_in_polygon_test_small.cu test file. diff --git a/cpp/tests/join/quadtree_point_in_polygon_test.cpp b/cpp/tests/join/quadtree_point_in_polygon_test.cpp index 93b32ffa7..6206e8b45 100644 --- a/cpp/tests/join/quadtree_point_in_polygon_test.cpp +++ b/cpp/tests/join/quadtree_point_in_polygon_test.cpp @@ -16,10 +16,10 @@ #include #include +#include #include #include #include -#include #include #include diff --git a/cpp/tests/experimental/join/quadtree_point_in_polygon_test_large.cu b/cpp/tests/join/quadtree_point_in_polygon_test_large.cu similarity index 97% rename from cpp/tests/experimental/join/quadtree_point_in_polygon_test_large.cu rename to cpp/tests/join/quadtree_point_in_polygon_test_large.cu index a982632c8..c66879986 100644 --- a/cpp/tests/experimental/join/quadtree_point_in_polygon_test_large.cu +++ b/cpp/tests/join/quadtree_point_in_polygon_test_large.cu @@ -21,10 +21,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/experimental/join/quadtree_point_in_polygon_test_small.cu b/cpp/tests/join/quadtree_point_in_polygon_test_small.cu similarity index 97% rename from cpp/tests/experimental/join/quadtree_point_in_polygon_test_small.cu rename to cpp/tests/join/quadtree_point_in_polygon_test_small.cu index f4e164877..500628bab 100644 --- a/cpp/tests/experimental/join/quadtree_point_in_polygon_test_small.cu +++ b/cpp/tests/join/quadtree_point_in_polygon_test_small.cu @@ -19,10 +19,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/join/quadtree_point_to_nearest_linestring_test.cpp b/cpp/tests/join/quadtree_point_to_nearest_linestring_test.cpp index fbb3b0c19..a04b590a3 100644 --- a/cpp/tests/join/quadtree_point_to_nearest_linestring_test.cpp +++ b/cpp/tests/join/quadtree_point_to_nearest_linestring_test.cpp @@ -16,10 +16,10 @@ #include #include +#include #include #include #include -#include #include #include diff --git a/cpp/tests/experimental/join/quadtree_point_to_nearest_linestring_test_small.cu b/cpp/tests/join/quadtree_point_to_nearest_linestring_test_small.cu similarity index 98% rename from cpp/tests/experimental/join/quadtree_point_to_nearest_linestring_test_small.cu rename to cpp/tests/join/quadtree_point_to_nearest_linestring_test_small.cu index e4ca29b6b..a27997a96 100644 --- a/cpp/tests/experimental/join/quadtree_point_to_nearest_linestring_test_small.cu +++ b/cpp/tests/join/quadtree_point_to_nearest_linestring_test_small.cu @@ -19,10 +19,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/cpp/tests/experimental/operators/linestrings_test.cu b/cpp/tests/operators/linestrings_test.cu similarity index 99% rename from cpp/tests/experimental/operators/linestrings_test.cu rename to cpp/tests/operators/linestrings_test.cu index bdfc508ea..356a115ed 100644 --- a/cpp/tests/experimental/operators/linestrings_test.cu +++ b/cpp/tests/operators/linestrings_test.cu @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include diff --git a/cpp/tests/spatial/sinusoidal_projection_test.cu b/cpp/tests/projection/sinusoidal_projection_test.cpp similarity index 100% rename from cpp/tests/spatial/sinusoidal_projection_test.cu rename to cpp/tests/projection/sinusoidal_projection_test.cpp diff --git a/cpp/tests/experimental/spatial/sinusoidal_projection_test.cu b/cpp/tests/projection/sinusoidal_projection_test.cu similarity index 99% rename from cpp/tests/experimental/spatial/sinusoidal_projection_test.cu rename to cpp/tests/projection/sinusoidal_projection_test.cu index 003d77a80..1b0db23c7 100644 --- a/cpp/tests/experimental/spatial/sinusoidal_projection_test.cu +++ b/cpp/tests/projection/sinusoidal_projection_test.cu @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/cpp/tests/experimental/range/multilinestring_range_test.cu b/cpp/tests/range/multilinestring_range_test.cu similarity index 99% rename from cpp/tests/experimental/range/multilinestring_range_test.cu rename to cpp/tests/range/multilinestring_range_test.cu index 9fcb0097e..0d00d5c5f 100644 --- a/cpp/tests/experimental/range/multilinestring_range_test.cu +++ b/cpp/tests/range/multilinestring_range_test.cu @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/cpp/tests/experimental/range/multipolygon_range_test.cu b/cpp/tests/range/multipolygon_range_test.cu similarity index 99% rename from cpp/tests/experimental/range/multipolygon_range_test.cu rename to cpp/tests/range/multipolygon_range_test.cu index b6b5bc340..1caa92b2e 100644 --- a/cpp/tests/experimental/range/multipolygon_range_test.cu +++ b/cpp/tests/range/multipolygon_range_test.cu @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/spatial/linestring_bounding_boxes_test.cpp b/cpp/tests/spatial/bounding_boxes/linestring_bounding_boxes_test.cpp similarity index 100% rename from cpp/tests/spatial/linestring_bounding_boxes_test.cpp rename to cpp/tests/spatial/bounding_boxes/linestring_bounding_boxes_test.cpp diff --git a/cpp/tests/experimental/spatial/linestring_bounding_boxes_test.cu b/cpp/tests/spatial/bounding_boxes/linestring_bounding_boxes_test.cu similarity index 97% rename from cpp/tests/experimental/spatial/linestring_bounding_boxes_test.cu rename to cpp/tests/spatial/bounding_boxes/linestring_bounding_boxes_test.cu index 25bcb4f6e..d18a32e73 100644 --- a/cpp/tests/experimental/spatial/linestring_bounding_boxes_test.cu +++ b/cpp/tests/spatial/bounding_boxes/linestring_bounding_boxes_test.cu @@ -18,9 +18,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/cpp/tests/experimental/spatial/point_bounding_boxes_test.cu b/cpp/tests/spatial/bounding_boxes/point_bounding_boxes_test.cu similarity index 92% rename from cpp/tests/experimental/spatial/point_bounding_boxes_test.cu rename to cpp/tests/spatial/bounding_boxes/point_bounding_boxes_test.cu index c9d726e3f..2d00a1a91 100644 --- a/cpp/tests/experimental/spatial/point_bounding_boxes_test.cu +++ b/cpp/tests/spatial/bounding_boxes/point_bounding_boxes_test.cu @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "../trajectory/trajectory_test_utils.cuh" +#include "../../trajectory/trajectory_test_utils.cuh" #include +#include #include -#include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/spatial/polygon_bounding_boxes_test.cpp b/cpp/tests/spatial/bounding_boxes/polygon_bounding_boxes_test.cpp similarity index 100% rename from cpp/tests/spatial/polygon_bounding_boxes_test.cpp rename to cpp/tests/spatial/bounding_boxes/polygon_bounding_boxes_test.cpp diff --git a/cpp/tests/experimental/spatial/polygon_bounding_boxes_test.cu b/cpp/tests/spatial/bounding_boxes/polygon_bounding_boxes_test.cu similarity index 98% rename from cpp/tests/experimental/spatial/polygon_bounding_boxes_test.cu rename to cpp/tests/spatial/bounding_boxes/polygon_bounding_boxes_test.cu index fff8ef28a..6ad497312 100644 --- a/cpp/tests/experimental/spatial/polygon_bounding_boxes_test.cu +++ b/cpp/tests/spatial/bounding_boxes/polygon_bounding_boxes_test.cu @@ -18,9 +18,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/cpp/tests/spatial/hausdorff_test.cpp b/cpp/tests/spatial/distance/hausdorff_test.cpp similarity index 100% rename from cpp/tests/spatial/hausdorff_test.cpp rename to cpp/tests/spatial/distance/hausdorff_test.cpp diff --git a/cpp/tests/experimental/spatial/hausdorff_test.cu b/cpp/tests/spatial/distance/hausdorff_test.cu similarity index 98% rename from cpp/tests/experimental/spatial/hausdorff_test.cu rename to cpp/tests/spatial/distance/hausdorff_test.cu index cb93c9e1e..5c9b0aecf 100644 --- a/cpp/tests/experimental/spatial/hausdorff_test.cu +++ b/cpp/tests/spatial/distance/hausdorff_test.cu @@ -17,8 +17,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/cpp/tests/spatial/haversine_test.cpp b/cpp/tests/spatial/distance/haversine_test.cpp similarity index 100% rename from cpp/tests/spatial/haversine_test.cpp rename to cpp/tests/spatial/distance/haversine_test.cpp diff --git a/cpp/tests/experimental/spatial/haversine_test.cu b/cpp/tests/spatial/distance/haversine_test.cu similarity index 99% rename from cpp/tests/experimental/spatial/haversine_test.cu rename to cpp/tests/spatial/distance/haversine_test.cu index f733e6445..8428143c3 100644 --- a/cpp/tests/experimental/spatial/haversine_test.cu +++ b/cpp/tests/spatial/distance/haversine_test.cu @@ -17,7 +17,7 @@ #include #include -#include +#include #include diff --git a/cpp/tests/spatial/linestring_distance_test.cpp b/cpp/tests/spatial/distance/linestring_distance_test.cpp similarity index 100% rename from cpp/tests/spatial/linestring_distance_test.cpp rename to cpp/tests/spatial/distance/linestring_distance_test.cpp diff --git a/cpp/tests/experimental/spatial/linestring_distance_test.cu b/cpp/tests/spatial/distance/linestring_distance_test.cu similarity index 99% rename from cpp/tests/experimental/spatial/linestring_distance_test.cu rename to cpp/tests/spatial/distance/linestring_distance_test.cu index 79727bee9..5cb285a5a 100644 --- a/cpp/tests/experimental/spatial/linestring_distance_test.cu +++ b/cpp/tests/spatial/distance/linestring_distance_test.cu @@ -18,10 +18,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/experimental/spatial/linestring_distance_test_medium.cu b/cpp/tests/spatial/distance/linestring_distance_test_medium.cu similarity index 99% rename from cpp/tests/experimental/spatial/linestring_distance_test_medium.cu rename to cpp/tests/spatial/distance/linestring_distance_test_medium.cu index 36bcb444d..efda52407 100644 --- a/cpp/tests/experimental/spatial/linestring_distance_test_medium.cu +++ b/cpp/tests/spatial/distance/linestring_distance_test_medium.cu @@ -18,10 +18,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/cpp/tests/experimental/spatial/linestring_polygon_distance_test.cu b/cpp/tests/spatial/distance/linestring_polygon_distance_test.cu similarity index 98% rename from cpp/tests/experimental/spatial/linestring_polygon_distance_test.cu rename to cpp/tests/spatial/distance/linestring_polygon_distance_test.cu index cdc9f7651..0d3ef91f0 100644 --- a/cpp/tests/experimental/spatial/linestring_polygon_distance_test.cu +++ b/cpp/tests/spatial/distance/linestring_polygon_distance_test.cu @@ -19,9 +19,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/tests/spatial/point_distance_test.cpp b/cpp/tests/spatial/distance/point_distance_test.cpp similarity index 99% rename from cpp/tests/spatial/point_distance_test.cpp rename to cpp/tests/spatial/distance/point_distance_test.cpp index 841d142ef..d45e6459b 100644 --- a/cpp/tests/spatial/point_distance_test.cpp +++ b/cpp/tests/spatial/distance/point_distance_test.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/cpp/tests/experimental/spatial/point_distance_test.cu b/cpp/tests/spatial/distance/point_distance_test.cu similarity index 99% rename from cpp/tests/experimental/spatial/point_distance_test.cu rename to cpp/tests/spatial/distance/point_distance_test.cu index 517a4e605..1b1f9ff90 100644 --- a/cpp/tests/experimental/spatial/point_distance_test.cu +++ b/cpp/tests/spatial/distance/point_distance_test.cu @@ -20,10 +20,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/cpp/tests/spatial/point_linestring_distance_test.cpp b/cpp/tests/spatial/distance/point_linestring_distance_test.cpp similarity index 99% rename from cpp/tests/spatial/point_linestring_distance_test.cpp rename to cpp/tests/spatial/distance/point_linestring_distance_test.cpp index 870ab806d..9f922cdcb 100644 --- a/cpp/tests/spatial/point_linestring_distance_test.cpp +++ b/cpp/tests/spatial/distance/point_linestring_distance_test.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/cpp/tests/experimental/spatial/point_linestring_distance_test.cu b/cpp/tests/spatial/distance/point_linestring_distance_test.cu similarity index 98% rename from cpp/tests/experimental/spatial/point_linestring_distance_test.cu rename to cpp/tests/spatial/distance/point_linestring_distance_test.cu index 16fc520e2..f16df5f10 100644 --- a/cpp/tests/experimental/spatial/point_linestring_distance_test.cu +++ b/cpp/tests/spatial/distance/point_linestring_distance_test.cu @@ -18,11 +18,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/cpp/tests/spatial/point_polygon_distance_test.cpp b/cpp/tests/spatial/distance/point_polygon_distance_test.cpp similarity index 99% rename from cpp/tests/spatial/point_polygon_distance_test.cpp rename to cpp/tests/spatial/distance/point_polygon_distance_test.cpp index e881d2490..43d9b2c66 100644 --- a/cpp/tests/spatial/point_polygon_distance_test.cpp +++ b/cpp/tests/spatial/distance/point_polygon_distance_test.cpp @@ -17,8 +17,8 @@ #include #include #include +#include #include -#include #include #include diff --git a/cpp/tests/experimental/spatial/point_polygon_distance_test.cu b/cpp/tests/spatial/distance/point_polygon_distance_test.cu similarity index 99% rename from cpp/tests/experimental/spatial/point_polygon_distance_test.cu rename to cpp/tests/spatial/distance/point_polygon_distance_test.cu index 7e580e46f..01536a4af 100644 --- a/cpp/tests/experimental/spatial/point_polygon_distance_test.cu +++ b/cpp/tests/spatial/distance/point_polygon_distance_test.cu @@ -18,9 +18,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/tests/experimental/spatial/intersection_test_utils.cuh b/cpp/tests/spatial/intersection/intersection_test_utils.cuh similarity index 97% rename from cpp/tests/experimental/spatial/intersection_test_utils.cuh rename to cpp/tests/spatial/intersection/intersection_test_utils.cuh index 432b735e5..34a93de64 100644 --- a/cpp/tests/experimental/spatial/intersection_test_utils.cuh +++ b/cpp/tests/spatial/intersection/intersection_test_utils.cuh @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #include diff --git a/cpp/tests/experimental/spatial/linestring_intersection_count_test.cu b/cpp/tests/spatial/intersection/linestring_intersection_count_test.cu similarity index 99% rename from cpp/tests/experimental/spatial/linestring_intersection_count_test.cu rename to cpp/tests/spatial/intersection/linestring_intersection_count_test.cu index d9bd89a51..549bdf468 100644 --- a/cpp/tests/experimental/spatial/linestring_intersection_count_test.cu +++ b/cpp/tests/spatial/intersection/linestring_intersection_count_test.cu @@ -17,11 +17,11 @@ #include #include +#include #include -#include -#include +#include +#include #include -#include #include #include diff --git a/cpp/tests/experimental/spatial/linestring_intersection_intermediates_remove_if_test.cu b/cpp/tests/spatial/intersection/linestring_intersection_intermediates_remove_if_test.cu similarity index 98% rename from cpp/tests/experimental/spatial/linestring_intersection_intermediates_remove_if_test.cu rename to cpp/tests/spatial/intersection/linestring_intersection_intermediates_remove_if_test.cu index 227040cfa..f9f8504b1 100644 --- a/cpp/tests/experimental/spatial/linestring_intersection_intermediates_remove_if_test.cu +++ b/cpp/tests/spatial/intersection/linestring_intersection_intermediates_remove_if_test.cu @@ -17,12 +17,12 @@ #include #include +#include #include -#include -#include -#include +#include +#include +#include #include -#include #include #include diff --git a/cpp/tests/spatial/linestring_intersection_test.cpp b/cpp/tests/spatial/intersection/linestring_intersection_test.cpp similarity index 99% rename from cpp/tests/spatial/linestring_intersection_test.cpp rename to cpp/tests/spatial/intersection/linestring_intersection_test.cpp index 9110c7197..65a9b5d13 100644 --- a/cpp/tests/spatial/linestring_intersection_test.cpp +++ b/cpp/tests/spatial/intersection/linestring_intersection_test.cpp @@ -23,9 +23,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/cpp/tests/experimental/spatial/linestring_intersection_test.cu b/cpp/tests/spatial/intersection/linestring_intersection_test.cu similarity index 99% rename from cpp/tests/experimental/spatial/linestring_intersection_test.cu rename to cpp/tests/spatial/intersection/linestring_intersection_test.cu index 3d4589016..d0bf58b11 100644 --- a/cpp/tests/experimental/spatial/linestring_intersection_test.cu +++ b/cpp/tests/spatial/intersection/linestring_intersection_test.cu @@ -21,10 +21,10 @@ #include #include -#include -#include +#include +#include +#include #include -#include #include #include diff --git a/cpp/tests/experimental/spatial/linestring_intersection_with_duplicates_test.cu b/cpp/tests/spatial/intersection/linestring_intersection_with_duplicates_test.cu similarity index 99% rename from cpp/tests/experimental/spatial/linestring_intersection_with_duplicates_test.cu rename to cpp/tests/spatial/intersection/linestring_intersection_with_duplicates_test.cu index f2fa6f1e5..f01f6b5e1 100644 --- a/cpp/tests/experimental/spatial/linestring_intersection_with_duplicates_test.cu +++ b/cpp/tests/spatial/intersection/linestring_intersection_with_duplicates_test.cu @@ -19,11 +19,11 @@ #include #include +#include #include -#include -#include +#include +#include #include -#include #include #include diff --git a/cpp/tests/spatial/linestring_polygon_distance_test.cpp b/cpp/tests/spatial/linestring_polygon_distance_test.cpp index 89b6c0fe4..8bffe1d94 100644 --- a/cpp/tests/spatial/linestring_polygon_distance_test.cpp +++ b/cpp/tests/spatial/linestring_polygon_distance_test.cpp @@ -20,8 +20,8 @@ #include #include #include +#include #include -#include #include #include diff --git a/cpp/tests/spatial/point_linestring_nearest_points_test.cpp b/cpp/tests/spatial/nearest_points/point_linestring_nearest_points_test.cpp similarity index 99% rename from cpp/tests/spatial/point_linestring_nearest_points_test.cpp rename to cpp/tests/spatial/nearest_points/point_linestring_nearest_points_test.cpp index 3be28e671..6743db576 100644 --- a/cpp/tests/spatial/point_linestring_nearest_points_test.cpp +++ b/cpp/tests/spatial/nearest_points/point_linestring_nearest_points_test.cpp @@ -15,8 +15,8 @@ */ #include +#include #include -#include #include #include diff --git a/cpp/tests/experimental/spatial/point_linestring_nearest_points_test.cu b/cpp/tests/spatial/nearest_points/point_linestring_nearest_points_test.cu similarity index 99% rename from cpp/tests/experimental/spatial/point_linestring_nearest_points_test.cu rename to cpp/tests/spatial/nearest_points/point_linestring_nearest_points_test.cu index 5163a3287..42b0a552a 100644 --- a/cpp/tests/experimental/spatial/point_linestring_nearest_points_test.cu +++ b/cpp/tests/spatial/nearest_points/point_linestring_nearest_points_test.cu @@ -18,9 +18,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/cpp/tests/spatial/pairwise_point_in_polygon_test.cpp b/cpp/tests/spatial/point_in_polygon/pairwise_point_in_polygon_test.cpp similarity index 100% rename from cpp/tests/spatial/pairwise_point_in_polygon_test.cpp rename to cpp/tests/spatial/point_in_polygon/pairwise_point_in_polygon_test.cpp diff --git a/cpp/tests/experimental/spatial/pairwise_point_in_polygon_test.cu b/cpp/tests/spatial/point_in_polygon/pairwise_point_in_polygon_test.cu similarity index 99% rename from cpp/tests/experimental/spatial/pairwise_point_in_polygon_test.cu rename to cpp/tests/spatial/point_in_polygon/pairwise_point_in_polygon_test.cu index 3a807ccfa..13ae6a456 100644 --- a/cpp/tests/experimental/spatial/pairwise_point_in_polygon_test.cu +++ b/cpp/tests/spatial/point_in_polygon/pairwise_point_in_polygon_test.cu @@ -15,9 +15,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/tests/spatial/point_in_polygon_test.cpp b/cpp/tests/spatial/point_in_polygon/point_in_polygon_test.cpp similarity index 100% rename from cpp/tests/spatial/point_in_polygon_test.cpp rename to cpp/tests/spatial/point_in_polygon/point_in_polygon_test.cpp diff --git a/cpp/tests/experimental/spatial/point_in_polygon_test.cu b/cpp/tests/spatial/point_in_polygon/point_in_polygon_test.cu similarity index 99% rename from cpp/tests/experimental/spatial/point_in_polygon_test.cu rename to cpp/tests/spatial/point_in_polygon/point_in_polygon_test.cu index 3777495df..cd85f11f6 100644 --- a/cpp/tests/experimental/spatial/point_in_polygon_test.cu +++ b/cpp/tests/spatial/point_in_polygon/point_in_polygon_test.cu @@ -15,9 +15,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include diff --git a/cpp/tests/experimental/spatial/points_in_range_test.cu b/cpp/tests/spatial/points_in_range/points_in_range_test.cu similarity index 98% rename from cpp/tests/experimental/spatial/points_in_range_test.cu rename to cpp/tests/spatial/points_in_range/points_in_range_test.cu index e276d5d3c..ca638fbdc 100644 --- a/cpp/tests/experimental/spatial/points_in_range_test.cu +++ b/cpp/tests/spatial/points_in_range/points_in_range_test.cu @@ -17,8 +17,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/cpp/tests/spatial_window/spatial_window_test.cpp b/cpp/tests/spatial/points_in_range/spatial_window_test.cpp similarity index 100% rename from cpp/tests/spatial_window/spatial_window_test.cpp rename to cpp/tests/spatial/points_in_range/spatial_window_test.cpp diff --git a/cpp/tests/experimental/trajectory/derive_trajectories_test.cu b/cpp/tests/trajectory/derive_trajectories_test.cu similarity index 98% rename from cpp/tests/experimental/trajectory/derive_trajectories_test.cu rename to cpp/tests/trajectory/derive_trajectories_test.cu index f81656e2c..a52b8e6c7 100644 --- a/cpp/tests/experimental/trajectory/derive_trajectories_test.cu +++ b/cpp/tests/trajectory/derive_trajectories_test.cu @@ -17,9 +17,9 @@ #include "cuspatial_test/vector_equality.hpp" #include "trajectory_test_utils.cuh" +#include #include -#include -#include +#include #include #include diff --git a/cpp/tests/experimental/trajectory/trajectory_distances_and_speeds_test.cu b/cpp/tests/trajectory/trajectory_distances_and_speeds_test.cu similarity index 98% rename from cpp/tests/experimental/trajectory/trajectory_distances_and_speeds_test.cu rename to cpp/tests/trajectory/trajectory_distances_and_speeds_test.cu index aa91751a6..f7fd2eddd 100644 --- a/cpp/tests/experimental/trajectory/trajectory_distances_and_speeds_test.cu +++ b/cpp/tests/trajectory/trajectory_distances_and_speeds_test.cu @@ -20,9 +20,9 @@ #include #include -#include +#include #include -#include +#include #include diff --git a/cpp/tests/experimental/trajectory/trajectory_test_utils.cuh b/cpp/tests/trajectory/trajectory_test_utils.cuh similarity index 99% rename from cpp/tests/experimental/trajectory/trajectory_test_utils.cuh rename to cpp/tests/trajectory/trajectory_test_utils.cuh index b7e503d0a..94112cdbe 100644 --- a/cpp/tests/experimental/trajectory/trajectory_test_utils.cuh +++ b/cpp/tests/trajectory/trajectory_test_utils.cuh @@ -17,8 +17,8 @@ #pragma once -#include -#include +#include +#include #include diff --git a/cpp/tests/utility_test/test_geometry_generators.cu b/cpp/tests/utility_test/test_geometry_generators.cu index 5ecaab106..d0b35e9e4 100644 --- a/cpp/tests/utility_test/test_geometry_generators.cu +++ b/cpp/tests/utility_test/test_geometry_generators.cu @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include