Test query-planning in gpuCI (#11060)

dask · May 10, 2024 · 6f5821d · 6f5821d
1 parent aabc53d
commit 6f5821d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/continuous_integration/gpuci/build.sh b/continuous_integration/gpuci/build.sh
@@ -23,9 +23,6 @@ cd "$WORKSPACE"
 # Determine CUDA release version
 export CUDA_REL=${CUDA_VERSION%.*}
 
-# TODO: remove once RAPIDS 24.06 has full support for dask-expr
-export DASK_DATAFRAME__QUERY_PLANNING=false
-
 ################################################################################
 # SETUP - Check environment
 ################################################################################
@@ -57,5 +54,8 @@ conda info
 conda config --show-sources
 conda list --show-channel-urls
 
-rapids-logger "Python py.test for dask"
-py.test $WORKSPACE -n 3 -v -m gpu --junitxml="$WORKSPACE/junit-dask.xml" --cov-config="$WORKSPACE/pyproject.toml" --cov=dask --cov-report=xml:"$WORKSPACE/dask-coverage.xml" --cov-report term
+rapids-logger "Python py.test for dask-dataframe (LEGACY)"
+DASK_DATAFRAME__QUERY_PLANNING=False py.test "$WORKSPACE/dask/dataframe" -n 3 -v -m gpu --junitxml="$WORKSPACE/junit-dask-legacy.xml" --cov-config="$WORKSPACE/pyproject.toml" --cov=dask --cov-report=xml:"$WORKSPACE/dask-coverage-legacy.xml" --cov-report term
+
+rapids-logger "Python py.test for dask (NEW)"
+DASK_DATAFRAME__QUERY_PLANNING=True py.test $WORKSPACE -n 3 -v -m gpu --junitxml="$WORKSPACE/junit-dask.xml" --cov-config="$WORKSPACE/pyproject.toml" --cov=dask --cov-report=xml:"$WORKSPACE/dask-coverage.xml" --cov-report term
diff --git a/dask/dataframe/tests/test_groupby.py b/dask/dataframe/tests/test_groupby.py
@@ -3035,7 +3035,9 @@ def test_groupby_apply_cudf(group_keys):
     )
 
     assert_eq(res_pd, res_dd)
-    assert_eq(res_dd, res_dc)
+    # Pandas and cudf return different `index.name`
+    # for empty MultiIndex (use `check_names=False`)
+    assert_eq(res_dd, res_dc, check_names=False)
 
 
 @pytest.mark.parametrize("sort", [True, False])

diff --git a/dask/dataframe/tests/test_multi.py b/dask/dataframe/tests/test_multi.py
@@ -1135,7 +1135,18 @@ def test_merge_how_raises():
 
 
 @pytest.mark.parametrize("parts", [(3, 3), (3, 1), (1, 3)])
-@pytest.mark.parametrize("how", ["leftsemi", "leftanti"])
+@pytest.mark.parametrize(
+    "how",
+    [
+        "leftsemi",
+        pytest.param(
+            "leftanti",
+            marks=pytest.mark.xfail(
+                DASK_EXPR_ENABLED, reason="leftanti is not supported yet"
+            ),
+        ),
+    ],
+)
 @pytest.mark.parametrize(
     "engine",
     [