/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+3] Fused types for MultiTaskElasticNet #8061

Merged
merged 8 commits into from Dec 28, 2016

Conversation

Reviewers

@fabianp fabianp

@raghavrv raghavrv

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
6 participants
@tguillemot @raghavrv @amueller @agramfort @TomDLT @fabianp
@tguillemot
Contributor

tguillemot commented Dec 15, 2016 •
edited

Reference Issue

This PR is a continuation of the work initiate by #6913.

What does this implement/fix? Explain your changes.

I've modified MultiTaskElasticNet to allow np.float32 for the computation.

Here are the memory profiling results when fitting np.float32 data:

  • master
    master

  • this branch
    branch

@jnothman @amueller Do you have some time to review that PR please :) ? It's big because of the cblas file I needed to add.
Show outdated Hide outdated sklearn/src/cblas/cblas_sscal.c
@raghavrv

This comment has been minimized.

Show comment
Hide comment
@raghavrv

raghavrv Dec 15, 2016

Member

Ping myself I'll review this in a while. (This weekend hopefully, Masters application is consuming a lot of my time :/)
Member

raghavrv commented Dec 15, 2016

Ping myself I'll review this in a while. (This weekend hopefully, Masters application is consuming a lot of my time :/)
@tguillemot

This comment has been minimized.

Show comment
Hide comment
@tguillemot

tguillemot Dec 15, 2016

Contributor

Don't worry @raghavrv, this PR will not escape :).
Good luck for masters application.
Contributor

tguillemot commented Dec 15, 2016

Don't worry @raghavrv, this PR will not escape :).
Good luck for masters application.
@amueller

This comment has been minimized.

Show comment
Hide comment
@amueller

amueller Dec 16, 2016

Member

This looks sweet, but probably not this year :-/
Member

amueller commented Dec 16, 2016

This looks sweet, but probably not this year :-/
@agramfort

This comment has been minimized.

Show comment
Hide comment
@agramfort

agramfort Dec 17, 2016

Member

looks clean to me. Tests pass and there is no algorithmic change.

+1 for merge

nice job @tguillemot
Member

agramfort commented Dec 17, 2016

looks clean to me. Tests pass and there is no algorithmic change.

+1 for merge

nice job @tguillemot

@agramfort agramfort changed the title from [MRG] Fused types for MultiTaskElasticNet to [MRG+1] Fused types for MultiTaskElasticNet Dec 17, 2016

@tguillemot

This comment has been minimized.

Show comment
Hide comment
@tguillemot

tguillemot Dec 19, 2016

Contributor

Thx @agramfort.
Maybe @raghavrv @TomDLT if you have a few time ?
Contributor

tguillemot commented Dec 19, 2016

Thx @agramfort.
Maybe @raghavrv @TomDLT if you have a few time ?
@TomDLT

This comment has been minimized.

Show comment
Hide comment
@TomDLT

TomDLT Dec 19, 2016

Member

LGTM, except for this comment #8061 (comment).
We need either the original file, or a comment in the file explaining your change.

ping @fabianp
Member

TomDLT commented Dec 19, 2016 •
edited

LGTM, except for this comment #8061 (comment).
We need either the original file, or a comment in the file explaining your change.

ping @fabianp
@raghavrv

This comment has been minimized.

Show comment
Hide comment
@raghavrv

raghavrv Dec 19, 2016

Member

Looks good to me as well. Amazing job! Thx
Member

raghavrv commented Dec 19, 2016

Looks good to me as well. Amazing job! Thx
@agramfort

This comment has been minimized.

Show comment
Hide comment
@agramfort

agramfort Dec 21, 2016

Member

@tguillemot tell us when blas issue is sorted. If it is +1 for merge
Member

agramfort commented Dec 21, 2016

@tguillemot tell us when blas issue is sorted. If it is +1 for merge

@TomDLT TomDLT changed the title from [MRG+1] Fused types for MultiTaskElasticNet to [MRG+3] Fused types for MultiTaskElasticNet Dec 21, 2016

@tguillemot
Update cblas_sscal.c
Loading status checks…
cea699d
@raghavrv

This comment has been minimized.

Show comment
Hide comment
@raghavrv

raghavrv Dec 28, 2016

Member

cblas_sscal.c is updated and all tests seem to pass cleanly. Thx @tguillemot... Merging this...
Member

raghavrv commented Dec 28, 2016

cblas_sscal.c is updated and all tests seem to pass cleanly. Thx @tguillemot... Merging this...

@raghavrv raghavrv merged commit fcb706a into scikit-learn:master Dec 28, 2016
3 checks passed

3 checks passed

ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@tguillemot

This comment has been minimized.

Show comment
Hide comment
@tguillemot

tguillemot Dec 28, 2016

Contributor

@raghavrv You are faster than my messages. Thanks.

Sorry for the delay everyone.
Contributor

tguillemot commented Dec 28, 2016

@raghavrv You are faster than my messages. Thanks.

Sorry for the delay everyone.

sergeyf added a commit to sergeyf/scikit-learn that referenced this pull request Feb 28, 2017

@tguillemot @sergeyf
[MRG+3] Fused types for MultiTaskElasticNet (#8061) 
* Convert ElasticNet Multioutput to floating.

* Remove all the float64 coordinate_descent.

* Add the necessary cblas for use fused types.

* Fix zeros dtype issue in cd_fast.

* Remove cblas files.

* Change random seed to let test_lle_simple_grid pass.

* Add tests to check floatting issue for MultiTaskElasticNet.

* Update cblas_sscal.c
4a90032

@Przemo10 Przemo10 referenced this pull request Mar 17, 2017

Closed

update fork (#1) #8606

Sundrique added a commit to Sundrique/scikit-learn that referenced this pull request Jun 14, 2017

@tguillemot @Sundrique
[MRG+3] Fused types for MultiTaskElasticNet (#8061) 
* Convert ElasticNet Multioutput to floating.

* Remove all the float64 coordinate_descent.

* Add the necessary cblas for use fused types.

* Fix zeros dtype issue in cd_fast.

* Remove cblas files.

* Change random seed to let test_lle_simple_grid pass.

* Add tests to check floatting issue for MultiTaskElasticNet.

* Update cblas_sscal.c
b3cf058

NelleV added a commit to NelleV/scikit-learn that referenced this pull request Aug 11, 2017

@tguillemot @NelleV
[MRG+3] Fused types for MultiTaskElasticNet (#8061) 
* Convert ElasticNet Multioutput to floating.

* Remove all the float64 coordinate_descent.

* Add the necessary cblas for use fused types.

* Fix zeros dtype issue in cd_fast.

* Remove cblas files.

* Change random seed to let test_lle_simple_grid pass.

* Add tests to check floatting issue for MultiTaskElasticNet.

* Update cblas_sscal.c
0410331

paulha added a commit to paulha/scikit-learn that referenced this pull request Aug 19, 2017

@tguillemot @paulha
[MRG+3] Fused types for MultiTaskElasticNet (#8061) 
* Convert ElasticNet Multioutput to floating.

* Remove all the float64 coordinate_descent.

* Add the necessary cblas for use fused types.

* Fix zeros dtype issue in cd_fast.

* Remove cblas files.

* Change random seed to let test_lle_simple_grid pass.

* Add tests to check floatting issue for MultiTaskElasticNet.

* Update cblas_sscal.c
fa738ab

maskani-moh added a commit to maskani-moh/scikit-learn that referenced this pull request Nov 15, 2017

@tguillemot @maskani-moh
[MRG+3] Fused types for MultiTaskElasticNet (#8061) 
* Convert ElasticNet Multioutput to floating.

* Remove all the float64 coordinate_descent.

* Add the necessary cblas for use fused types.

* Fix zeros dtype issue in cd_fast.

* Remove cblas files.

* Change random seed to let test_lle_simple_grid pass.

* Add tests to check floatting issue for MultiTaskElasticNet.

* Update cblas_sscal.c
72ad874
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment