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.

Sign up for GitHub

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

Fix DataFrame.sort_index when a index is a MultiIndex #14621

Merged
merged 2 commits into from
Dec 13, 2023
Merged

Fix DataFrame.sort_index when a index is a MultiIndex #14621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2281a6
Fix DataFrame.sort_index
galipremsagar Dec 13, 2023
6ed5607
cleanup
galipremsagar Dec 13, 2023
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
2 changes: 0 additions & 2 deletions python/cudf/cudf/core/indexed_frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1611,8 +1611,6 @@ def sort_index(
idx = self.index
if isinstance(idx, MultiIndex):
if level is not None:
# Pandas doesn't handle na_position in case of MultiIndex.
na_position = "first" if ascending is True else "last"
if not is_list_like(level):
level = [level]
by = list(map(idx._get_level_label, level))
Expand Down
19 changes: 10 additions & 9 deletions python/cudf/cudf/tests/test_dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3492,8 +3492,16 @@ def test_dataframe_sort_index(
@pytest.mark.parametrize("inplace", [True, False])
@pytest.mark.parametrize("na_position", ["first", "last"])
def test_dataframe_mulitindex_sort_index(
axis, level, ascending, inplace, ignore_index, na_position
request, axis, level, ascending, inplace, ignore_index, na_position
):
request.applymarker(
pytest.mark.xfail(
condition=axis in (1, "columns")
and ignore_index
and not (level is None and not ascending),
reason="https://github.com/pandas-dev/pandas/issues/56478",
Copy link
Contributor

Choose a reason for hiding this comment

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

Should hopefully be fixed in pandas 2.2: pandas-dev/pandas#56487

)
)
pdf = pd.DataFrame(
{
"b": [1.0, 3.0, np.nan],
Expand All @@ -3505,17 +3513,14 @@ def test_dataframe_mulitindex_sort_index(
).set_index(["b", "a", 1])
gdf = cudf.DataFrame.from_pandas(pdf)

# ignore_index is supported in v.1.0

expected = pdf.sort_index(
axis=axis,
level=level,
ascending=ascending,
inplace=inplace,
na_position=na_position,
ignore_index=ignore_index,
)
if ignore_index is True:
expected = expected
got = gdf.sort_index(
axis=axis,
level=level,
Expand All @@ -3526,12 +3531,8 @@ def test_dataframe_mulitindex_sort_index(
)

if inplace is True:
if ignore_index is True:
pdf = pdf.reset_index(drop=True)
assert_eq(pdf, gdf)
else:
if ignore_index is True:
expected = expected.reset_index(drop=True)
assert_eq(expected, got)


Expand Down
Loading