From 99cbf41d91baa06bd2305f7ccd2ed04e81fabc53 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 25 Oct 2016 12:24:18 +0000 Subject: [PATCH] use system-wide joblib and do not attempt to install joblib/test Relies on DFSG-ed sources with no joblib present Gbp-Pq: Name deb_use_system_joblib --- sklearn/externals/joblib/__init__.py | 4 ++++ sklearn/metrics/pairwise.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 sklearn/externals/joblib/__init__.py diff --git a/sklearn/externals/joblib/__init__.py b/sklearn/externals/joblib/__init__.py new file mode 100644 index 0000000..305b2d4 --- /dev/null +++ b/sklearn/externals/joblib/__init__.py @@ -0,0 +1,4 @@ +# yoh: use system-wide joblib +# replace local name space with the one from system-wide joblib +import joblib +locals().update(joblib.__dict__) diff --git a/sklearn/metrics/pairwise.py b/sklearn/metrics/pairwise.py index c058e20..6c9fb1a 100644 --- a/sklearn/metrics/pairwise.py +++ b/sklearn/metrics/pairwise.py @@ -24,7 +24,7 @@ from ..utils.extmath import row_norms, safe_sparse_dot from ..preprocessing import normalize from ..externals.joblib import Parallel from ..externals.joblib import delayed -from ..externals.joblib.parallel import cpu_count +from ..externals.joblib import parallel from .pairwise_fast import _chi2_kernel_fast, _sparse_manhattan @@ -1068,7 +1068,7 @@ def _parallel_pairwise(X, Y, func, n_jobs, **kwds): """Break the pairwise matrix in n_jobs even slices and compute them in parallel""" if n_jobs < 0: - n_jobs = max(cpu_count() + 1 + n_jobs, 1) + n_jobs = max(parallel.cpu_count() + 1 + n_jobs, 1) if Y is None: Y = X -- 2.30.2