diff options
| author | Marc Glisse <marc.glisse@inria.fr> | 2020-05-07 15:08:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 15:08:56 +0200 |
| commit | cb969cf6b98c4cef0a08eee698c81b0510206b84 (patch) | |
| tree | eacd2e9e837fd007c967e70e1c7486095ff7a124 | |
| parent | 412469e0e96b4091d3760400ea251b2bf180f1b2 (diff) | |
| parent | 99549c20e9173b536ac816ab683bc13025f182a2 (diff) | |
Merge pull request #305 from mglisse/jobs
fix use of threads and n_jobs in Parallel
| -rw-r--r-- | src/python/gudhi/point_cloud/knn.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/python/gudhi/point_cloud/knn.py b/src/python/gudhi/point_cloud/knn.py index 07553d6d..34e80b5d 100644 --- a/src/python/gudhi/point_cloud/knn.py +++ b/src/python/gudhi/point_cloud/knn.py @@ -200,8 +200,8 @@ class KNearestNeighbors: from joblib import Parallel, delayed, effective_n_jobs from sklearn.utils import gen_even_slices - slices = gen_even_slices(len(X), effective_n_jobs(-1)) - parallel = Parallel(backend="threading", n_jobs=-1) + slices = gen_even_slices(len(X), effective_n_jobs(n_jobs)) + parallel = Parallel(prefer="threads", n_jobs=n_jobs) if self.params.get("sort_results", True): def func(M): @@ -242,8 +242,8 @@ class KNearestNeighbors: else: func = lambda M: numpy.partition(M, k - 1)[:, 0:k] - slices = gen_even_slices(len(X), effective_n_jobs(-1)) - parallel = Parallel(backend="threading", n_jobs=-1) + slices = gen_even_slices(len(X), effective_n_jobs(n_jobs)) + parallel = Parallel(prefer="threads", n_jobs=n_jobs) distances = numpy.concatenate(parallel(delayed(func)(X[s]) for s in slices)) return distances return None |