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
3 changes: 3 additions & 0 deletions sklearn/compose/_column_transformer.py
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,9 @@ def set_output(self, *, transform=None):
for trans in transformers:
_safe_set_output(trans, transform=transform)

if self.remainder not in {"passthrough", "drop"}:
_safe_set_output(self.remainder, transform=transform)

return self

def get_params(self, deep=True):
Expand Down
56 changes: 56 additions & 0 deletions sklearn/compose/tests/test_column_transformer.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
make_column_selector,
)
from sklearn.exceptions import NotFittedError
from sklearn.feature_selection import VarianceThreshold
from sklearn.preprocessing import FunctionTransformer
from sklearn.preprocessing import StandardScaler, Normalizer, OneHotEncoder

Expand Down Expand Up @@ -2053,6 +2054,61 @@ def test_column_transform_set_output_after_fitting(remainder):
assert dtype == expected_dtypes[col]


def test_column_transformer_remainder_estimator_set_output_pandas():
pd = pytest.importorskip("pandas")
df = pd.DataFrame(
{
"a": pd.Series([True, False, True], dtype="bool"),
"b": pd.Series([1, 2, 3], dtype="int64"),
}
)

ct = ColumnTransformer(
[],
remainder=VarianceThreshold(),
verbose_feature_names_out=False,
).set_output(transform="pandas")

transformed = ct.fit_transform(df)

assert isinstance(transformed, pd.DataFrame)
assert list(transformed.columns) == ["a", "b"]
assert transformed.dtypes["a"] == df.dtypes["a"]
assert transformed.dtypes["b"] == df.dtypes["b"]
pd.testing.assert_frame_equal(transformed, df)


def test_column_transformer_remainder_estimator_matches_explicit_transformers_pandas():
pd = pytest.importorskip("pandas")
df = pd.DataFrame(
{
"a": pd.Series([True, False, True], dtype="bool"),
"b": pd.Series([1, 2, 3], dtype="int64"),
}
)

identity = FunctionTransformer(validate=False)

remainder_ct = ColumnTransformer(
[("identity", identity, ["a"])],
remainder=VarianceThreshold(),
verbose_feature_names_out=False,
).set_output(transform="pandas")

explicit_ct = ColumnTransformer(
[
("identity", FunctionTransformer(validate=False), ["a"]),
("variance", VarianceThreshold(), ["b"]),
],
verbose_feature_names_out=False,
).set_output(transform="pandas")

remainder_result = remainder_ct.fit_transform(df)
explicit_result = explicit_ct.fit_transform(df)

pd.testing.assert_frame_equal(remainder_result, explicit_result)


# PandasOutTransformer that does not define get_feature_names_out and always expects
# the input to be a DataFrame.
class PandasOutTransformer(BaseEstimator):
Expand Down