From 6c9a214a2fdfbf484fd4846babf8459a636dbd7c Mon Sep 17 00:00:00 2001 From: rjzamora Date: Mon, 18 Mar 2024 11:52:01 -0700 Subject: [PATCH 1/2] skip explicit comms tests when dask-expr is active --- dask_cuda/tests/test_explicit_comms.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dask_cuda/tests/test_explicit_comms.py b/dask_cuda/tests/test_explicit_comms.py index ed34f21f..89b1f5e2 100644 --- a/dask_cuda/tests/test_explicit_comms.py +++ b/dask_cuda/tests/test_explicit_comms.py @@ -25,6 +25,12 @@ mp = mp.get_context("spawn") # type: ignore ucp = pytest.importorskip("ucp") +# Skip these tests when dask-expr is active (for now) +pytest.mark.skipif( + dask.config.get("dataframe.query-planning", None) is not False, + reason="https://github.com/rapidsai/dask-cuda/issues/1311", +) + # Notice, all of the following tests is executed in a new process such # that UCX options of the different tests doesn't conflict. From 837e80570060e8f5c13908cea615462046500be7 Mon Sep 17 00:00:00 2001 From: rjzamora Date: Mon, 18 Mar 2024 12:00:28 -0700 Subject: [PATCH 2/2] fix skip --- dask_cuda/tests/test_explicit_comms.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dask_cuda/tests/test_explicit_comms.py b/dask_cuda/tests/test_explicit_comms.py index 89b1f5e2..1f70fb2c 100644 --- a/dask_cuda/tests/test_explicit_comms.py +++ b/dask_cuda/tests/test_explicit_comms.py @@ -22,15 +22,16 @@ from dask_cuda.explicit_comms.dataframe.shuffle import shuffle as explicit_comms_shuffle from dask_cuda.utils_test import IncreasedCloseTimeoutNanny -mp = mp.get_context("spawn") # type: ignore -ucp = pytest.importorskip("ucp") - # Skip these tests when dask-expr is active (for now) -pytest.mark.skipif( +pytestmark = pytest.mark.skipif( dask.config.get("dataframe.query-planning", None) is not False, reason="https://github.com/rapidsai/dask-cuda/issues/1311", ) +mp = mp.get_context("spawn") # type: ignore +ucp = pytest.importorskip("ucp") + + # Notice, all of the following tests is executed in a new process such # that UCX options of the different tests doesn't conflict.