Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 1 addition & 22 deletions sklearn/metrics/_scorer.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,6 @@ def __init__(self, score_func, sign, kwargs, response_method="predict"):
self._sign = sign
self._kwargs = kwargs
self._response_method = response_method
# TODO (1.8): remove in 1.8 (scoring="max_error" has been deprecated in 1.6)
self._deprecation_msg = None

def _get_pos_label(self):
if "pos_label" in self._kwargs:
Expand Down Expand Up @@ -293,12 +291,6 @@ def __call__(self, estimator, X, y_true, sample_weight=None, **kwargs):
score : float
Score function applied to prediction of estimator on X.
"""
# TODO (1.8): remove in 1.8 (scoring="max_error" has been deprecated in 1.6)
if self._deprecation_msg is not None:
warnings.warn(
self._deprecation_msg, category=DeprecationWarning, stacklevel=2
)

_raise_for_params(kwargs, self, None)

_kwargs = copy.deepcopy(kwargs)
Expand Down Expand Up @@ -452,12 +444,7 @@ def get_scorer(scoring):
"""
if isinstance(scoring, str):
try:
if scoring == "max_error":
# TODO (1.8): scoring="max_error" has been deprecated in 1.6,
# remove in 1.8
scorer = max_error_scorer
else:
scorer = copy.deepcopy(_SCORERS[scoring])
scorer = copy.deepcopy(_SCORERS[scoring])
except KeyError:
raise ValueError(
"%r is not a valid scoring value. "
Expand Down Expand Up @@ -734,14 +721,6 @@ def make_scorer(
explained_variance_scorer = make_scorer(explained_variance_score)
r2_scorer = make_scorer(r2_score)
neg_max_error_scorer = make_scorer(max_error, greater_is_better=False)
max_error_scorer = make_scorer(max_error, greater_is_better=False)
# TODO (1.8): remove in 1.8 (scoring="max_error" has been deprecated in 1.6)
deprecation_msg = (
"Scoring method max_error was renamed to "
"neg_max_error in version 1.6 and will "
"be removed in 1.8."
)
max_error_scorer._deprecation_msg = deprecation_msg
neg_mean_squared_error_scorer = make_scorer(mean_squared_error, greater_is_better=False)
neg_mean_squared_log_error_scorer = make_scorer(
mean_squared_log_error, greater_is_better=False
Expand Down
10 changes: 0 additions & 10 deletions sklearn/metrics/tests/test_score_objects.py
Original file line number Diff line number Diff line change
Expand Up @@ -707,16 +707,6 @@ def test_scoring_is_not_metric():
check_scoring(KMeans(), scoring=cluster_module.rand_score)


def test_deprecated_scorer():
X, y = make_regression(n_samples=10, n_features=1, random_state=0)
X_train, X_test, y_train, y_test = train_test_split(X, y, random_state=0)
reg = DecisionTreeRegressor()
reg.fit(X_train, y_train)
deprecated_scorer = get_scorer("max_error")
with pytest.warns(DeprecationWarning):
deprecated_scorer(reg, X_test, y_test)


@pytest.mark.parametrize(
(
"scorers,expected_predict_count,"
Expand Down