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.

Sign up for GitHub

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

Jump to bottom

Update cuspatial to use pylibcudf #1440

Merged
merged 5 commits into from
Aug 19, 2024
Merged

Update cuspatial to use pylibcudf #1440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd8538e
Update cuspatial to use pylibcudf
vyasr Aug 16, 2024
045aca9
Make pylibcudf dependency explicit since cuspatial cimports it directly
vyasr Aug 17, 2024
2dd6092
Update update-version.sh
vyasr Aug 17, 2024
3de4049
Add pylibcudf to conda recipe
vyasr Aug 17, 2024
35583c1
Remove unused cimport
vyasr Aug 17, 2024
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
1 change: 1 addition & 0 deletions ci/release/update-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ done
sed_runner "s/RAPIDS_VERSION_NUMBER=\".*/RAPIDS_VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh

DEPENDENCIES=(
pylibcudf
cudf
cuml
cuspatial
Expand Down
1 change: 1 addition & 0 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ dependencies:
- proj
- pydata-sphinx-theme!=0.14.2
- pydeck
- pylibcudf==24.10.*,>=0.0.0a0
- pytest
- pytest-cov
- pytest-xdist
Expand Down
1 change: 1 addition & 0 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ dependencies:
- proj
- pydata-sphinx-theme!=0.14.2
- pydeck
- pylibcudf==24.10.*,>=0.0.0a0
- pytest
- pytest-cov
- pytest-xdist
Expand Down
2 changes: 2 additions & 0 deletions conda/recipes/cuspatial/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ requirements:
{% endif %}
- cuda-version ={{ cuda_version }}
- cudf ={{ minor_version }}
- pylibcudf ={{ minor_version }}
- cython >=3.0.0
- libcuspatial ={{ version }}
- python
Expand All @@ -74,6 +75,7 @@ requirements:
{% endif %}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- cudf ={{ minor_version }}
- pylibcudf ={{ minor_version }}
- geopandas >=0.11.0
- numpy >=1.23,<2.0a0
- python
Expand Down
3 changes: 3 additions & 0 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@ dependencies:
- output_types: conda
packages:
- &cudf_unsuffixed cudf==24.10.*,>=0.0.0a0
- &pylibcudf_unsuffixed pylibcudf==24.10.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
Expand All @@ -437,11 +438,13 @@ dependencies:
cuda_suffixed: "true"
packages:
- cudf-cu12==24.10.*,>=0.0.0a0
- pylibcudf-cu12==24.10.*,>=0.0.0a0
- matrix:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- cudf-cu11==24.10.*,>=0.0.0a0
- pylibcudf-cu11==24.10.*,>=0.0.0a0
- {matrix: null, packages: [*cudf_unsuffixed]}

depends_on_cuml:
Expand Down
2 changes: 1 addition & 1 deletion python/cuproj/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ force_grid_wrap = 0
combine_as_imports = true
order_by_type = true
known_dask = ["dask", "distributed", "dask_cuda"]
known_rapids = ["rmm", "cudf"]
known_rapids = ["rmm", "cudf", "pylibcudf"]
known_first_party = ["cuspatial", "cuproj"]
default_section = "THIRDPARTY"
sections = [
Expand Down
5 changes: 3 additions & 2 deletions python/cuspatial/cuspatial/_lib/cpp/column/geometry_column_view.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Copyright (c) 2023, NVIDIA CORPORATION.
# Copyright (c) 2023-2024, NVIDIA CORPORATION.

from libcpp.memory cimport unique_ptr

from cudf._lib.column cimport column, column_view
from pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column_view cimport column_view

from cuspatial._lib.cpp.types cimport collection_type_id, geometry_type_id

Expand Down
6 changes: 3 additions & 3 deletions python/cuspatial/cuspatial/_lib/cpp/distance.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
from libcpp.memory cimport unique_ptr
from libcpp.utility cimport pair

from cudf._lib.pylibcudf.libcudf.column.column cimport column
from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view
from cudf._lib.pylibcudf.libcudf.table.table_view cimport table_view
from pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column_view cimport column_view
from pylibcudf.libcudf.table.table_view cimport table_view

from cuspatial._lib.cpp.column.geometry_column_view cimport (
geometry_column_view,
Expand Down
2 changes: 1 addition & 1 deletion python/cuspatial/cuspatial/_lib/cpp/distance/polygon_distance.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from libcpp.memory cimport unique_ptr

from cudf._lib.pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column cimport column

from cuspatial._lib.cpp.column.geometry_column_view cimport (
geometry_column_view,
Expand Down
4 changes: 2 additions & 2 deletions python/cuspatial/cuspatial/_lib/cpp/linestring_bounding_boxes.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

from libcpp.memory cimport unique_ptr

from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view
from cudf._lib.pylibcudf.libcudf.table.table cimport table
from pylibcudf.libcudf.column.column_view cimport column_view
from pylibcudf.libcudf.table.table cimport table


cdef extern from "cuspatial/bounding_boxes.hpp" \
Expand Down
5 changes: 3 additions & 2 deletions python/cuspatial/cuspatial/_lib/cpp/linestring_intersection.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Copyright (c) 2023, NVIDIA CORPORATION.
# Copyright (c) 2023-2024, NVIDIA CORPORATION.

from libcpp.memory cimport unique_ptr

from cudf._lib.column cimport column, column_view
from pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column_view cimport column_view

from cuspatial._lib.cpp.column.geometry_column_view cimport (
geometry_column_view,
Expand Down
5 changes: 3 additions & 2 deletions python/cuspatial/cuspatial/_lib/cpp/nearest_points.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Copyright (c) 2022-2023, NVIDIA CORPORATION.
# Copyright (c) 2022-2024, NVIDIA CORPORATION.

from libcpp.memory cimport unique_ptr

from cudf._lib.column cimport column, column_view
from pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column_view cimport column_view

from cuspatial._lib.cpp.optional cimport optional

Expand Down
5 changes: 3 additions & 2 deletions python/cuspatial/cuspatial/_lib/cpp/pairwise_multipoint_equals_count.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Copyright (c) 2023, NVIDIA CORPORATION.
# Copyright (c) 2023-2024, NVIDIA CORPORATION.

from libcpp.memory cimport unique_ptr

from cudf._lib.column cimport column, column_view
from pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column_view cimport column_view

from cuspatial._lib.cpp.column.geometry_column_view cimport (
geometry_column_view,
Expand Down
5 changes: 3 additions & 2 deletions python/cuspatial/cuspatial/_lib/cpp/pairwise_point_in_polygon.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Copyright (c) 2022-2023, NVIDIA CORPORATION.
# Copyright (c) 2022-2024, NVIDIA CORPORATION.

from libcpp.memory cimport unique_ptr

from cudf._lib.column cimport column, column_view
from pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column_view cimport column_view


cdef extern from "cuspatial/point_in_polygon.hpp" \
Expand Down
5 changes: 3 additions & 2 deletions python/cuspatial/cuspatial/_lib/cpp/point_in_polygon.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Copyright (c) 2020, NVIDIA CORPORATION.
# Copyright (c) 2020-2024, NVIDIA CORPORATION.

from libcpp.memory cimport unique_ptr

from cudf._lib.column cimport column, column_view
from pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column_view cimport column_view


cdef extern from "cuspatial/point_in_polygon.hpp" namespace "cuspatial" nogil:
Expand Down
6 changes: 4 additions & 2 deletions python/cuspatial/cuspatial/_lib/cpp/points_in_range.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

from libcpp.memory cimport unique_ptr

from cudf._lib.column cimport column, column_view
from cudf._lib.pylibcudf.libcudf.table.table cimport table, table_view
from pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column_view cimport column_view
from pylibcudf.libcudf.table.table cimport table
from pylibcudf.libcudf.table.table_view cimport table_view


cdef extern from "cuspatial/points_in_range.hpp" namespace "cuspatial" nogil:
Expand Down
4 changes: 2 additions & 2 deletions python/cuspatial/cuspatial/_lib/cpp/polygon_bounding_boxes.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

from libcpp.memory cimport unique_ptr

from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view
from cudf._lib.pylibcudf.libcudf.table.table cimport table
from pylibcudf.libcudf.column.column_view cimport column_view
from pylibcudf.libcudf.table.table cimport table


cdef extern from "cuspatial/bounding_boxes.hpp" \
Expand Down
4 changes: 2 additions & 2 deletions python/cuspatial/cuspatial/_lib/cpp/projection.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
from libcpp.memory cimport unique_ptr
from libcpp.pair cimport pair

from cudf._lib.pylibcudf.libcudf.column.column cimport column
from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view
from pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column_view cimport column_view


cdef extern from "cuspatial/projection.hpp" namespace "cuspatial" \
Expand Down
8 changes: 4 additions & 4 deletions python/cuspatial/cuspatial/_lib/cpp/quadtree.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ from libc.stdint cimport int8_t
from libcpp.memory cimport unique_ptr
from libcpp.pair cimport pair

from cudf._lib.pylibcudf.libcudf.column.column cimport column
from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view
from cudf._lib.pylibcudf.libcudf.table.table cimport table
from cudf._lib.pylibcudf.libcudf.types cimport size_type
from pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column_view cimport column_view
from pylibcudf.libcudf.table.table cimport table
from pylibcudf.libcudf.types cimport size_type


cdef extern from "cuspatial/point_quadtree.hpp" namespace "cuspatial" nogil:
Expand Down
5 changes: 3 additions & 2 deletions python/cuspatial/cuspatial/_lib/cpp/spatial_join.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
from libc.stdint cimport int8_t
from libcpp.memory cimport unique_ptr

from cudf._lib.column cimport column_view
from cudf._lib.pylibcudf.libcudf.table.table cimport table, table_view
from pylibcudf.libcudf.column.column_view cimport column_view
from pylibcudf.libcudf.table.table cimport table
from pylibcudf.libcudf.table.table_view cimport table_view


cdef extern from "cuspatial/spatial_join.hpp" namespace "cuspatial" nogil:
Expand Down
8 changes: 4 additions & 4 deletions python/cuspatial/cuspatial/_lib/cpp/trajectory.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
from libcpp.memory cimport unique_ptr
from libcpp.pair cimport pair

from cudf._lib.pylibcudf.libcudf.column.column cimport column
from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view
from cudf._lib.pylibcudf.libcudf.table.table cimport table
from cudf._lib.pylibcudf.libcudf.types cimport size_type
from pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column_view cimport column_view
from pylibcudf.libcudf.table.table cimport table
from pylibcudf.libcudf.types cimport size_type


cdef extern from "cuspatial/trajectory.hpp" namespace "cuspatial" nogil:
Expand Down
6 changes: 3 additions & 3 deletions python/cuspatial/cuspatial/_lib/distance.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ from libcpp.memory cimport make_shared, shared_ptr, unique_ptr
from libcpp.utility cimport move, pair

from cudf._lib.column cimport Column
from cudf._lib.pylibcudf.libcudf.column.column cimport column
from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view
from cudf._lib.pylibcudf.libcudf.table.table_view cimport table_view
from cudf._lib.utils cimport columns_from_table_view
from pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column_view cimport column_view
from pylibcudf.libcudf.table.table_view cimport table_view

from cuspatial._lib.cpp.column.geometry_column_view cimport (
geometry_column_view,
Expand Down
4 changes: 2 additions & 2 deletions python/cuspatial/cuspatial/_lib/linestring_bounding_boxes.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ from libcpp.memory cimport unique_ptr
from libcpp.utility cimport move

from cudf._lib.column cimport Column
from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view
from cudf._lib.pylibcudf.libcudf.table.table cimport table
from cudf._lib.utils cimport columns_from_unique_ptr
from pylibcudf.libcudf.column.column_view cimport column_view
from pylibcudf.libcudf.table.table cimport table

from cuspatial._lib.cpp.linestring_bounding_boxes cimport (
linestring_bounding_boxes as cpp_linestring_bounding_boxes,
Expand Down
2 changes: 1 addition & 1 deletion python/cuspatial/cuspatial/_lib/nearest_points.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from libcpp.utility cimport move

from cudf._lib.column cimport Column
from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view
from pylibcudf.libcudf.column.column_view cimport column_view

from cuspatial._lib.cpp.nearest_points cimport (
pairwise_point_linestring_nearest_points as c_func,
Expand Down
5 changes: 3 additions & 2 deletions python/cuspatial/cuspatial/_lib/pairwise_multipoint_equals_count.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Copyright (c) 2023, NVIDIA CORPORATION.
# Copyright (c) 2023-2024, NVIDIA CORPORATION.

from libcpp.memory cimport make_shared, shared_ptr, unique_ptr
from libcpp.utility cimport move

from cudf._lib.column cimport Column, column
from cudf._lib.column cimport Column
from pylibcudf.libcudf.column.column cimport column

from cuspatial._lib.cpp.column.geometry_column_view cimport (
geometry_column_view,
Expand Down
6 changes: 4 additions & 2 deletions python/cuspatial/cuspatial/_lib/pairwise_point_in_polygon.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# Copyright (c) 2022, NVIDIA CORPORATION.
# Copyright (c) 2022-2024, NVIDIA CORPORATION.

from libcpp.memory cimport unique_ptr
from libcpp.utility cimport move

from cudf._lib.column cimport Column, column, column_view
from cudf._lib.column cimport Column
from pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column_view cimport column_view

from cuspatial._lib.cpp.pairwise_point_in_polygon cimport (
pairwise_point_in_polygon as cpp_pairwise_point_in_polygon,
Expand Down
6 changes: 4 additions & 2 deletions python/cuspatial/cuspatial/_lib/point_in_polygon.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# Copyright (c) 2020, NVIDIA CORPORATION.
# Copyright (c) 2020-2024, NVIDIA CORPORATION.

from libcpp.memory cimport unique_ptr
from libcpp.utility cimport move

from cudf._lib.column cimport Column, column, column_view
from cudf._lib.column cimport Column
from pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column_view cimport column_view

from cuspatial._lib.cpp.point_in_polygon cimport (
point_in_polygon as cpp_point_in_polygon,
Expand Down
5 changes: 3 additions & 2 deletions python/cuspatial/cuspatial/_lib/points_in_range.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
from libcpp.memory cimport unique_ptr
from libcpp.utility cimport move

from cudf._lib.column cimport Column, column_view
from cudf._lib.pylibcudf.libcudf.table.table cimport table
from cudf._lib.column cimport Column
from cudf._lib.utils cimport data_from_unique_ptr
from pylibcudf.libcudf.column.column_view cimport column_view
from pylibcudf.libcudf.table.table cimport table

from cuspatial._lib.cpp.points_in_range cimport (
points_in_range as cpp_points_in_range,
Expand Down
4 changes: 2 additions & 2 deletions python/cuspatial/cuspatial/_lib/polygon_bounding_boxes.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ from libcpp.memory cimport unique_ptr
from libcpp.utility cimport move

from cudf._lib.column cimport Column
from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view
from cudf._lib.pylibcudf.libcudf.table.table cimport table
from cudf._lib.utils cimport columns_from_unique_ptr
from pylibcudf.libcudf.column.column_view cimport column_view
from pylibcudf.libcudf.table.table cimport table

from cuspatial._lib.cpp.polygon_bounding_boxes cimport (
polygon_bounding_boxes as cpp_polygon_bounding_boxes,
Expand Down
8 changes: 4 additions & 4 deletions python/cuspatial/cuspatial/_lib/quadtree.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ from libcpp.pair cimport pair
from libcpp.utility cimport move

from cudf._lib.column cimport Column
from cudf._lib.pylibcudf.libcudf.column.column cimport column
from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view
from cudf._lib.pylibcudf.libcudf.table.table cimport table
from cudf._lib.pylibcudf.libcudf.types cimport size_type
from cudf._lib.utils cimport data_from_unique_ptr
from pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column_view cimport column_view
from pylibcudf.libcudf.table.table cimport table
from pylibcudf.libcudf.types cimport size_type

from cuspatial._lib.cpp.quadtree cimport (
quadtree_on_points as cpp_quadtree_on_points,
Expand Down
4 changes: 2 additions & 2 deletions python/cuspatial/cuspatial/_lib/spatial.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ from libcpp.pair cimport pair
from libcpp.utility cimport move

from cudf._lib.column cimport Column
from cudf._lib.pylibcudf.libcudf.column.column cimport column
from cudf._lib.pylibcudf.libcudf.column.column_view cimport column_view
from pylibcudf.libcudf.column.column cimport column
from pylibcudf.libcudf.column.column_view cimport column_view

from cuspatial._lib.cpp.projection cimport (
sinusoidal_projection as cpp_sinusoidal_projection,
Expand Down
5 changes: 3 additions & 2 deletions python/cuspatial/cuspatial/_lib/spatial_join.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ from libc.stdint cimport int8_t
from libcpp.memory cimport unique_ptr
from libcpp.utility cimport move

from cudf._lib.column cimport Column, column_view
from cudf._lib.pylibcudf.libcudf.table.table cimport table, table_view
from cudf._lib.column cimport Column
from cudf._lib.utils cimport data_from_unique_ptr, table_view_from_table
from pylibcudf.libcudf.column.column_view cimport column_view
from pylibcudf.libcudf.table.table cimport table, table_view

from cuspatial._lib.cpp.spatial_join cimport (
join_quadtree_and_bounding_boxes as cpp_join_quadtree_and_bounding_boxes,
Expand Down
Loading
Loading