From 9202d5277f53e92f39530d0e4e90115592cf7b32 Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Wed, 7 Aug 2013 19:32:04 -0400
Subject: [PATCH] refreshed joblib patch
---
debian/patches/deb_use_system_joblib | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/patches/deb_use_system_joblib b/debian/patches/deb_use_system_joblib
index da8f32c610..5be10f7169 100644
--- a/debian/patches/deb_use_system_joblib
+++ b/debian/patches/deb_use_system_joblib
@@ -20,7 +20,7 @@ Subject: use system-wide joblib and do not attempt to install joblib/test
+from joblib import *
--- a/sklearn/metrics/pairwise.py
+++ b/sklearn/metrics/pairwise.py
-@@ -48,7 +48,7 @@ from ..utils.validation import array2d
+@@ -47,7 +47,7 @@ from ..utils.extmath import safe_sparse_
from ..preprocessing import normalize
from ..externals.joblib import Parallel
from ..externals.joblib import delayed
@@ -29,7 +29,7 @@ Subject: use system-wide joblib and do not attempt to install joblib/test
from .pairwise_fast import _chi2_kernel_fast
-@@ -553,7 +553,7 @@ def _parallel_pairwise(X, Y, func, n_job
+@@ -559,7 +559,7 @@ def _parallel_pairwise(X, Y, func, n_job
"""Break the pairwise matrix in n_jobs even slices
and compute them in parallel"""
if n_jobs < 0:
--
GitLab