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.

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

Allow where() to work with a Series and other=cudf.NA #9019

Merged
merged 1 commit into from
Aug 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 12 additions & 4 deletions python/cudf/cudf/core/_internals/where.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ def _normalize_scalars(col: ColumnBase, other: ScalarLike) -> ScalarLike:
f"{type(other).__name__} to {col.dtype.name}"
)

return cudf.Scalar(other, dtype=col.dtype if other is None else None)
return cudf.Scalar(
other, dtype=col.dtype if other in {None, cudf.NA} else None
)


def _check_and_cast_columns_with_other(
Expand Down Expand Up @@ -234,9 +236,15 @@ def where(

if isinstance(frame, DataFrame):
if hasattr(cond, "__cuda_array_interface__"):
cond = DataFrame(
cond, columns=frame._column_names, index=frame.index
)
if isinstance(cond, Series):
cond = DataFrame(
{name: cond for name in frame._column_names},
index=frame.index,
)
else:
cond = DataFrame(
cond, columns=frame._column_names, index=frame.index
)
elif (
hasattr(cond, "__array_interface__")
and cond.__array_interface__["shape"] != frame.shape
Expand Down
20 changes: 20 additions & 0 deletions python/cudf/cudf/tests/test_dataframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -8731,3 +8731,23 @@ def test_frame_series_where():
expected = gdf.where(gdf.notna(), gdf.mean())
actual = pdf.where(pdf.notna(), pdf.mean(), axis=1)
assert_eq(expected, actual)


@pytest.mark.parametrize(
"data", [{"a": [1, 2, 3], "b": [1, 1, 0]}],
)
def test_frame_series_where_other(data):
gdf = cudf.DataFrame(data)
pdf = gdf.to_pandas()

expected = gdf.where(gdf["b"] == 1, cudf.NA)
actual = pdf.where(pdf["b"] == 1, pd.NA)
assert_eq(
actual.fillna(-1).values,
expected.fillna(-1).values,
check_dtype=False,
)

expected = gdf.where(gdf["b"] == 1, 0)
actual = pdf.where(pdf["b"] == 1, 0)
assert_eq(expected, actual)
2 changes: 2 additions & 0 deletions python/cudf/cudf/utils/dtypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,8 @@ def _can_cast(from_dtype, to_dtype):
`np.can_cast` but with some special handling around
cudf specific dtypes.
"""
if from_dtype in {None, cudf.NA}:
return True
if isinstance(from_dtype, type):
from_dtype = np.dtype(from_dtype)
if isinstance(to_dtype, type):
Expand Down