Merge branch 'branch-23.04' into notebook/zipcode_counting

.github/CODEOWNERS

@@ -11,7 +11,5 @@ python/            @rapidsai/cuspatial-python-codeowners
 # build/ops code owners
 .github/           @rapidsai/ops-codeowners
 ci/                @rapidsai/ops-codeowners
-conda/             @rapidsai/ops-codeowners
-**/Dockerfile      @rapidsai/ops-codeowners
-**/.dockerignore   @rapidsai/ops-codeowners
+/conda/            @rapidsai/ops-codeowners
 dependencies.yaml  @rapidsai/ops-codeowners

ci/build_docs.sh

@@ -40,7 +40,8 @@ popd
 
 
 if [[ ${RAPIDS_BUILD_TYPE} == "branch" ]]; then
-  aws s3 sync --delete docs/_html "s3://rapidsai-docs/cuspatial/${VERSION_NUMBER}/html"
-  aws s3 sync --delete docs/_text "s3://rapidsai-docs/cuspatial/${VERSION_NUMBER}/txt"
-  aws s3 sync --delete cpp/doxygen/html "s3://rapidsai-docs/libcuspatial/${VERSION_NUMBER}/html"
+  rapids-logger "Upload Docs to S3"
+  aws s3 sync --no-progress --delete docs/_html "s3://rapidsai-docs/cuspatial/${VERSION_NUMBER}/html"
+  aws s3 sync --no-progress --delete docs/_text "s3://rapidsai-docs/cuspatial/${VERSION_NUMBER}/txt"
+  aws s3 sync --no-progress --delete cpp/doxygen/html "s3://rapidsai-docs/libcuspatial/${VERSION_NUMBER}/html"
 fi

conda/environments/all_cuda-118_arch-x86_64.yaml

@@ -20,8 +20,6 @@ dependencies:
 - gtest=1.10.0
 - ipython
 - libcudf=23.04
-- libcusparse-dev=11.7.5.86
-- libcusparse=11.7.5.86
 - librmm=23.04
 - myst-parser
 - nbsphinx

conda/recipes/libcuspatial/conda_build_config.yaml

@@ -18,13 +18,3 @@ gtest_version:
 
 sysroot_version:
   - "2.17"
-
-# The CTK libraries below are missing from the conda-forge::cudatoolkit
-# package. The "*_host_*" version specifiers correspond to `11.8` packages and the
-# "*_run_*" version specifiers correspond to `11.x` packages.
-
-libcusparse_host_version:
-  - "=11.7.5.86"
-
-libcusparse_run_version:
-  - ">=11.6.0.43,<12"

conda/recipes/libcuspatial/meta.yaml

@@ -42,8 +42,6 @@ requirements:
     - gmock {{ gtest_version }}
     - gtest {{ gtest_version }}
     - libcudf ={{ minor_version }}
-    - libcusparse {{ libcusparse_host_version }}
-    - libcusparse-dev {{ libcusparse_host_version }}
     - librmm ={{ minor_version }}
 
 outputs:
@@ -64,8 +62,6 @@ outputs:
       run:
         - cudatoolkit {{ cuda_spec }}
         - libcudf ={{ minor_version }}
-        - libcusparse {{ libcusparse_run_version }}
-        - libcusparse-dev {{ libcusparse_run_version }}
         - librmm ={{ minor_version }}
     test:
       commands:

cpp/CMakeLists.txt

@@ -1,5 +1,5 @@
 #=============================================================================
-# Copyright (c) 2019-2022, NVIDIA CORPORATION.
+# Copyright (c) 2019-2023, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -109,8 +109,8 @@ include(cmake/thirdparty/CUSPATIAL_GetCUDF.cmake)
 # - library targets -------------------------------------------------------------------------------
 
 add_library(cuspatial
+    src/column/geometry_column_view.cpp
     src/indexing/construction/point_quadtree.cu
-    src/interpolate/cubic_spline.cu
     src/join/quadtree_point_in_polygon.cu
     src/join/quadtree_point_to_nearest_linestring.cu
     src/join/quadtree_bbox_filtering.cu
@@ -122,6 +122,7 @@ add_library(cuspatial
     src/spatial/haversine.cu
     src/spatial/hausdorff.cu
     src/spatial/linestring_distance.cu
+    src/spatial/linestring_intersection.cu
     src/spatial/point_distance.cu
     src/spatial/point_linestring_distance.cu
     src/spatial/point_linestring_nearest_points.cu
@@ -186,7 +187,7 @@ endif()
 target_compile_definitions(cuspatial PUBLIC "SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_${RMM_LOGGING_LEVEL}")
 
 # Specify the target module library dependencies
-target_link_libraries(cuspatial PUBLIC cudf::cudf CUDA::cusparse${_ctk_static_suffix})
+target_link_libraries(cuspatial PUBLIC cudf::cudf)
 
 add_library(cuspatial::cuspatial ALIAS cuspatial)
 

cpp/include/cuspatial/column/geometry_column_view.hpp

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2023, NVIDIA CORPORATION.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <cuspatial/experimental/ranges/range.cuh>
+#include <cuspatial/types.hpp>
+
+#include <cudf/lists/lists_column_view.hpp>
+#include <cudf/types.hpp>
+
+namespace cuspatial {
+
+/**
+ * @ingroup cuspatial_types
+ * @brief A non-owning, immutable view of a geometry column.
+ *
+ * A geometry column is GeoArrow compliant, except that the data type for
+ * the coordinates is List<T>, instead of FixedSizeList<T>[n_dim]. This is
+ * because libcudf does not support FixedSizeList type. Currently, an
+ * even sequence (0, 2, 4, ...) is used for the offsets of the coordinate
+ * column.
+ */
+class geometry_column_view : private cudf::lists_column_view {
+ public:
+  geometry_column_view(cudf::column_view const& column,
+                       collection_type_id collection_type,
+                       geometry_type_id geometry_type);
+  geometry_column_view(geometry_column_view&&)      = default;
+  geometry_column_view(const geometry_column_view&) = default;
+  ~geometry_column_view()                           = default;
+
+  geometry_column_view& operator=(geometry_column_view const&) = default;
+
+  geometry_column_view& operator=(geometry_column_view&&) = default;
+
+  geometry_type_id geometry_type() const { return _geometry_type; }
+
+  collection_type_id collection_type() const { return _collection_type; }
+
+  cudf::data_type coordinate_type() const;
+
+  using cudf::lists_column_view::child;
+  using cudf::lists_column_view::offsets;
+  using cudf::lists_column_view::size;
+
+ protected:
+  collection_type_id _collection_type;
+  geometry_type_id _geometry_type;
+};
+
+}  // namespace cuspatial