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

Replace cudf.core imports with public APIs #1356

Merged
merged 2 commits into from
Mar 6, 2024
Merged

Replace cudf.core imports with public APIs #1356

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50c5f41
Use public cudf APIs where possible
mroeschke Mar 6, 2024
97b9cca
Remove typing checking guard
mroeschke Mar 6, 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
8 changes: 3 additions & 5 deletions python/cuspatial/cuspatial/core/binpreds/contains_geometry_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import cupy as cp

import cudf
from cudf.core.dataframe import DataFrame
from cudf.core.series import Series

from cuspatial.core._column.geocolumn import GeoColumn
from cuspatial.core.binpreds.binpred_interface import (
Expand Down Expand Up @@ -117,7 +115,7 @@ def _convert_quadtree_result_from_part_to_polygon_indices(
["polygon_index", "point_index"]
]

def _reindex_allpairs(self, lhs, op_result) -> DataFrame:
def _reindex_allpairs(self, lhs, op_result) -> cudf.DataFrame:
"""Prepare the allpairs result of a contains_properly call as
the first step of postprocessing. An allpairs result is reindexed
by replacing the polygon index with the original index of the
Expand Down Expand Up @@ -154,7 +152,7 @@ def _reindex_allpairs(self, lhs, op_result) -> DataFrame:
# Replace the polygon index with the original index
allpairs_result["polygon_index"] = allpairs_result[
"polygon_index"
].replace(Series(lhs.index, index=cp.arange(len(lhs.index))))
].replace(cudf.Series(lhs.index, index=cp.arange(len(lhs.index))))

return allpairs_result

Expand Down Expand Up @@ -202,7 +200,7 @@ def _postprocess_multipoint_rhs(

point_indices = preprocessor_result.point_indices
allpairs_result = self._reindex_allpairs(lhs, op_result)
if isinstance(allpairs_result, Series):
if isinstance(allpairs_result, cudf.Series):
return allpairs_result
# Hits is the number of calculated points in each polygon
# Expected count is the sizes of the features in the right-hand
Expand Down
Loading