Simplify default scheduler logic

dask · Jun 8, 2022 · 6d1a9e9 · 6d1a9e9
1 parent 923df95
commit 6d1a9e9
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 50 deletions.
diff --git a/dask/array/core.py b/dask/array/core.py
@@ -90,14 +90,9 @@
 
     DEFAULT_GET = local.get_sync
 else:
-    try:
-        from dask import threaded
-    except ImportError:
-        from dask import local
+    from dask import threaded
 
-        DEFAULT_GET = local.get_sync
-    else:
-        DEFAULT_GET = threaded.get
+    DEFAULT_GET = threaded.get
 
 config.update_defaults({"array": {"chunk-size": "128MiB", "rechunk-threshold": 4}})
 

diff --git a/dask/bag/core.py b/dask/bag/core.py
@@ -69,14 +69,9 @@
 
     DEFAULT_GET = local.get_sync
 else:
-    try:
-        from dask import multiprocessing
-    except ImportError:
-        from dask import local
+    from dask import multiprocessing
 
-        DEFAULT_GET = local.get_sync
-    else:
-        DEFAULT_GET = multiprocessing.get
+    DEFAULT_GET = multiprocessing.get
 
 no_default = "__no__default__"
 no_result = type(

diff --git a/dask/base.py b/dask/base.py
@@ -1292,29 +1292,23 @@ def _colorize(t):
 }
 
 if not _EMSCRIPTEN:
-    try:
-        from dask import threaded
-    except ImportError:
-        pass
-    else:
-        named_schedulers.update(
-            {
-                "threads": threaded.get,
-                "threading": threaded.get,
-            }
-        )
+    from dask import threaded
 
-    try:
-        from dask import multiprocessing as dask_multiprocessing
-    except ImportError:
-        pass
-    else:
-        named_schedulers.update(
-            {
-                "processes": dask_multiprocessing.get,
-                "multiprocessing": dask_multiprocessing.get,
-            }
-        )
+    named_schedulers.update(
+        {
+            "threads": threaded.get,
+            "threading": threaded.get,
+        }
+    )
+
+    from dask import multiprocessing as dask_multiprocessing
+
+    named_schedulers.update(
+        {
+            "processes": dask_multiprocessing.get,
+            "multiprocessing": dask_multiprocessing.get,
+        }
+    )
 
 
 get_err_msg = """

diff --git a/dask/dataframe/core.py b/dask/dataframe/core.py
@@ -85,14 +85,9 @@
 
     DEFAULT_GET = local.get_sync
 else:
-    try:
-        from dask import threaded
-    except ImportError:
-        from dask import local
+    from dask import threaded
 
-        DEFAULT_GET = local.get_sync
-    else:
-        DEFAULT_GET = threaded.get
+    DEFAULT_GET = threaded.get
 
 no_default = "__no_default__"
 

diff --git a/dask/delayed.py b/dask/delayed.py
@@ -29,14 +29,9 @@
 
     DEFAULT_GET = local.get_sync
 else:
-    try:
-        from dask import threaded
-    except ImportError:
-        from dask import local
+    from dask import threaded
 
-        DEFAULT_GET = local.get_sync
-    else:
-        DEFAULT_GET = threaded.get
+    DEFAULT_GET = threaded.get
 
 
 def unzip(ls, nout):