Remove cubic spline interpolation (#959)

Closes #957. Authors: - Mark Harris (https://github.com/harrism) Approvers: - Michael Wang (https://github.com/isVoid) - H. Thomson Comer (https://github.com/thomcom) - Ray Douglass (https://github.com/raydouglass) URL: #959
rapidsai · Feb 28, 2023 · b8b3534 · b8b3534
1 parent 8fbb208
commit b8b3534
Show file tree

Hide file tree

Showing 20 changed files with 1 addition and 1,606 deletions.
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/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

diff --git a/conda/recipes/libcuspatial/conda_build_config.yaml b/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"
diff --git a/conda/recipes/libcuspatial/meta.yaml b/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:

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -111,7 +111,6 @@ include(cmake/thirdparty/CUSPATIAL_GetCUDF.cmake)
 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
@@ -188,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)
 

diff --git a/cpp/include/cuspatial/cubic_spline.hpp b/cpp/include/cuspatial/cubic_spline.hpp
diff --git a/cpp/include/cuspatial/cusparse_error.hpp b/cpp/include/cuspatial/cusparse_error.hpp
diff --git a/cpp/include/cuspatial/detail/cubic_spline.hpp b/cpp/include/cuspatial/detail/cubic_spline.hpp
diff --git a/cpp/include/doxygen_groups.h b/cpp/include/doxygen_groups.h
@@ -77,11 +77,6 @@
  *          @file point_linestring_nearest_points.hpp
  *          @file point_linestring_nearest_points.cuh
  *      @}
- *      @defgroup cubic_spline Cubic Spline
- *      @{
- *          @brief APIs related to cubic splines
- *          @file cubic_spline.hpp
- *      @}
  * @}
  * @defgroup trajectory_api Trajectory APIs
  * @{