[MRG+1] Add verbose option to Pipeline, FeatureUnion, and ColumnTransformer #11364
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Each line printed by Pipeline and FeatureUnion, when their verbosity mode is on, will be 70 characters long.
Fix error message bug
# Conflicts: # sklearn/pipeline.py # sklearn/utils/__init__.py # sklearn/utils/tests/test_utils.py
|
Thanks for fixing that up. This is nice. |
thomasjpfan
changed the title
|
I updated this PR with verbose support in |
NicolasHug
reviewed
Apr 10, 2019
sklearn/pipeline.py
Outdated
| .format(list(kwargs.keys())[0])) | ||
| return FeatureUnion(_name_estimators(transformers), n_jobs=n_jobs) | ||
| raise TypeError('Unknown keyword arguments: "{}"'.format( | ||
| list(kwargs.keys())[0])) |
NicolasHug
reviewed
Apr 14, 2019
| [est for _, est in self.steps[:step_idx + 1] if est is not None]) | ||
| return '(step %d of %d) Fitting %s' % (step_num, n_steps, | ||
| self.steps[step_idx][0]) | ||
|
|
||
| # Estimator interface | ||
|
|
||
| def _fit(self, X, y=None, **fit_params): |
There was a problem hiding this comment.
Not strictly related to this PR, but I find it confusing that this is called _fit while it actually does some transforming jobs as well.
There was a problem hiding this comment.
Mind as well call it _fit_transform or if we want to be more specific: _fit_transform_without_final :)
There was a problem hiding this comment.
_fit_transform_without_final sounds great to me
NicolasHug
reviewed
Apr 15, 2019
|
This PR has been updated to use the phrase "Processing _____" when returning the verbose output. |
NicolasHug
approved these changes
Apr 18, 2019
sklearn/pipeline.py
Outdated
| Xt = last_step.fit_transform(Xt, y, **fit_params) | ||
| else: | ||
| Xt = last_step.fit(Xt, y, **fit_params).transform(Xt) | ||
| return Xt |
There was a problem hiding this comment.
Maybe we should use
if... :
return Xt
elif...:
return ...
else:
return ...
sklearn/pipeline.py
Outdated
| """ | ||
| Fits ``transformer`` to ``X`` and ``y``. The transformed result is returned | ||
| with the fitted transformer. If ``weight`` is not ``None``, the result will | ||
| be multipled by ``weight``. |
There was a problem hiding this comment.
Suggested change
| be multipled by ``weight``. | |
| be multiplied by ``weight``. |
|
Let's ship it! Thanks for wrapping it up, @thomasjpfan |
jeremiedbb
pushed a commit
to jeremiedbb/scikit-learn
that referenced
this pull request
Apr 25, 2019
xhluca
pushed a commit
to xhluca/scikit-learn
that referenced
this pull request
Apr 28, 2019
xhluca
pushed a commit
to xhluca/scikit-learn
that referenced
this pull request
Apr 28, 2019
…ransformer (scikit-learn#11364)" This reverts commit bed12f6.
xhluca
pushed a commit
to xhluca/scikit-learn
that referenced
this pull request
Apr 28, 2019
…ransformer (scikit-learn#11364)" This reverts commit bed12f6.
koenvandevelde
pushed a commit
to koenvandevelde/scikit-learn
that referenced
this pull request
Jul 12, 2019
hannahbrucemacdonald
added a commit
to hannahbrucemacdonald/scikit-learn
that referenced
this pull request
Aug 24, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reference Issues/PRs
Continues work on PR #10435.
Fixes #9668. Fixes #8568. Fixes #5298. Fixes #5321.
What does this implement/fix? Explain your changes.
Adapts the new functions in
pipeline.pyto work withColumnTransformer.