8000 FIX Fixed some imports after deprecations (#15345) · amueller/scikit-learn@bcd399f · GitHub
[go: up one dir, main page]

Skip to content

Commit bcd399f

Browse files
NicolasHugglemaitre
authored andcommitted
FIX Fixed some imports after deprecations (scikit-learn#15345)
1 parent bc19954 commit bcd399f

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

doc/modules/cross_validation.rst

Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ predefined scorer names::
241241

242242
Or as a dict mapping scorer name to a predefined or custom scoring function::
243243

244-
>>> from sklearn.metrics.scorer import make_scorer
244+
>>> from sklearn.metrics import make_scorer
245245
>>> scoring = {'prec_macro': 'precision_macro',
246246
... 'rec_macro': make_scorer(recall_score, average='macro')}
247247
>>> scores = cross_validate(clf, X, y, scoring=scoring,
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from scipy.sparse import issparse
66
from scipy.special import digamma
77

8-
from ..metrics.cluster.supervised import mutual_info_score
8+
from ..metrics.cluster import mutual_info_score
99
from ..neighbors import NearestNeighbors
1010
from ..preprocessing import scale
1111
from ..utils import check_random_state
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from ..base import is_classifier
2020
from ..model_selection import check_cv
2121
from ..model_selection._validation import _score
22-
from ..metrics.scorer import check_scoring
22+
from ..metrics import check_scoring
2323
from .base import SelectorMixin
2424

2525

Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from sklearn.base import clone
1010
from sklearn.datasets import load_iris, make_classification
1111
from sklearn.metrics import log_loss
12-
from sklearn.metrics.scorer import get_scorer
12+
from sklearn.metrics import get_scorer
1313
from sklearn.model_selection import StratifiedKFold
1414
from sklearn.model_selection import GridSearchCV
1515
from sklearn.model_selection import train_test_split
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ def cross_validate(estimator, X, y=None, groups=None, scoring=None, cv=None,
177177
--------
178178
>>> from sklearn import datasets, linear_model
179179
>>> from sklearn.model_selection import cross_validate
180-
>>> from sklearn.metrics.scorer import make_scorer
180+
>>> from sklearn.metrics import make_scorer
181181
>>> from sklearn.metrics import confusion_matrix
182182
>>> from sklearn.svm import LinearSVC
183183
>>> diabetes = datasets.load_diabetes()
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
from sklearn.metrics import precision_recall_fscore_support
5353
from sklearn.metrics import precision_score
5454
from sklearn.metrics import r2_score
55-
from sklearn.metrics.scorer import check_scoring
55+
from sklearn.metrics import check_scoring
5656

5757
from sklearn.linear_model import Ridge, LogisticRegression, SGDClassifier
5858
from sklearn.linear_model import PassiveAggressiveClassifier, RidgeClassifier