Skip to content

[MRG] Add fit_params to RFECV.fit #24004

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

Closed
wants to merge 2 commits into from
Closed

[MRG] Add fit_params to RFECV.fit #24004

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
b42c6e2
add fit_params to RFECV.fit
ScottMGustafson Jul 26, 2022
f9a6047
add fit_params to docstring
ScottMGustafson Jul 26, 2022
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: 10 additions & 5 deletions sklearn/feature_selection/_rfe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from ._base import _get_feature_importances


def _rfe_single_fit(rfe, estimator, X, y, train, test, scorer):
def _rfe_single_fit(rfe, estimator, X, y, train, test, scorer, **fit_params):
"""
Return the score for a fit across one fold.
"""
Expand All @@ -40,6 +40,7 @@ def _rfe_single_fit(rfe, estimator, X, y, train, test, scorer):
lambda estimator, features: _score(
estimator, X_test[:, features], y_test, scorer
),
**fit_params,
).scores_


Expand Down Expand Up @@ -645,7 +646,7 @@ def __init__(
self.n_jobs = n_jobs
self.min_features_to_select = min_features_to_select

def fit(self, X, y, groups=None):
def fit(self, X, y, groups=None, **fit_params):
"""Fit the RFE model and automatically tune the number of selected features.

Parameters
Expand All @@ -665,6 +666,10 @@ def fit(self, X, y, groups=None):

.. versionadded:: 0.20

**fit_params : dict
Additional parameters passed to the `fit` method of the underlying
estimator.

Returns
-------
self : object
Expand Down Expand Up @@ -721,7 +726,7 @@ def fit(self, X, y, groups=None):
func = delayed(_rfe_single_fit)

scores = parallel(
func(rfe, self.estimator, X, y, train, test, scorer)
func(rfe, self.estimator, X, y, train, test, scorer, **fit_params)
for train, test in cv.split(X, y, groups)
)

Expand All @@ -742,14 +747,14 @@ def fit(self, X, y, groups=None):
verbose=self.verbose,
)

rfe.fit(X, y)
rfe.fit(X, y, **fit_params)

# Set final attributes
self.support_ = rfe.support_
self.n_features_ = rfe.n_features_
self.ranking_ = rfe.ranking_
self.estimator_ = clone(self.estimator)
self.estimator_.fit(self._transform(X), y)
self.estimator_.fit(self._transform(X), y, **fit_params)

# reverse to stay consistent with before
scores_rev = scores[:, ::-1]
Expand Down
15 changes: 15 additions & 0 deletions sklearn/feature_selection/tests/test_rfe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,21 @@ def score(self, X, y, prop=None):
RFE(estimator=TestEstimator()).fit(X, y, prop="foo").score(X, y, prop="foo")


def test_RFECV_fit_params():
"""Test that RFECV passes fit_params to underlying estimator."""

class MockClassifierWithFitParam(MockClassifier):
def fit(self, X, y, prop=None):
if prop is None:
raise ValueError("fit: prop cannot be None")
return super().fit(X, y)

X, y = load_iris(return_X_y=True)
with pytest.raises(ValueError, match="fit: prop cannot be None"):
RFECV(estimator=MockClassifierWithFitParam()).fit(X, y)
RFECV(estimator=MockClassifierWithFitParam()).fit(X, y, prop="foo")


@pytest.mark.parametrize("n_features_to_select", [-1, 2.1])
def test_rfe_invalid_n_features_errors(n_features_to_select):
clf = SVC(kernel="linear")
Expand Down