From f214f331fb76a2a9cd60f7b45b797f6650e774cc Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Mon, 31 May 2021 17:44:06 +0200 Subject: [PATCH 1/6] add transformed target regressor in test_meta_estimators_delegate_data_validation --- sklearn/tests/test_metaestimators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sklearn/tests/test_metaestimators.py b/sklearn/tests/test_metaestimators.py index ad716c3e4cd2f..c7412c98d4290 100644 --- a/sklearn/tests/test_metaestimators.py +++ b/sklearn/tests/test_metaestimators.py @@ -169,7 +169,7 @@ def _generate_meta_estimator_instances_with_pipeline(): for _, Estimator in sorted(all_estimators()): sig = set(signature(Estimator).parameters) - if "estimator" in sig or "base_estimator" in sig: + if "estimator" in sig or "base_estimator" in sig or "regressor" in sig: if is_regressor(Estimator): estimator = make_pipeline(TfidfVectorizer(), Ridge()) param_grid = {"ridge__alpha": [0.1, 1.0]} From 90d6d88d77953ebf4dab5d8741f42c347b8fcf77 Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Mon, 31 May 2021 18:02:54 +0200 Subject: [PATCH 2/6] enable the compose module for n_features_in_ common test --- sklearn/tests/test_common.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sklearn/tests/test_common.py b/sklearn/tests/test_common.py index 8ec4125547722..848788647cf3f 100644 --- a/sklearn/tests/test_common.py +++ b/sklearn/tests/test_common.py @@ -261,7 +261,6 @@ def test_search_cv(estimator, check, request): # # check_classifiers_train would need to be updated with the error message N_FEATURES_IN_AFTER_FIT_MODULES_TO_IGNORE = { - 'compose', 'feature_extraction', 'model_selection', 'multiclass', From 5e311520ba3a80d563e65d891b7810b1f4fffaae Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Tue, 1 Jun 2021 15:24:01 +0200 Subject: [PATCH 3/6] doc n_features_in_ --- sklearn/compose/_column_transformer.py | 6 ++++++ sklearn/compose/_target.py | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/sklearn/compose/_column_transformer.py b/sklearn/compose/_column_transformer.py index 6c15b81be98c2..14c5bd10cc128 100644 --- a/sklearn/compose/_column_transformer.py +++ b/sklearn/compose/_column_transformer.py @@ -140,6 +140,12 @@ class ColumnTransformer(TransformerMixin, _BaseComposition): feature(s). .. versionadded:: 1.0 + + n_features_in_ : int + Number of features seen during :term:`fit`. Only defined if the + underlying transformers expose such an attribute when fit. + + .. versionadded:: 0.24 Notes ----- diff --git a/sklearn/compose/_target.py b/sklearn/compose/_target.py index 12fe13ee848b9..8e93c52543084 100644 --- a/sklearn/compose/_target.py +++ b/sklearn/compose/_target.py @@ -81,6 +81,12 @@ class TransformedTargetRegressor(RegressorMixin, BaseEstimator): transformer_ : object Transformer used in ``fit`` and ``predict``. + + n_features_in_ : int + Number of features seen during :term:`fit`. Only defined if the + underlying regressor exposes such an attribute when fit. + + .. versionadded:: 0.24 Examples -------- From b9a73e6801f9954729e0f2c2164133a124ea4570 Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Tue, 1 Jun 2021 16:20:41 +0200 Subject: [PATCH 4/6] lint --- sklearn/compose/_column_transformer.py | 2 +- sklearn/compose/_target.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sklearn/compose/_column_transformer.py b/sklearn/compose/_column_transformer.py index 14c5bd10cc128..ada175c7f32c6 100644 --- a/sklearn/compose/_column_transformer.py +++ b/sklearn/compose/_column_transformer.py @@ -140,7 +140,7 @@ class ColumnTransformer(TransformerMixin, _BaseComposition): feature(s). .. versionadded:: 1.0 - + n_features_in_ : int Number of features seen during :term:`fit`. Only defined if the underlying transformers expose such an attribute when fit. diff --git a/sklearn/compose/_target.py b/sklearn/compose/_target.py index 8e93c52543084..1e7f23af5ed67 100644 --- a/sklearn/compose/_target.py +++ b/sklearn/compose/_target.py @@ -81,7 +81,7 @@ class TransformedTargetRegressor(RegressorMixin, BaseEstimator): transformer_ : object Transformer used in ``fit`` and ``predict``. - + n_features_in_ : int Number of features seen during :term:`fit`. Only defined if the underlying regressor exposes such an attribute when fit. @@ -243,7 +243,7 @@ def predict(self, X): return pred_trans def _more_tags(self): - return {'poor_score': True, 'no_validation': True} + return {'poor_score': True}#, 'no_validation': True} @property def n_features_in_(self): From 6d7e19e041a8ec484fbcc38f28f47c5c03a3c1d9 Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Tue, 1 Jun 2021 16:21:10 +0200 Subject: [PATCH 5/6] cln --- sklearn/compose/_target.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sklearn/compose/_target.py b/sklearn/compose/_target.py index 1e7f23af5ed67..af996623d8aa3 100644 --- a/sklearn/compose/_target.py +++ b/sklearn/compose/_target.py @@ -243,7 +243,7 @@ def predict(self, X): return pred_trans def _more_tags(self): - return {'poor_score': True}#, 'no_validation': True} + return {'poor_score': True, 'no_validation': True} @property def n_features_in_(self): From 64b5dbafc490f0f89905e2db96726a8f51d92be7 Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Thu, 3 Jun 2021 11:33:46 +0200 Subject: [PATCH 6/6] trigger ci