Clean up old uses of fuse_* config

mrocklin · Apr 18, 2020 · d55e6df · d55e6df
1 parent d89a410
commit d55e6df
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/dask/array/tests/test_optimization.py b/dask/array/tests/test_optimization.py
@@ -363,7 +363,7 @@ def test_turn_off_fusion():
 
     a = y.__dask_optimize__(y.dask, y.__dask_keys__())
 
-    with dask.config.set(fuse_ave_width=0):
+    with dask.config.set({"optimization.fuse.ave-width": 0}):
         b = y.__dask_optimize__(y.dask, y.__dask_keys__())
 
     assert dask.get(a, y.__dask_keys__()) == dask.get(b, y.__dask_keys__())

diff --git a/dask/bag/tests/test_bag.py b/dask/bag/tests/test_bag.py
@@ -563,7 +563,7 @@ def test_rename_fused_keys_bag():
     assert outp.keys() == {"c"}
     assert outp["c"][1:] == ("a", 1)
 
-    with dask.config.set({"fuse_rename_keys": False}):
+    with dask.config.set({"optimization.fuse.rename-keys": False}):
         assert optimize(inp, ["c"]) == outp
 
     # By default, fused keys are renamed

diff --git a/dask/dataframe/optimize.py b/dask/dataframe/optimize.py
@@ -29,7 +29,7 @@ def optimize(dsk, keys, **kwargs):
         dsk,
         keys,
         dependencies=dependencies,
-        fuse_subgraphs=config.get("fuse_subgraphs", True),
+        fuse_subgraphs=config.get("optimization.fuse.subgraphs", True),
     )
     dsk, _ = cull(dsk, keys)
     return dsk

diff --git a/dask/dataframe/tests/test_optimize_dataframe.py b/dask/dataframe/tests/test_optimize_dataframe.py
@@ -16,7 +16,7 @@ def test_fuse_ave_width():
 
     s = (df.x + 1) + (df.x + 2)
 
-    with dask.config.set(fuse_ave_width=4):
+    with dask.config.set({"optimization.fuse.ave-width": 4}):
         a = s.__dask_optimize__(s.dask, s.__dask_keys__())
 
     b = s.__dask_optimize__(s.dask, s.__dask_keys__())

diff --git a/dask/optimization.py b/dask/optimization.py
@@ -480,10 +480,10 @@ def fuse(
         keys = set(flatten(keys))
 
     # Assign reasonable, not too restrictive defaults
-    ave_width = ave_width or config.get("optimization.fuse.ave-width", 1)
-    max_height = (
-        max_height or config.get("optimization.fuse.max-height", None) or len(dsk)
-    )
+    if ave_width is None:
+        ave_width = config.get("optimization.fuse.ave-width", 1)
+    if max_height is None:
+        max_height = config.get("optimization.fuse.max-height", None) or len(dsk)
     max_depth_new_edges = (
         max_depth_new_edges
         or config.get("optimization.fuse.max-depth-new-edges", None)