Skip to content
Merged
Show file tree
Hide file tree
Changes from 10 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
12 changes: 10 additions & 2 deletions python/cudf/cudf/core/column/interval.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@


class IntervalColumn(ColumnBase):
_VALID_BINARY_OPERATIONS = {
"__eq__",
"__ne__",
}

@functools.cached_property
def subtype(self) -> DtypeObj:
return subtype_from_interval_dtype(self.dtype)
Expand Down Expand Up @@ -161,15 +166,18 @@ def _binaryop(self, other: ColumnBinaryOperand, op: str) -> ColumnBase:
reflect, op = self._check_reflected_op(op)
if not isinstance(other, type(self)):
return NotImplemented
if op == "NULL_EQUALS":
if op in {"__eq__", "__ne__", "NULL_EQUALS", "NULL_NOT_EQUALS"}:
lefts_equal = self.left._binaryop(other.left, "NULL_EQUALS")
rights_equal = self.right._binaryop(other.right, "NULL_EQUALS")
return binaryop.binaryop(
result = binaryop.binaryop(
lefts_equal,
rights_equal,
"__and__",
get_dtype_of_same_kind(self.dtype, lefts_equal.dtype),
)
if op in {"__ne__", "NULL_NOT_EQUALS"}:
result = ~result
return result
Comment on lines +169 to +180

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Equality logic ignores interval closed semantics.

__eq__/__ne__ currently compare only endpoints, so intervals with identical bounds but different closed values can be misclassified as equal. Please include self.closed == other.closed in the equality predicate (or short-circuit unequal-closed before endpoint comparison), and add a regression test for comparing same breaks with different closed settings.

As per coding guidelines: "Validate algorithm correctness - detect logic errors producing wrong results, silent data corruption from type coercion, and incorrect null/NA handling (cuDF uses nullable dtypes throughout)".

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@python/cudf/cudf/core/column/interval.py` around lines 169 - 180, The
equality branch in the interval column binary op (method handling op values
"__eq__", "__ne__", "NULL_EQUALS", "NULL_NOT_EQUALS") currently compares only
endpoints (self.left/right vs other.left/right) and ignores the interval
`closed` attribute; update the logic in that branch (the block using
self.left._binaryop, self.right._binaryop, and binaryop.binaryop) to include a
`closed` equality check—either short-circuit to a False/NULL-equivalent when
self.closed != other.closed for equality ops, or incorporate a `closed_equal`
predicate and AND it with the existing endpoint-equality `result` (and invert
for "__ne__"/"NULL_NOT_EQUALS"); also add a regression test asserting intervals
with identical bounds but differing `closed` values are not equal.

else:
raise TypeError(f"{op} not supported with {type(other).__name__}")

Expand Down
2 changes: 1 addition & 1 deletion python/cudf/cudf/core/groupby/groupby.py
Original file line number Diff line number Diff line change
Expand Up @@ -1937,7 +1937,7 @@ def _grouped(self, *, include_groups: bool = True):
grouped_values = self.obj._from_columns_like_self(
grouped_value_cols,
column_names=self.obj._column_names,
index_names=self.obj._index_names, # type: ignore[arg-type]
index_names=self.obj.index.names,
)
if not include_groups and isinstance(grouped_values, DataFrame):
selection = getattr(self, "_selection", None)
Expand Down
22 changes: 19 additions & 3 deletions python/cudf/cudf/pandas/_wrappers/pandas.py
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,19 @@ def custom_repr_html(obj):


def _Series_dtype(self):
# Fast-path to extract dtype from the current
# object without round-tripping through the slow<->fast
return _maybe_wrap_result(self._fsproxy_wrapped.dtype, None)
dtype = self._fsproxy_wrapped.dtype
if isinstance(
dtype,
(
cudf.ListDtype,
cudf.StructDtype,
cudf.Decimal32Dtype,
cudf.Decimal64Dtype,
cudf.Decimal128Dtype,
),
):
dtype = self._fsproxy_slow.dtype
return _maybe_wrap_result(dtype, None)
Comment on lines 337 to +350

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

Avoid mutating proxy state in Series.dtype slow fallback.

At Line 349, self._fsproxy_slow.dtype mutates _fsproxy_wrapped to slow, so a dtype read can pin the proxy to slow mode and introduce avoidable fast→slow transfers on subsequent paths.

Suggested fix
 def _Series_dtype(self):
     dtype = self._fsproxy_wrapped.dtype
     if isinstance(
         dtype,
         (
             cudf.ListDtype,
             cudf.StructDtype,
             cudf.Decimal32Dtype,
             cudf.Decimal64Dtype,
             cudf.Decimal128Dtype,
         ),
     ):
-        dtype = self._fsproxy_slow.dtype
+        dtype = self._fsproxy_fast_to_slow().dtype
     return _maybe_wrap_result(dtype, None)

As per coding guidelines: "Detect unnecessary host-device data transfers and repeated GPU-to-host round-trips in hot paths".

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@python/cudf/cudf/pandas/_wrappers/pandas.py` around lines 337 - 350,
Series.dtype currently reads self._fsproxy_slow.dtype in a way that can mutate
the proxy and pin it to slow mode; update _Series_dtype to detect the complex
dtypes (cudf.ListDtype, cudf.StructDtype, Decimal*Dtypes) and then obtain the
dtype from a non-mutating accessor so you don't swap _fsproxy_wrapped to slow.
Concretely, inside _Series_dtype use a read-only/metadata-only call (or an
existing non-mutating helper) to peek the dtype from the slow-side
representation (referencing _fsproxy_slow) without assigning or replacing
_fsproxy_wrapped, and return that value via _maybe_wrap_result; do not perform
any assignment to _fsproxy_wrapped or other state changes.



_SeriesAtIndexer = make_intermediate_proxy_type(
Expand Down Expand Up @@ -1233,6 +1243,12 @@ def Index__setattr__(self, name, value):
pd.core.window.ewm.ExponentialMovingWindowGroupby,
)

OnlineExponentialMovingWindow = make_intermediate_proxy_type(
"OnlineExponentialMovingWindow",
_Unusable,
pd.core.window.ewm.OnlineExponentialMovingWindow,
)

EWMMeanState = make_intermediate_proxy_type(
"EWMMeanState",
_Unusable,
Expand Down
18 changes: 11 additions & 7 deletions python/cudf/cudf/pandas/scripts/pandas-testing-plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ def pytest_unconfigure(config):
"tests/arithmetic/test_numeric.py::TestAdditionSubtraction::test_series_operators_arithmetic[python-pow-slice]": "AssertionError: Series are different",
"tests/arithmetic/test_numeric.py::TestDivisionByZero::test_df_mod_zero_df[numexpr]": "TODO: Add a reason for failure",
"tests/arithmetic/test_numeric.py::TestDivisionByZero::test_df_mod_zero_df[python]": "TODO: Add a reason for failure",
"tests/arithmetic/test_numeric.py::TestDivisionByZero::test_ser_div_ser[numexpr-float32-int64]": "TODO: Add a reason for failure",
"tests/arithmetic/test_numeric.py::TestNumericArithmeticUnsorted::test_numeric_compat2[numexpr]": "TODO: Add a reason for failure",
"tests/arithmetic/test_numeric.py::TestNumericArithmeticUnsorted::test_numeric_compat2[python]": "TODO: Add a reason for failure",
"tests/arithmetic/test_numeric.py::TestNumericArithmeticUnsorted::test_numeric_compat2_floordiv[numexpr-idx0-2-expected0]": "TODO: Add a reason for failure",
Expand Down Expand Up @@ -1153,8 +1152,6 @@ def pytest_unconfigure(config):
"tests/extension/test_interval.py::TestIntervalArray::test_EA_types[c]": "TODO: Add a reason for failure",
"tests/extension/test_interval.py::TestIntervalArray::test_EA_types[python]": "TODO: Add a reason for failure",
"tests/extension/test_interval.py::TestIntervalArray::test_astype_own_type[False]": "TODO: Add a reason for failure",
"tests/extension/test_interval.py::TestIntervalArray::test_compare_array[eq]": "TODO: Add a reason for failure",
"tests/extension/test_interval.py::TestIntervalArray::test_compare_array[ne]": "TODO: Add a reason for failure",
"tests/extension/test_interval.py::TestIntervalArray::test_grouping_grouper": "AssertionError: ndarray Expected type <class 'numpy.ndarray'>, found <class 'pandas.arrays.ArrowStringArray'> instead",
"tests/extension/test_interval.py::TestIntervalArray::test_in_numeric_groupby": "TODO: Add a reason for failure",
"tests/extension/test_interval.py::TestIntervalArray::test_is_extension_array_dtype": "TODO: Add a reason for failure",
Expand Down Expand Up @@ -1383,9 +1380,6 @@ def pytest_unconfigure(config):
"tests/extension/test_numpy.py::TestNumpyExtensionArray::test_set_frame_overwrite_object[float]": "TODO: Add a reason for failure",
"tests/extension/test_numpy.py::TestNumpyExtensionArray::test_set_frame_overwrite_object[object]": "TODO: Add a reason for failure",
"tests/extension/test_numpy.py::TestNumpyExtensionArray::test_setitem_2d_values[object]": "TODO: Add a reason for failure",
"tests/extension/test_numpy.py::TestNumpyExtensionArray::test_stack[object-False-columns0]": "AssertionError",
"tests/extension/test_numpy.py::TestNumpyExtensionArray::test_stack[object-True-columns0]": "AssertionError",
"tests/extension/test_numpy.py::TestNumpyExtensionArray::test_take_series[object]": "TODO: Add a reason for failure",
"tests/extension/test_numpy.py::TestNumpyExtensionArray::test_to_numpy[object]": "TODO: Add a reason for failure",
"tests/extension/test_numpy.py::TestNumpyExtensionArray::test_unary_ufunc_dunder_equivalence[float-absolute]": "TODO: Add a reason for failure",
"tests/extension/test_numpy.py::TestNumpyExtensionArray::test_unary_ufunc_dunder_equivalence[float-negative]": "TODO: Add a reason for failure",
Expand Down Expand Up @@ -3775,7 +3769,6 @@ def pytest_unconfigure(config):
"tests/indexes/test_numpy_compat.py::test_numpy_ufuncs_basic[complex64-exp]": "TODO: Add a reason for failure",
"tests/indexes/test_numpy_compat.py::test_numpy_ufuncs_basic[complex64-expm1]": "TODO: Add a reason for failure",
"tests/indexes/test_numpy_compat.py::test_numpy_ufuncs_basic[complex64-log10]": "TODO: Add a reason for failure",
"tests/indexes/test_numpy_compat.py::test_numpy_ufuncs_basic[complex64-log1p]": "TODO: Add a reason for failure",
"tests/indexes/test_numpy_compat.py::test_numpy_ufuncs_basic[complex64-log2]": "TODO: Add a reason for failure",
"tests/indexes/test_numpy_compat.py::test_numpy_ufuncs_basic[complex64-log]": "TODO: Add a reason for failure",
"tests/indexes/test_numpy_compat.py::test_numpy_ufuncs_basic[complex64-sin]": "TODO: Add a reason for failure",
Expand Down Expand Up @@ -6674,6 +6667,17 @@ def pytest_unconfigure(config):
"tests/groupby/test_groupby_dropna.py::test_null_is_null_for_dtype[False-float0-NoneType-None-False]": "Flaky/version-sensitive cudf.pandas dispatch",
"tests/groupby/test_groupby_dropna.py::test_null_is_null_for_dtype[False-float1-NoneType-None-False]": "Flaky/version-sensitive cudf.pandas dispatch",
"tests/groupby/test_grouping.py::TestGrouping::test_groupby_level_index_value_all_na": "Flaky/version-sensitive cudf.pandas dispatch",
"tests/groupby/test_numba.py::TestEngine::test_as_index_false_unsupported[max]": "cuDF computes reductions on GPU without numba; pandas-specific limitation does not apply",
"tests/groupby/test_numba.py::TestEngine::test_as_index_false_unsupported[max-min_count]": "cuDF computes reductions on GPU without numba; pandas-specific limitation does not apply",
"tests/groupby/test_numba.py::TestEngine::test_as_index_false_unsupported[mean]": "cuDF computes reductions on GPU without numba; pandas-specific limitation does not apply",
"tests/groupby/test_numba.py::TestEngine::test_as_index_false_unsupported[min]": "cuDF computes reductions on GPU without numba; pandas-specific limitation does not apply",
"tests/groupby/test_numba.py::TestEngine::test_as_index_false_unsupported[min-min_count]": "cuDF computes reductions on GPU without numba; pandas-specific limitation does not apply",
"tests/groupby/test_numba.py::TestEngine::test_as_index_false_unsupported[std_0]": "cuDF computes reductions on GPU without numba; pandas-specific limitation does not apply",
"tests/groupby/test_numba.py::TestEngine::test_as_index_false_unsupported[std_1]": "cuDF computes reductions on GPU without numba; pandas-specific limitation does not apply",
"tests/groupby/test_numba.py::TestEngine::test_as_index_false_unsupported[sum]": "cuDF computes reductions on GPU without numba; pandas-specific limitation does not apply",
"tests/groupby/test_numba.py::TestEngine::test_as_index_false_unsupported[sum-min_count]": "cuDF computes reductions on GPU without numba; pandas-specific limitation does not apply",
"tests/groupby/test_numba.py::TestEngine::test_as_index_false_unsupported[var_0]": "cuDF computes reductions on GPU without numba; pandas-specific limitation does not apply",
"tests/groupby/test_numba.py::TestEngine::test_as_index_false_unsupported[var_1]": "cuDF computes reductions on GPU without numba; pandas-specific limitation does not apply",
"tests/indexes/datetimes/test_partial_slicing.py::TestSlicing::test_slice_month": "Flaky xfails (TODO: Validate with pandas 3)",
"tests/indexes/interval/test_interval.py::TestIntervalIndex::test_maybe_convert_i8_numeric_identical[float-IntervalIndex]": "Asserts private APIs",
"tests/indexes/interval/test_interval.py::TestIntervalIndex::test_maybe_convert_i8_numeric_identical[float-Interval]": "Asserts private APIs",
Expand Down
18 changes: 18 additions & 0 deletions python/cudf/cudf/tests/groupby/test_apply.py
Original file line number Diff line number Diff line change
Expand Up @@ -854,6 +854,24 @@ def test_groupby_apply_series_args(func, args):
assert_groupby_results_equal(expect, got)


def test_groupby_apply_series_preserves_multiindex_names():
pdf = pd.DataFrame(
{"value": [1.0, 2.0, 3.0, 4.0]},
index=pd.MultiIndex.from_product([range(2), range(2)]),
)
gdf = cudf.from_pandas(pdf)
by = np.array([0, 0, 1, 1])

expect = pdf.groupby(by=by, group_keys=False)["value"].apply(
lambda x: x.cumprod()
)
got = gdf.groupby(by=by, group_keys=False)["value"].apply(
lambda x: x.cumprod()
)

assert_eq(expect, got)

Comment on lines +857 to +873

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Strengthen this regression by using explicitly named MultiIndex levels.

Right now the test can pass without proving that public MultiIndex names are preserved. Set concrete index level names to assert the intended contract directly.

Proposed test tightening
 def test_groupby_apply_series_preserves_multiindex_names():
     pdf = pd.DataFrame(
         {"value": [1.0, 2.0, 3.0, 4.0]},
-        index=pd.MultiIndex.from_product([range(2), range(2)]),
+        index=pd.MultiIndex.from_product(
+            [range(2), range(2)],
+            names=["outer", "inner"],
+        ),
     )

As per coding guidelines: "python/**/test_*.py: Ensure test files provide comprehensive edge case coverage."

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
def test_groupby_apply_series_preserves_multiindex_names():
pdf = pd.DataFrame(
{"value": [1.0, 2.0, 3.0, 4.0]},
index=pd.MultiIndex.from_product([range(2), range(2)]),
)
gdf = cudf.from_pandas(pdf)
by = np.array([0, 0, 1, 1])
expect = pdf.groupby(by=by, group_keys=False)["value"].apply(
lambda x: x.cumprod()
)
got = gdf.groupby(by=by, group_keys=False)["value"].apply(
lambda x: x.cumprod()
)
assert_eq(expect, got)
def test_groupby_apply_series_preserves_multiindex_names():
pdf = pd.DataFrame(
{"value": [1.0, 2.0, 3.0, 4.0]},
index=pd.MultiIndex.from_product(
[range(2), range(2)],
names=["outer", "inner"],
),
)
gdf = cudf.from_pandas(pdf)
by = np.array([0, 0, 1, 1])
expect = pdf.groupby(by=by, group_keys=False)["value"].apply(
lambda x: x.cumprod()
)
got = gdf.groupby(by=by, group_keys=False)["value"].apply(
lambda x: x.cumprod()
)
assert_eq(expect, got)
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@python/cudf/cudf/tests/groupby/test_apply.py` around lines 857 - 873, The
test test_groupby_apply_series_preserves_multiindex_names should explicitly set
MultiIndex level names on pdf (e.g., use MultiIndex.from_product(...,
names=[...]) rather than anonymous levels) so the test verifies public level
names are preserved; update the pdf creation (and gdf from_pandas) to use named
levels and add an assertion that the resulting indexes' .names on expect and got
are equal (or ensure assert_eq compares index names) after the groupby apply,
referencing pdf, gdf, expect, and got to locate the changes.


@pytest.mark.parametrize("group_keys", [None, True, False])
@pytest.mark.parametrize("by", ["A", ["A", "B"]])
def test_groupby_group_keys(group_keys, by):
Expand Down
44 changes: 44 additions & 0 deletions python/cudf/cudf/tests/indexes/test_interval.py
Original file line number Diff line number Diff line change
Expand Up @@ -393,3 +393,47 @@ def test_from_interval_range_indexing():
result = cudf.interval_range(start=0, end=1, name="a").repeat(2)
expected = pd.interval_range(start=0, end=1, name="a").repeat(2)
assert_eq(result, expected)


def test_interval_equality_series_eq():
s = cudf.Series(pd.arrays.IntervalArray.from_breaks([0, 1, 2, 3]))
result = s == s
expected = cudf.Series([True, True, True])
assert_eq(result, expected)


def test_interval_equality_series_ne():
s = cudf.Series(pd.arrays.IntervalArray.from_breaks([0, 1, 2, 3]))
other = cudf.Series(pd.arrays.IntervalArray.from_breaks([0, 1, 2, 4]))
result = s != other
expected = cudf.Series([False, False, True])
assert_eq(result, expected)


def test_interval_equality_series_eq_with_nulls():
pi = pd.arrays.IntervalArray.from_breaks([0.0, 1.0, 2.0, 3.0])
ps = pd.array(pi, dtype=pi.dtype)
ps[1] = pd.NA
s = cudf.Series(ps)
result = s == s
# cudf uses NULL_EQUALS semantics: null == null is True
expected = cudf.Series([True, True, True])
assert_eq(result, expected)


def test_interval_equality_index_eq():
idx = cudf.IntervalIndex.from_breaks([0, 1, 2, 3])
other = cudf.IntervalIndex.from_breaks([0, 1, 5, 3])
result = idx == other
expected = np.array([True, False, False])
np.testing.assert_array_equal(result.get(), expected)


@pytest.mark.parametrize("closed", ["left", "right", "both", "neither"])
def test_interval_equality_eq_respects_closed(closed):
s = cudf.Series(
pd.arrays.IntervalArray.from_breaks([0, 1, 2], closed=closed)
)
result = s == s
expected = cudf.Series([True, True])
assert_eq(result, expected)
Loading