Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9b0576f
fix
galipremsagar Jun 24, 2026
c3dc1a1
merge
galipremsagar Jun 24, 2026
87729e1
Merge branch 'main' into midx_fixes
galipremsagar Jun 24, 2026
7f3dbe8
Merge remote-tracking branch 'upstream/main' into midx_fixes
galipremsagar Jun 25, 2026
3382564
fix pytest failures
galipremsagar Jun 25, 2026
a3c5e57
Merge branch 'main' into midx_fixes
galipremsagar Jun 25, 2026
e8eafb7
Merge remote-tracking branch 'upstream/main' into midx_fixes
galipremsagar Jun 29, 2026
0a553d6
Address reviews
galipremsagar Jun 29, 2026
e72df90
Address review: faster monotonic/membership checks, clarify loc comme…
galipremsagar Jul 1, 2026
a21f49b
Split out DataFrame.rename MultiIndex fix to a separate PR
galipremsagar Jul 1, 2026
b182c94
Revert spurious copyright bumps on files no longer changed
galipremsagar Jul 1, 2026
8328e32
Match base copyright headers on untouched files
galipremsagar Jul 1, 2026
0722632
Merge remote-tracking branch 'upstream/main' into midx_fixes
galipremsagar Jul 1, 2026
667d2f5
Merge branch 'main' into midx_fixes
galipremsagar Jul 1, 2026
509cfa5
Merge remote-tracking branch 'upstream/main' into midx_fixes
galipremsagar Jul 1, 2026
94189ac
fix
galipremsagar Jul 1, 2026
18605de
Merge branch 'main' into midx_fixes
galipremsagar Jul 1, 2026
840f4f2
Merge branch 'main' into midx_fixes
galipremsagar Jul 2, 2026
a2ff7bc
Merge
galipremsagar Jul 2, 2026
ae14ee8
Merge remote-tracking branch 'upstream/main' into midx_fixes
galipremsagar Jul 7, 2026
87bc09f
Merge branch 'main' into midx_fixes
galipremsagar Jul 14, 2026
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
95 changes: 83 additions & 12 deletions python/cudf/cudf/core/dataframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,17 @@ def _shape_mismatch_error(x, y):
)


class _RowLabelKeyError(KeyError):
"""Marks a ``KeyError`` raised while looking up a *row* label.

``_DataFrameLocIndexer.__getitem__`` retries a failed lookup as
``(arg, slice(None))`` to support pandas-like tuple indexing. That retry
must only fire when *column* gathering failed, not when the row label
itself is genuinely missing (otherwise a bare scalar row miss is silently
reinterpreted positionally instead of raising ``KeyError``).
"""


class _DataFrameIndexer(_FrameIndexer):
def __setitem__(self, key, value):
indexing_utils.check_dict_or_set_indexers(key)
Expand All @@ -180,8 +191,15 @@ def __getitem__(self, arg):
# tuple arguments to index into MultiIndex dataframes.
try:
return self._getitem_tuple_arg(arg)
except _RowLabelKeyError as e:
# A genuine row-label miss must raise, not retry positionally.
raise KeyError(*e.args) from None
except (TypeError, KeyError, IndexError, ValueError):
return self._getitem_tuple_arg((arg, slice(None)))
# The retry reinterprets ``arg`` as the full per-level row key
# (pandas "Form A"), so scalar-selected levels are dropped.
Comment thread
galipremsagar marked this conversation as resolved.
Resolved
return self._getitem_tuple_arg(
(arg, slice(None)), per_level=True
)
else:
(
row_key,
Expand All @@ -200,7 +218,7 @@ def __getitem__(self, arg):
)

@_performance_tracking
def _getitem_tuple_arg(self, arg):
def _getitem_tuple_arg(self, arg, per_level=False):
# Step 1: Gather columns
if isinstance(arg, tuple):
columns_df = self._frame._get_columns_by_label(arg[1])
Expand Down Expand Up @@ -256,14 +274,50 @@ def _getitem_tuple_arg(self, arg):
# downcast the result to a Series.
return result[arg[1]]
return result
result = columns_df.index._get_row_major(columns_df, row_arg)
if (
len(result) == 1
and isinstance(arg, tuple)
and len(arg) > 1
and is_scalar(arg[1])
):
return result._columns[0].element_indexing(0)
try:
result = columns_df.index._get_row_major(
columns_df, row_arg, per_level=per_level
)
except KeyError as e:
# Tag a row-label miss so __getitem__ raises instead of
# retrying it as a positional/column lookup.
raise _RowLabelKeyError(*e.args) from None
# A column key that selects a single complete column (a scalar
# label for single-level columns, or a full-length tuple for
# MultiIndex columns) yields a Series, collapsing to a scalar
# only when the row key is itself a full scalar label.
col_key = (
arg[1]
if (isinstance(arg, tuple) and len(arg) > 1)
else None
)
if col_key is not None:
col_nlevels = self._frame._data.nlevels
col_is_single_label = (
is_scalar(col_key)
if col_nlevels == 1
# A full-length all-scalar tuple is one complete
# column label; a tuple containing a slice/list is a
# column *slicer* selecting multiple columns.
else (
isinstance(col_key, tuple)
and len(col_key) == col_nlevels
and all(is_scalar(x) for x in col_key)
)
)
else:
col_is_single_label = False
if col_is_single_label:
row_is_full_label = is_scalar(row_arg) or (
isinstance(row_arg, tuple)
and len(row_arg) == columns_df.index.nlevels
and all(is_scalar(x) for x in row_arg)
)
if isinstance(result, cudf.DataFrame):
result = result[result._column_names[0]]
if len(result) == 1 and row_is_full_label:
return result._column.element_indexing(0)
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
return result
return result
else:
raise RuntimeError(
Expand Down Expand Up @@ -773,6 +827,7 @@ def _array_to_column_accessor(
multiindex=isinstance(columns_labels, pd.MultiIndex),
label_dtype=columns_labels.dtype,
level_names=tuple(columns_labels.names),
level_dtypes=_pd_index_level_dtypes(columns_labels),
)


Expand Down Expand Up @@ -1182,6 +1237,7 @@ def __init__(
rangeindex=isinstance(columns, pd.RangeIndex),
level_names=tuple(columns.names),
label_dtype=columns.dtype,
level_dtypes=_pd_index_level_dtypes(columns),
)
elif isinstance(data, Mapping):
# Note: We excluded ColumnAccessor already above
Expand Down Expand Up @@ -3206,6 +3262,7 @@ def _set_columns_like(self, other: ColumnAccessor) -> None:
rangeindex=other.rangeindex,
level_names=other.level_names,
label_dtype=other.label_dtype,
level_dtypes=other._level_dtypes,
verify=False,
)

Expand Down Expand Up @@ -4223,16 +4280,24 @@ def rename(
)

if level is not None and isinstance(self.index, MultiIndex):
level = self.index._get_level_label(level)
# Resolve to the ColumnAccessor label (e.g. the positional key
# ``0`` for an unnamed level), NOT the level *name* (which is
# ``None`` for unnamed levels and would insert a spurious extra
# column rather than overwrite the level being renamed).
ca_label, _ = self.index._level_to_ca_label(level)
level_values = self.index.get_level_values(level)
ca = self.index._data.copy(deep=copy)
ca[level] = level_values._column.find_and_replace(
ca[ca_label] = level_values._column.find_and_replace(
to_replace=list(index.keys()),
replacement=list(index.values()),
)
Comment thread
galipremsagar marked this conversation as resolved.
Resolved
out_index = type(self.index)._from_data(
ca, name=self.index.name
)
# ``_from_data`` derives level names from the ColumnAccessor
# keys (positional ints for an unnamed MultiIndex); restore the
# original level names so renaming a level does not rename it.
out_index.names = self.index.names
else:
to_replace = list(index.keys())
vals = list(index.values())
Expand Down Expand Up @@ -7774,6 +7839,12 @@ def stack(
new_index_columns = [*repeated_index._columns, *tiled_index]
index_names = [*self.index.names, *unique_named_levels.names]
new_index = MultiIndex._from_data(dict(enumerate(new_index_columns)))
# Materialize the levels in order of first appearance (rather than the
# default sorted order) so that converting the result to pandas keeps
# the level order pandas' own ``stack`` produces. Otherwise a later
# ``unstack``/``to_pandas`` would lexicographically reorder the pivoted
# axis (e.g. ``"foo_10"`` before ``"foo_2"``).
new_index._maybe_materialize_codes_and_levels(sort=False)
new_index.names = index_names

# Compute the column indices that serves as the input for
Expand Down
18 changes: 16 additions & 2 deletions python/cudf/cudf/core/frame.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION.
# SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

from __future__ import annotations
Expand Down Expand Up @@ -1603,9 +1603,23 @@ def argsort(

if isinstance(by, str):
by = [by]
return self._get_sorted_inds(
result = self._get_sorted_inds(
by=by, ascending=ascending, na_position=na_position
).values
if cudf.get_option("mode.pandas_compatible"):
# pandas returns ``np.intp`` (int64) positional indexers; cuDF's
# gather map is int32. Match pandas in pandas-compatible mode so
# dtype-strict comparisons (e.g. ``assert_numpy_array_equal``)
# succeed.
#
# This is gated rather than applied unconditionally because the
# int32 return is a long-standing, *documented* part of cuDF's
# public ``argsort`` API (see the ``dtype=int32`` examples in this
# method's docstring and in ``Series``/``Index.argsort``). Widening
# it for everyone would break those doctests and silently double the
# size of every gather map for classic-cuDF users who rely on int32.
Comment thread
galipremsagar marked this conversation as resolved.
Resolved
result = result.astype(np.intp)
return result

@_performance_tracking
def _get_sorted_inds(
Expand Down
1 change: 1 addition & 0 deletions python/cudf/cudf/core/indexed_frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -2888,6 +2888,7 @@ def sort_index(
multiindex=self._data.multiindex,
level_names=self._data.level_names,
label_dtype=self._data.label_dtype,
level_dtypes=self._data._level_dtypes,
verify=False,
)
out = self._from_data_like_self(ca)
Expand Down
Loading
Loading