Small fixes

jnothman · jnothman · commit 7093fc17d119 · 2018-07-11T01:01:14.000+10:00
diff --git a/sklearn/model_selection/_validation.py b/sklearn/model_selection/_validation.py
@@ -25,7 +25,8 @@
 from ..utils.deprecation import DeprecationDict
 from ..utils.validation import _is_arraylike, _num_samples
 from ..utils.metaestimators import _safe_split
-from ..utils import Parallel, delayed, logger
+from ..utils import Parallel, delayed
+from ..externals._joblib import logger
 from ..externals.six.moves import zip
 from ..metrics.scorer import check_scoring, _check_multimetric_scoring
 from ..exceptions import FitFailedWarning
diff --git a/sklearn/utils/__init__.py b/sklearn/utils/__init__.py
@@ -15,7 +15,8 @@
                          check_consistent_length, check_X_y, indexable,
                          check_symmetric)
 from .class_weight import compute_class_weight, compute_sample_weight
-from ..utils import cpu_count, Parallel, Memory, delayed, parallel_backend
+from ..externals.joblib import cpu_count, Parallel, Memory, delayed
+from ..externals.joblib import parallel_backend
 from ..exceptions import DataConversionWarning
 from .deprecation import deprecated
 from .. import get_config
diff --git a/sklearn/utils/validation.py b/sklearn/utils/validation.py
@@ -24,7 +24,7 @@
 from ..exceptions import NonBLASDotWarning
 from ..exceptions import NotFittedError
 from ..exceptions import DataConversionWarning
-from ..utils import Memory
+from ..externals._joblib import Memory
 
 
 FLOAT_DTYPES = (np.float64, np.float32, np.float16)
