Skip to content

/ scikit-learn

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.

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

[MRG] Support for list of lists or list of arrays multilabel indicator (continuation) #14865

Merged
merged 33 commits into from Oct 25, 2019
Merged

[MRG] Support for list of lists or list of arrays multilabel indicator (continuation) #14865

merged 33 commits into from Oct 25, 2019

Conversation

@leonardbinet
Copy link
Contributor

leonardbinet commented Sep 1, 2019

Reference Issues/PRs

Rebase of #9158 to solve #7931

What does this implement/fix? Explain your changes.

Any other comments?
@leonardbinet leonardbinet mentioned this pull request Sep 1, 2019
Closed
@leonardbinet
leonardbinet reviewed Sep 1, 2019
View changes
sklearn/utils/estimator_checks.py Outdated Show resolved Hide resolved
@jnothman

This comment has been minimized.

Sign in to view
Copy link
Member

jnothman commented Sep 1, 2019

Yes, let's do this!
@jnothman
jnothman reviewed Sep 2, 2019
View changes
Copy link
Member

jnothman left a comment

Test failures...
sklearn/utils/multiclass.py Outdated Show resolved Hide resolved
@leonardbinet leonardbinet force-pushed the leonardbinet:fix_is_multilabel branch from 064ce44 to 04c4265 Sep 2, 2019
@leonardbinet leonardbinet changed the title [WIP] Support for list of lists or list of arrays multilabel indicator (continuation) [MRG] Support for list of lists or list of arrays multilabel indicator (continuation) Sep 2, 2019
@leonardbinet

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

leonardbinet commented Sep 2, 2019

@jnothman, fixed it
@jnothman
jnothman reviewed Sep 5, 2019
View changes
Copy link
Member

jnothman left a comment

Thanks, it's looking pretty good.

Please add an Enhancement entry to the change log at doc/whats_new/v0.22.rst. Like the other entries there, please reference this pull request with :pr: and credit yourself (and other contributors if applicable) with :user:
sklearn/preprocessing/tests/test_label.py Outdated Show resolved Hide resolved
sklearn/metrics/tests/test_common.py Outdated Show resolved Hide resolved
sklearn/tree/tests/test_tree.py Outdated Show resolved Hide resolved
sklearn/utils/tests/test_estimator_checks.py Outdated Show resolved Hide resolved
@leonardbinet leonardbinet force-pushed the leonardbinet:fix_is_multilabel branch 3 times, most recently from 0d3797a to e18e836 Sep 7, 2019
@jnothman jnothman mentioned this pull request Sep 8, 2019
Open
@jnothman

This comment has been minimized.

Sign in to view
Copy link
Member

jnothman commented Sep 8, 2019

Please append commits rather than force pushing. Much easier to see changes between reviews that way
@jnothman
jnothman reviewed Sep 8, 2019
View changes
doc/whats_new/v0.22.rst Outdated Show resolved Hide resolved
doc/whats_new/v0.22.rst Outdated
:pr:`14336` by :user:`Gregory Dexter <gdex1>`.

- |Enhancement| label_binarize now supports list of lists for multilabel data

This comment has been minimized.

Sign in to view
Copy link
@jnothman

jnothman Sep 8, 2019

Member

Might be more helpful to advertise the changes in terms of how they affect metrics and other users of type_of_target

This comment has been minimized.

Sign in to view
Copy link
@leonardbinet

leonardbinet Sep 8, 2019

Author Contributor

how would you put it? one entry per impacted function or a more generic explanation on what is considered as multiclass-multioutput/multilabel-indicator?
@jnothman

This comment has been minimized.

Sign in to view
Copy link
Member

jnothman commented Sep 8, 2019

I've not looked at the code or codecov's complaint this time
@leonardbinet leonardbinet force-pushed the leonardbinet:fix_is_multilabel branch from 589c621 to 42bd1f5 Sep 8, 2019
@jnothman

This comment has been minimized.

Sign in to view
Copy link
Member

jnothman commented Sep 8, 2019

@jnothman
jnothman reviewed Sep 9, 2019
View changes
sklearn/preprocessing/tests/test_label.py Outdated Show resolved Hide resolved
sklearn/metrics/tests/test_common.py Show resolved Hide resolved
doc/whats_new/v0.22.rst Outdated Show resolved Hide resolved
@leonardbinet

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

leonardbinet commented Sep 9, 2019

thanks for your help and patience @jnothman, you're the victim of my first contribution to scikit-learn 😅
@jnothman

This comment has been minimized.

Sign in to view
Copy link
Member

jnothman commented Sep 9, 2019

I'm very happy you're finishing this off. It's something we should have done years ago, having removed sequence of sequence support around 2015
@jnothman

This comment has been minimized.

Sign in to view
Copy link
Member

jnothman commented Sep 10, 2019 

sklearn/preprocessing/tests/test_label.py:27:1: F401 'sklearn.utils.testing.assert_raises' imported but unused
from sklearn.utils.testing import assert_raises, assert_raise_message
@jnothman
jnothman approved these changes Sep 10, 2019
View changes
Copy link
Member

jnothman left a comment

Otherwise lgtm
sklearn/preprocessing/tests/test_label.py Outdated Show resolved Hide resolved
@jnothman

This comment has been minimized.

Sign in to view
Copy link
Member

jnothman commented Sep 10, 2019

It looks like you've introduced a syntax error. And it's worth looking at the codecov error
@jnothman

This comment has been minimized.

Sign in to view
Copy link
Member

jnothman commented Sep 10, 2019

Maybe merging in the latest master will fix the codecov issue
@srivatsan-ramesh @leonardbinet
added list of list and list of array support for multilabel indicator
358909d
@srivatsan-ramesh @leonardbinet
tests for multilabel list-list or list-array indicator
79e09a5
@srivatsan-ramesh @leonardbinet
changed an example in type_of_target
b15bb17
@srivatsan-ramesh @leonardbinet
Test for multilabel-indicator representation invariance in OvR
742def3
alk-lbinet and others added 11 commits Sep 2, 2019
@alk-lbinet @leonardbinet
remove deprecated test
09f1f3e
@alk-lbinet @leonardbinet
remove multioutput tag
e819614
@alk-lbinet @leonardbinet
remove deprecated test skip
0df8ab1
@alk-lbinet @leonardbinet
rst doc
06177ec
@alk-lbinet @leonardbinet
is_multilabel tests for lists of lists
1c0e094
@alk-lbinet @leonardbinet
include other contributors in credits
4f10aac
@leonardbinet
update changelog
2997d1e
@leonardbinet
update changelog
ad73ccd
@leonardbinet
pytest preferred
98afb43
@leonardbinet
reintroduce test, without first now-valid sample
ff529ab
@leonardbinet
update test_label to use preferred pytest.raises
Loading status checks…
51b127a
@leonardbinet leonardbinet force-pushed the leonardbinet:fix_is_multilabel branch from 321f598 to 51b127a Sep 10, 2019
@NicolasHug
NicolasHug approved these changes Oct 16, 2019
View changes
Copy link
Contributor

NicolasHug left a comment

Thanks @leonardbinet , only super nitpicks from me

The PR has merge conflicts but apart from that LGTM
sklearn/utils/multiclass.py Outdated Show resolved Hide resolved
sklearn/utils/estimator_checks.py Outdated Show resolved Hide resolved
sklearn/utils/multiclass.py
@@ -227,7 +228,7 @@ def type_of_target(y):
>>> type_of_target(np.array([[1, 2], [3, 1]]))
'multiclass-multioutput'
>>> type_of_target([[1, 2]])
'multiclass-multioutput'
'multilabel-indicator'

This comment has been minimized.

Sign in to view
Copy link
@NicolasHug

NicolasHug Oct 16, 2019

Contributor

question: is this a bugfix?

This comment has been minimized.

Sign in to view
Copy link
@jnothman

jnothman Oct 17, 2019

Member

It is more-or-less a bug fix. Either way, type_of_target is expected to return "the most specific type that can be inferred". Multilabel is a specific subtype of multiclass-multioutput. So this is correct
@jnothman

This comment has been minimized.

Sign in to view
Copy link
Member

jnothman commented Oct 23, 2019

@leonardbinet please resolve conflicts with master and address @NicolasHug's teeny weeny comments so that we can merge this for release. If that's looking unlikely in the next week or so, please let us know.
@leonardbinet

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

leonardbinet commented Oct 24, 2019

@jnothman @NicolasHug sure, thanks for your feedbacks I'll fix this this week-end
@leonardbinet leonardbinet force-pushed the leonardbinet:fix_is_multilabel branch 7 times, most recently from f0d8b94 to a71cac1 Oct 24, 2019
@leonardbinet
Merge branch 'master' of github.com:scikit-learn/scikit-learn into fi…
Loading status checks…
84f2681 
…x_is_multilabel
@leonardbinet leonardbinet force-pushed the leonardbinet:fix_is_multilabel branch from a71cac1 to 84f2681 Oct 24, 2019
@leonardbinet
remove unnecessary line
Loading status checks…
9f73bf2
@jnothman

This comment has been minimized.

Sign in to view
Copy link
Member

jnothman commented Oct 25, 2019

@leonardbinet, force pushing makes it much harder for reviewers to track what changes have occurred since last review.
@jnothman jnothman merged commit 846e6a3 into scikit-learn:master Oct 25, 2019
18 of 19 checks passed
18 of 19 checks passed
codecov/patch 50% of diff hit (target 97.21%)
Details
LGTM analysis: C/C++ No code changes detected
Details
LGTM analysis: JavaScript No code changes detected
Details
LGTM analysis: Python 2 fixed alerts
Details
ci/circleci: deploy Your tests passed on CircleCI!
Details
ci/circleci: doc Your tests passed on CircleCI!
Details
ci/circleci: doc artifact Link to 0/doc/_changed.html
Details
ci/circleci: doc-min-dependencies Your tests passed on CircleCI!
Details
ci/circleci: lint Your tests passed on CircleCI!
Details
codecov/project 97.2% (-0.02%) compared to 7462186
Details
scikit-learn.scikit-learn Build #20191024.71 succeeded
Details
scikit-learn.scikit-learn (Linux py35_conda_openblas) Linux py35_conda_openblas succeeded
Details
scikit-learn.scikit-learn (Linux py35_ubuntu_atlas) Linux py35_ubuntu_atlas succeeded
Details
scikit-learn.scikit-learn (Linux pylatest_conda_mkl) Linux pylatest_conda_mkl succeeded
Details
scikit-learn.scikit-learn (Linux pylatest_pip_openblas_pandas) Linux pylatest_pip_openblas_pandas succeeded
Details
scikit-learn.scikit-learn (Linux32 py35_ubuntu_atlas_32bit) Linux32 py35_ubuntu_atlas_32bit succeeded
Details
scikit-learn.scikit-learn (Windows py35_pip_openblas_32bit) Windows py35_pip_openblas_32bit succeeded
Details
scikit-learn.scikit-learn (Windows py37_conda_mkl) Windows py37_conda_mkl succeeded
Details
scikit-learn.scikit-learn (macOS pylatest_conda_mkl) macOS pylatest_conda_mkl succeeded
Details
@jnothman

This comment has been minimized.

Sign in to view
Copy link
Member

jnothman commented Oct 25, 2019

Thank you @leonardbinet, @herilalaina and @srivatsan-ramesh!!
@jnothman jnothman mentioned this pull request Oct 27, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jnothman jnothman

@NicolasHug NicolasHug

Assignees
No one assigned
Labels
High Priority Waiting for Reviewer
Projects
None yet
Milestone
No milestone
6 participants
@leonardbinet @jnothman @NicolasHug @srivatsan-ramesh @herilalaina @alk-lbinet
You can’t perform that action at this time.