Align MultiIndex.get_indexder with pandas 2.2 change (#15059)

Aligns with pandas-dev/pandas#55352 Additionally, refactored a `pandas.PeriodIndex` usage to a non-deprecated version Authors: - Matthew Roeschke (https://github.com/mroeschke) - GALI PREM SAGAR (https://github.com/galipremsagar) Approvers: - GALI PREM SAGAR (https://github.com/galipremsagar) URL: #15059
rapidsai · Feb 21, 2024 · fab911a · fab911a
1 parent e7a7e48
commit fab911a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 17 deletions.
diff --git a/python/cudf/cudf/core/multiindex.py b/python/cudf/cudf/core/multiindex.py
@@ -1836,6 +1836,12 @@ def get_indexer(self, target, method=None, limit=None, tolerance=None):
             raise NotImplementedError(
                 f"{method=} is not supported yet for MultiIndex."
             )
+        if method in {"ffill", "bfill", "pad", "backfill"} and not (
+            self.is_monotonic_increasing or self.is_monotonic_decreasing
+        ):
+            raise ValueError(
+                "index must be monotonic increasing or decreasing"
+            )
 
         result = cudf.core.column.full(
             len(target),

diff --git a/python/cudf/cudf/tests/test_index.py b/python/cudf/cudf/tests/test_index.py
@@ -2067,14 +2067,6 @@ def test_get_loc_multi_numeric_deviate(idx, key, result):
         assert_eq(expected, got)
 
 
-@pytest.mark.parametrize(
-    "idx",
-    [
-        pd.MultiIndex.from_tuples(
-            [(2, 1, 1), (1, 2, 3), (1, 2, 1), (1, 1, 10), (1, 1, 1), (2, 2, 1)]
-        )
-    ],
-)
 @pytest.mark.parametrize(
     "key",
     [
@@ -2084,21 +2076,42 @@ def test_get_loc_multi_numeric_deviate(idx, key, result):
     ],
 )
 @pytest.mark.parametrize("method", [None, "ffill", "bfill"])
-def test_get_indexer_multi_numeric_deviate(request, idx, key, method):
-    pi = idx
+def test_get_indexer_multi_numeric_deviate(key, method):
+    pi = pd.MultiIndex.from_tuples(
+        [(2, 1, 1), (1, 2, 3), (1, 2, 1), (1, 1, 10), (1, 1, 1), (2, 2, 1)]
+    ).sort_values()
     gi = cudf.from_pandas(pi)
-    request.applymarker(
-        pytest.mark.xfail(
-            condition=method is not None and key == ((1, 2, 3),),
-            reason="https://github.com/pandas-dev/pandas/issues/53452",
-        )
-    )
+
     expected = pi.get_indexer(key, method=method)
     got = gi.get_indexer(key, method=method)
 
     assert_eq(expected, got)
 
 
+@pytest.mark.xfail(
+    not PANDAS_GE_220, reason="Remove after pandas-2.2+ upgrade"
+)
+@pytest.mark.parametrize("method", ["ffill", "bfill"])
+def test_get_indexer_multi_error(method):
+    pi = pd.MultiIndex.from_tuples(
+        [(2, 1, 1), (1, 2, 3), (1, 2, 1), (1, 1, 10), (1, 1, 1), (2, 2, 1)]
+    )
+    gi = cudf.from_pandas(pi)
+
+    assert_exceptions_equal(
+        pi.get_indexer,
+        gi.get_indexer,
+        lfunc_args_and_kwargs=(
+            [],
+            {"target": ((1, 2, 3),), "method": method},
+        ),
+        rfunc_args_and_kwargs=(
+            [],
+            {"target": ((1, 2, 3),), "method": method},
+        ),
+    )
+
+
 @pytest.mark.parametrize(
     "idx",
     [
@@ -3094,7 +3107,7 @@ def test_index_with_index_dtype(data, dtype):
 
 
 def test_period_index_error():
-    pidx = pd.PeriodIndex(year=[2000, 2002], quarter=[1, 3])
+    pidx = pd.PeriodIndex(data=[pd.Period("2020-01")])
     with pytest.raises(NotImplementedError):
         cudf.from_pandas(pidx)
     with pytest.raises(NotImplementedError):