Update GeoDataFrame to Use the Structured GatherMap Class #1219
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
geoseries also needs: diff --git a/python/cuspatial/cuspatial/core/geoseries.py b/python/cuspatial/cuspatial/core/geoseries.py
index 2a66ccec..37c75783 100644
--- a/python/cuspatial/cuspatial/core/geoseries.py
+++ b/python/cuspatial/cuspatial/core/geoseries.py
@@ -22,6 +22,7 @@ from shapely.geometry import (
import cudf
from cudf._typing import ColumnLike
from cudf.core.column.column import as_column
+from cudf.core.copy_types import GatherMap
import cuspatial.io.pygeoarrow as pygeoarrow
from cuspatial.core._column.geocolumn import ColumnType, GeoColumn
@@ -922,10 +923,10 @@ class GeoSeries(cudf.Series):
aligned_right,
)
- def _gather(
- self, gather_map, keep_index=True, nullify=False, check_bounds=True
- ):
- return self.iloc[gather_map]
+ def _gather(self, gather_map: GatherMap, keep_index=True):
+ # TODO: This could use the information to avoid reprocessing
+ # in iloc
+ return self.iloc[gather_map.column]
# def reset_index(self, drop=False, inplace=False, name=None):
def reset_index( |
wence-
suggested changes
Jul 17, 2023
Comment on lines
185
to
187
| def _apply_boolean_mask(self, gather_map: GatherMap) -> T: | ||
| geo_columns, data_columns = self._split_out_geometry_columns() | ||
| data = data_columns._apply_boolean_mask(mask) | ||
| data = data_columns._apply_boolean_mask(gather_map) |
There was a problem hiding this comment.
This one is not a GatherMap but a copy_types.BooleanMask.
There was a problem hiding this comment.
Note that cudf's _apply_boolean_mask now also accepts a keep_index keyword argument, so you probably want to handle that here (or at least accept it).
There was a problem hiding this comment.
cuspatial should really just try to avoid depending on cudf internals...
There was a problem hiding this comment.
I guess that is difficult if you're subclassing though :(
wence-
approved these changes
Jul 17, 2023
harrism
approved these changes
Jul 18, 2023
thomcom
approved these changes
Jul 18, 2023
|
/merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
As title, addresses upstream cudf change rapidsai/cudf#13534.
Fixes #1222
Checklist