Skip to content

Commit fd9091a

Browse files
authored
Minor follow-up to P2P by default (#10008)
1 parent a71c15b commit fd9091a

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

dask/dataframe/groupby.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def _determine_shuffle(shuffle, split_out):
115115
# For more context, see
116116
# https://github.com/dask/dask/pull/9826/files#r1072395307
117117
# https://github.com/dask/distributed/issues/5502
118-
return shuffle or config.get("dataframe.shuffle.algorithm", None) or "tasks"
118+
return config.get("dataframe.shuffle.algorithm", None) or "tasks"
119119
else:
120120
return False
121121
return shuffle

docs/source/dataframe-groupby.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,20 +97,20 @@ Client as default:
9797
client = Client('scheduler:8786', set_as_default=True)
9898
9999
Alternatively, if you prefer to avoid defaults, you can configure the global
100-
shuffling method by using the ``dask.config.set(shuffle=...)`` command.
100+
shuffling method with the ``dataframe.shuffle.algorithm`` configuration option.
101101
This can be done globally:
102102

103103
.. code-block:: python
104104
105-
dask.config.set(dataframe_shuffle_algorithm='p2p')
105+
dask.config.set({"dataframe.shuffle.algorithm": "p2p"})
106106
107107
ddf.groupby(...).apply(...)
108108
109109
or as a context manager:
110110

111111
.. code-block:: python
112112
113-
with dask.config.set(dataframe_shuffle_algorithm='p2p'):
113+
with dask.config.set({"dataframe.shuffle.algorithm": "p2p"}):
114114
ddf.groupby(...).apply(...)
115115
116116

0 commit comments

Comments
 (0)