Skip to content

fix: Make _add_scorers compatible with sklearn 1.4 #1062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 9, 2025
Merged

fix: Make _add_scorers compatible with sklearn 1.4 #1062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f88492
fix: Make _add_scorers compatible with sklearn 1.4
glemaitre Jan 8, 2025
bf371d7
uhm a recursion
glemaitre Jan 8, 2025
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
15 changes: 11 additions & 4 deletions skore/src/skore/sklearn/cross_validation/cross_validation_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def _get_scorers_to_add(estimator, y) -> dict[str, Any]:
return {}


def _add_scorers(scorers, scorers_to_add):
def _add_scorers(scorers, scorers_to_add, estimator):
"""Expand `scorers` with more scorers.

The type of the resulting scorers object is dependent on the type of the input
Expand All @@ -79,6 +79,8 @@ def _add_scorers(scorers, scorers_to_add):
The scorer(s) to expand.
scorers_to_add : dict[str, str]
The scorers to be added.
estimator : estimator
A scikit-learn estimator.

Returns
-------
Expand All @@ -89,10 +91,12 @@ def _add_scorers(scorers, scorers_to_add):
in `scorers`).
"""
if scorers is None or isinstance(scorers, str):
new_scorers, added_scorers = _add_scorers({"score": scorers}, scorers_to_add)
new_scorers, added_scorers = _add_scorers(
{"score": scorers}, scorers_to_add, estimator
)
elif isinstance(scorers, (list, tuple)):
new_scorers, added_scorers = _add_scorers(
{s: s for s in scorers}, scorers_to_add
{s: s for s in scorers}, scorers_to_add, estimator
)
elif isinstance(scorers, dict):
# User-defined metrics have priority
Expand All @@ -103,8 +107,11 @@ def _add_scorers(scorers, scorers_to_add):
from sklearn.metrics._scorer import _MultimetricScorer

internal_scorer = _MultimetricScorer(
# NOTE: we pass `estimator` to `check_scoring` for compatibility with
# scikit-learn 1.4. However, because `scoring` is never `None`, this
# estimator will not have any effect.
scorers={
name: check_scoring(estimator=None, scoring=scoring)
name: check_scoring(estimator=estimator, scoring=scoring)
if isinstance(scoring, str)
else scoring
for name, scoring in scorers_to_add.items()
Expand Down
4 changes: 3 additions & 1 deletion skore/src/skore/sklearn/cross_validation/cross_validation_reporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,9 @@ def __init__(self, *args, **kwargs):

# Extend scorers with other relevant scorers
scorers_to_add = _get_scorers_to_add(self.estimator, self.y)
self._scorers, added_scorers = _add_scorers(self.scorers, scorers_to_add)
self._scorers, added_scorers = _add_scorers(
self.scorers, scorers_to_add, self.estimator
)

self._cv_results = sklearn.model_selection.cross_validate(
*args,
Expand Down
Loading