From 210c065ffcd4fc3a35df4e6b3303abd37336adc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 21 Nov 2018 22:22:04 -0500 Subject: [PATCH] don't set check_pickle on new joblib on python2.7 --- sklearn/neighbors/base.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sklearn/neighbors/base.py b/sklearn/neighbors/base.py index b84ecedf229aa..3c4be9c4b313f 100644 --- a/sklearn/neighbors/base.py +++ b/sklearn/neighbors/base.py @@ -439,11 +439,12 @@ class from an array representing our data set and ask who's raise ValueError( "%s does not work with sparse matrices. Densify the data, " "or set algorithm='brute'" % self._fit_method) - if (sys.version_info < (3,) or - LooseVersion(joblib_version) < LooseVersion('0.12')): + old_joblib = LooseVersion(joblib_version) < LooseVersion('0.12') + if sys.version_info < (3,) or old_joblib: # Deal with change of API in joblib + check_pickle = False if old_joblib else None delayed_query = delayed(_tree_query_parallel_helper, - check_pickle=False) + check_pickle=check_pickle) parallel_kwargs = {"backend": "threading"} else: delayed_query = delayed(_tree_query_parallel_helper)