From c6d109e972160dca712b48765d100afdbbf396cc Mon Sep 17 00:00:00 2001 From: Will Handley Date: Sun, 5 Aug 2018 15:58:03 +0100 Subject: [PATCH] Further fix --- fgivenx/parallel.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fgivenx/parallel.py b/fgivenx/parallel.py index 34d5008..48c420b 100644 --- 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))