From a3c9fec1af6babbde6076fa9c42b4483d3425d2d Mon Sep 17 00:00:00 2001 From: Peter Andreas Entschev Date: Thu, 4 Jan 2024 23:09:14 +0100 Subject: [PATCH] Update to Dask's `shuffle_method` kwarg (#1300) https://github.com/dask/dask/pull/10738 has deprecated the `shuffle` kwarg in favor of `shuffle_method` which now raises a `FutureWarning`. This change transitions to the new kwarg. Requires https://github.com/rapidsai/cudf/pull/14708 . Authors: - Peter Andreas Entschev (https://github.com/pentschev) Approvers: - Richard (Rick) Zamora (https://github.com/rjzamora) URL: https://github.com/rapidsai/dask-cuda/pull/1300 --- dask_cuda/explicit_comms/dataframe/shuffle.py | 2 +- dask_cuda/tests/test_proxify_host_file.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dask_cuda/explicit_comms/dataframe/shuffle.py b/dask_cuda/explicit_comms/dataframe/shuffle.py index 854115fe0..ca69156dd 100644 --- a/dask_cuda/explicit_comms/dataframe/shuffle.py +++ b/dask_cuda/explicit_comms/dataframe/shuffle.py @@ -577,7 +577,7 @@ def wrapper(*args, **kwargs): kw = kw.arguments # Notice, we only overwrite the default and the "tasks" shuffle # algorithm. The "disk" and "p2p" algorithm, we don't touch. - if kw["shuffle"] in ("tasks", None): + if kw["shuffle_method"] in ("tasks", None): col = kw["col"] if isinstance(col, str): col = [col] diff --git a/dask_cuda/tests/test_proxify_host_file.py b/dask_cuda/tests/test_proxify_host_file.py index 191f62fe4..b1c9a9d52 100644 --- a/dask_cuda/tests/test_proxify_host_file.py +++ b/dask_cuda/tests/test_proxify_host_file.py @@ -403,7 +403,7 @@ def is_proxy_object(x): ddf = dask.dataframe.from_pandas( cudf.DataFrame({"key": np.arange(10)}), npartitions=npartitions ) - res = ddf.shuffle(on="key", shuffle="tasks").persist() + res = ddf.shuffle(on="key", shuffle_method="tasks").persist() # With compatibility mode on, we shouldn't encounter any proxy objects if compatibility_mode: