Further fix

handley-lab · Aug 5, 2018 · c6d109e · c6d109e
1 parent 6559a38
commit c6d109e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/fgivenx/parallel.py b/fgivenx/parallel.py
@@ -78,8 +78,6 @@ def parallel_apply(f, array, **kwargs):
     if not parallel:
         return [f(*(precurry + (x,) + postcurry)) for x in
                 progress(array, **tqdm_kwargs)]
-    elif parallel and not PARALLEL:
-        warnings.warn("You need to install the package joblib if you want to use parallelisation")
     elif parallel is True:
         parallel = cpu_count()
     elif isinstance(parallel, int):
@@ -90,5 +88,8 @@ def parallel_apply(f, array, **kwargs):
     else:
         raise ValueError("parallel keyword must be an integer or bool")
 
+    if parallel and not PARALLEL:
+        warnings.warn("You need to install the package joblib if you want to use parallelisation")
+
     return Parallel(n_jobs=parallel)(delayed(f)(*(precurry + (x,) + postcurry))
                                    for x in progress(array, **tqdm_kwargs))