Skip to content

MAINT parameter validation for sklearn.datasets.fetch_lfw_people #25820

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 4 commits into from
Mar 14, 2023
Merged

MAINT parameter validation for sklearn.datasets.fetch_lfw_people #25820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d691503
added parameter validation fetch_lfw_people
Shivachauhan17 Mar 11, 2023
9b71157
Update _lfw.py
Shivachauhan17 Mar 13, 2023
af4a44f
Merge branch 'main' into param_val_fetch_lfw_people
Shivachauhan17 Mar 13, 2023
2c6bab4
slice_ can be None but undocumented
jeremiedbb Mar 14, 2023
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: 14 additions & 1 deletion sklearn/datasets/_lfw.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@

from os import listdir, makedirs, remove
from os.path import join, exists, isdir

from ..utils._param_validation import validate_params, Interval, Hidden
from numbers import Integral, Real
import logging

import numpy as np
Expand Down Expand Up @@ -231,6 +232,18 @@ def _fetch_lfw_people(
return faces, target, target_names


@validate_params(
{
"data_home": [str, None],
"funneled": ["boolean"],
"resize": [Interval(Real, 0, None, closed="neither"), None],
"min_faces_per_person": [Interval(Integral, 0, None, closed="left"), None],
"color": ["boolean"],
"slice_": [tuple, Hidden(None)],
"download_if_missing": ["boolean"],
"return_X_y": ["boolean"],
}
)
def fetch_lfw_people(
*,
data_home=None,
Expand Down
1 change: 1 addition & 0 deletions sklearn/tests/test_public_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ def _check_function_param_validation(
"sklearn.datasets.fetch_california_housing",
"sklearn.datasets.fetch_covtype",
"sklearn.datasets.fetch_kddcup99",
"sklearn.datasets.fetch_lfw_people",
"sklearn.datasets.fetch_olivetti_faces",
"sklearn.datasets.load_svmlight_file",
"sklearn.datasets.load_svmlight_files",
Expand Down