Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove shapefile reader, conda GDAL dependency, move cmake gdal dependency to cpp tests only #932

Merged
merged 9 commits into from
Feb 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,7 @@ conda env update --file conda/environments/all_cuda-115_arch-x86_64.yaml
pre-generated polygon shapefiles that contain 0, 1 and 2 polygons, respectively. They are available at
`$CUSPATIAL_HOME/test_fixtures/shapefiles` <br>

**NOTE:** Currently, cuSpatial supports reading point/polyline/polygon data using
Structure of Array (SoA) format and a [shapefile reader](./cpp/src/io/shp)
to read polygon data from a shapefile.
Alternatively, python users can read any point/polyline/polygon data using
existing python packages, e.g., [Shapely](https://pypi.org/project/Shapely/)
and [Fiona](https://github.com/Toblerity/Fiona),to generate numpy arrays and feed them to
[cuSpatial Python APIs](https://docs.rapids.ai/api/cuspatial/stable/).
Python users can read any point/polyline/polygon data using existing Python
packages, e.g., [Shapely](https://pypi.org/project/Shapely/) and
[Fiona](https://github.com/Toblerity/Fiona), to generate numpy arrays and feed
them to [cuSpatial Python APIs](https://docs.rapids.ai/api/cuspatial/stable/).
3 changes: 0 additions & 3 deletions conda/recipes/cuspatial/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,3 @@ cuda_compiler:

sysroot_version:
- "2.17"

gdal_version:
- ">3.5.0,<3.6.0"
1 change: 0 additions & 1 deletion conda/recipes/cuspatial/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ requirements:
- setuptools
run:
- cudf ={{ minor_version }}
- gdal {{ gdal_version }}
- geopandas >=0.11.0
- python
- rmm ={{ minor_version }}
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/libcuspatial/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ outputs:
- ninja
run:
- cudatoolkit {{ cuda_spec }}
- gdal {{ gdal_version }}
- libcudf ={{ minor_version }}
- libcusparse {{ libcusparse_run_version }}
- libcusparse-dev {{ libcusparse_run_version }}
Expand Down Expand Up @@ -91,5 +90,6 @@ outputs:
run:
- {{ pin_subpackage('libcuspatial', exact=True) }}
- cudatoolkit {{ cuda_spec }}
- gdal {{ gdal_version }}
- gmock {{ gtest_version }}
- gtest {{ gtest_version }}
11 changes: 1 addition & 10 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,6 @@ include(cmake/Modules/ConfigureCUDA.cmake)
###################################################################################################
# - dependencies ----------------------------------------------------------------------------------

# find gdal
rapids_find_package(
GDAL REQUIRED
GLOBAL_TARGETS GDAL::GDAL
BUILD_EXPORT_SET cuspatial-exports
INSTALL_EXPORT_SET cuspatial-exports
)
# add third party dependencies using CPM
rapids_cpm_init()
# find or add cuDF
Expand All @@ -118,8 +111,6 @@ include(cmake/thirdparty/CUSPATIAL_GetCUDF.cmake)
add_library(cuspatial
src/indexing/construction/point_quadtree.cu
src/interpolate/cubic_spline.cu
src/io/shp/polygon_shapefile_reader.cpp
src/io/shp/polygon_shapefile_reader.cu
src/join/quadtree_point_in_polygon.cu
src/join/quadtree_point_to_nearest_linestring.cu
src/join/quadtree_bbox_filtering.cu
Expand Down Expand Up @@ -195,7 +186,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 GDAL::GDAL cudf::cudf CUDA::cusparse${_ctk_static_suffix})
target_link_libraries(cuspatial PUBLIC cudf::cudf CUDA::cusparse${_ctk_static_suffix})

add_library(cuspatial::cuspatial ALIAS cuspatial)

Expand Down
61 changes: 0 additions & 61 deletions cpp/include/cuspatial/shapefile_reader.hpp

This file was deleted.

5 changes: 0 additions & 5 deletions cpp/include/doxygen_groups.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,6 @@
* @file multipoint_range.cuh
* @file multilinestring_range.cuh
* @}
* @defgroup io I/O
* @{
* @brief APIs for spatial data I/O
* @file shapefile_reader.hpp
* @}
* @defgroup exception Exception
* @{
* @brief cuSpatial exception types
Expand Down
180 changes: 0 additions & 180 deletions cpp/src/io/shp/polygon_shapefile_reader.cpp

This file was deleted.

Loading