Skip to content

Commit

Permalink
Replace cudf.core imports with public APIs (#1356)
Browse files Browse the repository at this point in the history
This PR replaces `cudf.core` imports of `Series` and `DataFrame` with their public API equivalents.

Authors:
  - Matthew Roeschke (https://github.com/mroeschke)

Approvers:
  - Mark Harris (https://github.com/harrism)
  - Michael Wang (https://github.com/isVoid)
  - Bradley Dice (https://github.com/bdice)

URL: #1356
  • Loading branch information
mroeschke authored Mar 6, 2024
1 parent b08f4f7 commit 47a7961
Showing 1 changed file with 3 additions and 5 deletions.
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

0 comments on commit 47a7961

Please sign in to comment.