Skip to content

Commit

Permalink
Remove unused shuffle_order in GeoColumn (#1439)
Browse files Browse the repository at this point in the history
With rapidsai/cudf#16549, `cudf.Index` no longer accepts `Column` objects.

The only usage I found was that `GeoColumn` accepted `shuffle_order=cudf.Index(column)`, but `shuffle_order` appears unused (anymore?) in `GeoColumn`, so I went ahead and removed this from the constructor

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

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: #1439
  • Loading branch information
mroeschke committed Aug 15, 2024
1 parent 82f321b commit 5842315
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
8 changes: 4 additions & 4 deletions python/cuspatial/cuspatial/core/_column/geocolumn.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Copyright (c) 2021-2024, NVIDIA CORPORATION
from __future__ import annotations

from enum import Enum
from functools import cached_property
from typing import Tuple, TypeVar
from typing import TypeVar

import cupy as cp
import pyarrow as pa
Expand Down Expand Up @@ -41,9 +42,8 @@ class GeoColumn(ColumnBase):

def __init__(
self,
data: Tuple,
data: tuple[cudf.Series, cudf.Series, cudf.Series, cudf.Series],
meta: GeoMeta = None,
shuffle_order: cudf.Index = None,
):
if (
isinstance(data[0], cudf.Series)
Expand All @@ -61,7 +61,7 @@ def __init__(
self.polygons = data[3]
self.polygons.name = "polygons"
else:
raise TypeError("All four Tuple arguments must be cudf.ListSeries")
raise TypeError("All four Tuple arguments must be cudf.Series")
super().__init__(None, size=len(self), dtype="geometry")

def to_arrow(self):
Expand Down
1 change: 0 additions & 1 deletion python/cuspatial/cuspatial/core/geodataframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ def _copy_type_metadata(
other_col.polygons,
),
other_col._meta,
cudf.Index(col),
)
type_copied._data.set_by_label(name, col, validate=False)

Expand Down

0 comments on commit 5842315

Please sign in to comment.