From 5160323a69e11ee8b4596dbd0a2e4d9dfc56d936 Mon Sep 17 00:00:00 2001
From: Vince Jankovics <vincejankovics@gmail.com>
Date: Thu, 20 Jun 2019 11:16:20 +0100
Subject: [PATCH] Use joblib instead of sklearn.externals.joblib

---
 benchmarks/bench_ml.py               | 4 ++--
 examples/parallel-optimization.ipynb | 2 +-
 skopt/learning/gbrt.py               | 2 +-
 skopt/optimizer/optimizer.py         | 2 +-
 skopt/searchcv.py                    | 2 +-
 skopt/tests/test_searchcv.py         | 2 +-
 skopt/utils.py                       | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/benchmarks/bench_ml.py b/benchmarks/bench_ml.py
index 1280e194d..b05a188b3 100644
--- a/benchmarks/bench_ml.py
+++ b/benchmarks/bench_ml.py
@@ -32,8 +32,8 @@
 from sklearn.datasets import fetch_mldata
 from sklearn.datasets import load_boston
 from sklearn.datasets import load_digits
-from sklearn.externals.joblib import delayed
-from sklearn.externals.joblib import Parallel
+from joblib import delayed
+from joblib import Parallel
 from sklearn.model_selection import train_test_split
 from sklearn.preprocessing import StandardScaler
 from sklearn.svm import SVC
diff --git a/examples/parallel-optimization.ipynb b/examples/parallel-optimization.ipynb
index 51142abf1..69ca7d626 100644
--- a/examples/parallel-optimization.ipynb
+++ b/examples/parallel-optimization.ipynb
@@ -46,7 +46,7 @@
       "source": [
         "from skopt import Optimizer\n",
         "from skopt.space import Real\n",
-        "from sklearn.externals.joblib import Parallel, delayed\n",
+        "from joblib import Parallel, delayed\n",
         "# example objective taken from skopt\n",
         "from skopt.benchmarks import branin\n",
         "\n",
diff --git a/skopt/learning/gbrt.py b/skopt/learning/gbrt.py
index 9afda6667..f3ef43ba6 100644
--- a/skopt/learning/gbrt.py
+++ b/skopt/learning/gbrt.py
@@ -4,7 +4,7 @@
 from sklearn.base import BaseEstimator, RegressorMixin
 from sklearn.ensemble import GradientBoostingRegressor
 from sklearn.utils import check_random_state
-from sklearn.externals.joblib import Parallel, delayed
+from joblib import Parallel, delayed
 
 
 def _parallel_fit(regressor, X, y):
diff --git a/skopt/optimizer/optimizer.py b/skopt/optimizer/optimizer.py
index d72928eb3..47573ebe4 100644
--- a/skopt/optimizer/optimizer.py
+++ b/skopt/optimizer/optimizer.py
@@ -9,7 +9,7 @@
 
 from sklearn.base import clone
 from sklearn.base import is_regressor
-from sklearn.externals.joblib import Parallel, delayed
+from joblib import Parallel, delayed
 from sklearn.multioutput import MultiOutputRegressor
 from sklearn.utils import check_random_state
 
diff --git a/skopt/searchcv.py b/skopt/searchcv.py
index 014f4244c..08e0ef6b6 100644
--- a/skopt/searchcv.py
+++ b/skopt/searchcv.py
@@ -6,7 +6,7 @@
 
 import sklearn
 from sklearn.base import is_classifier, clone
-from sklearn.externals.joblib import Parallel, delayed
+from joblib import Parallel, delayed
 from sklearn.model_selection._search import BaseSearchCV
 from sklearn.utils import check_random_state
 from sklearn.utils.fixes import MaskedArray
diff --git a/skopt/tests/test_searchcv.py b/skopt/tests/test_searchcv.py
index ce4933bf9..ae63b86f5 100644
--- a/skopt/tests/test_searchcv.py
+++ b/skopt/tests/test_searchcv.py
@@ -13,7 +13,7 @@
 from sklearn.tree import DecisionTreeClassifier
 from sklearn.base import clone
 from sklearn.base import BaseEstimator
-from sklearn.externals.joblib import cpu_count
+from joblib import cpu_count
 
 from skopt.space import Real, Categorical, Integer
 from skopt import BayesSearchCV
diff --git a/skopt/utils.py b/skopt/utils.py
index 4bd81a547..482b09bf3 100644
--- a/skopt/utils.py
+++ b/skopt/utils.py
@@ -6,8 +6,8 @@
 from scipy.optimize import minimize as sp_minimize
 from sklearn.base import is_regressor
 from sklearn.ensemble import GradientBoostingRegressor
-from sklearn.externals.joblib import dump as dump_
-from sklearn.externals.joblib import load as load_
+from joblib import dump as dump_
+from joblib import load as load_
 
 from .learning import ExtraTreesRegressor
 from .learning import GaussianProcessRegressor