Skip to content
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

Jump to bottom

[MRG] MAINT sync/add support sample_weight with liblinear #15038

Merged
merged 15 commits into from Oct 25, 2019
Merged

[MRG] MAINT sync/add support sample_weight with liblinear #15038

merged 15 commits into from Oct 25, 2019

Conversation

glemaitre
Copy link
Contributor

@glemaitre glemaitre commented Sep 20, 2019

Add support for sample_weight for the loss/penalty in liblinear.

Hopefully it will close:
closes #10873
closes #15018

@glemaitre glemaitre changed the title [WIP] MAINT sync/add support sample_weight with liblinear [MRG] MAINT sync/add support sample_weight with liblinear Sep 20, 2019
@glemaitre glemaitre added this to WAITING FOR REVIEW in Guillaume's pet Sep 20, 2019
@glemaitre
Copy link
Contributor Author

@glemaitre glemaitre commented Sep 20, 2019

@amueller you might want to have a look at that

adrinjalali
adrinjalali reviewed Oct 2, 2019
View changes
Copy link
Member

@adrinjalali adrinjalali left a comment

Not a complete review, but looks pretty good.

sklearn/svm/src/liblinear/linear.cpp Outdated Show resolved Hide resolved
sklearn/svm/src/liblinear/linear.cpp Show resolved Hide resolved
sklearn/svm/src/liblinear/linear.cpp Show resolved Hide resolved
sklearn/svm/src/liblinear/linear.cpp Show resolved Hide resolved
@adrinjalali adrinjalali self-assigned this Oct 4, 2019
@glemaitre
Copy link
Contributor Author

@glemaitre glemaitre commented Oct 22, 2019

@adrinjalali any other comments?

jnothman
jnothman reviewed Oct 23, 2019
View changes
Copy link
Member

@jnothman jnothman left a comment

I can confirm the tests fail in master...

adrinjalali
adrinjalali approved these changes Oct 23, 2019
View changes
Copy link
Member

@adrinjalali adrinjalali left a comment

nits, otherwise, as far as I can tell, this looks good.

sklearn/linear_model/tests/test_logistic.py Show resolved Hide resolved
sklearn/svm/tests/test_svm.py Show resolved Hide resolved
jnothman
jnothman approved these changes Oct 24, 2019
View changes
Copy link
Member

@jnothman jnothman left a comment

I've checked the C code looks reasonably safe.... and that the tests are valid... I'd do better to compare to upstream, but I'm okay to see this merged.

@adrinjalali
Copy link
Member

@adrinjalali adrinjalali commented Oct 24, 2019

Just realized this kinda needs a whats_new entry.

NicolasHug
NicolasHug reviewed Oct 24, 2019
View changes
doc/whats_new/v0.22.rst Outdated Show resolved Hide resolved
glemaitre and others added 3 commits Oct 25, 2019
@NicolasHug NicolasHug merged commit 2b60d32 into scikit-learn:master Oct 25, 2019
19 checks passed
@NicolasHug
Copy link
Member

@NicolasHug NicolasHug commented Oct 25, 2019

Thanks @glemaitre !

@glemaitre glemaitre moved this from WAITING FOR REVIEW to WAITING FOR CONSENSUS in Guillaume's pet Oct 25, 2019
@glemaitre glemaitre moved this from WAITING FOR CONSENSUS to MERGED in Guillaume's pet Oct 25, 2019
@amueller
Copy link
Member

@amueller amueller commented Oct 28, 2019

Sweet!

@csbrown
Copy link

@csbrown csbrown commented Dec 2, 2019

Is this functionality in any of the stable sklearn releases? What should I upgrade to?

@NicolasHug
Copy link
Member

@NicolasHug NicolasHug commented Dec 2, 2019

Not yet. The new release should be out this week

@csbrown
Copy link

@csbrown csbrown commented Dec 2, 2019

Also, would anyone be keen on updating the old docs to mention the fact that sample_weight does nothing at all?

@glemaitre
Copy link
Contributor Author

@glemaitre glemaitre commented Dec 2, 2019

Also, would anyone be keen on updating the old docs to mention the fact that sample_weight does nothing at all?

Since this is a bug, it would be better to backport the fix. But we will probably release tomorrow, not sure that it would be worth.

samj1912 added a commit to samj1912/scikit-learn that referenced this issue Dec 12, 2019
@samj1912
Include LinearSV{M, R} in models that support sample_weights
a911403 
With the latest release of sklearn, we have merged scikit-learn#15038
which officially adds support for sample weights to these models. Let's update the docs to reflect this.
@samj1912 samj1912 mentioned this pull request Dec 12, 2019
Merged
samj1912 added a commit to samj1912/scikit-learn that referenced this issue Dec 12, 2019
@samj1912
Include LinearSV{C, R} in models that support sample_weights
f3ecaf5 
With the latest release of sklearn, we have merged scikit-learn#15038
which officially adds support for sample weights to these models. Let's update the docs to reflect this.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NicolasHug NicolasHug

@jnothman jnothman

@adrinjalali adrinjalali

Assignees

@adrinjalali adrinjalali

Labels
None yet
Projects
Guillaume's pet
MERGED
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

LinearSVC ignores sample weights
6 participants
@glemaitre @adrinjalali @NicolasHug @amueller @csbrown @jnothman