[MRG] Add support for 64 bit indices in CSR array normalization#9663
Merged
jnothman merged 1 commit intoscikit-learn:masterfrom Sep 5, 2017
Merged
[MRG] Add support for 64 bit indices in CSR array normalization#9663jnothman merged 1 commit intoscikit-learn:masterfrom
jnothman merged 1 commit intoscikit-learn:masterfrom
Conversation
jnothman
reviewed
Sep 1, 2017
Member
jnothman
left a comment
There was a problem hiding this comment.
LGTM, thanks!
Please add to what's new... ideally listing which estimators can now handle the large CSR data, but perhaps then we need a test for them. Hmm.
Member
Author
|
@jnothman Thanks for the review! Maybe we could add the "what's new" entry once we actually have a mechanism for testing estimators with 64bit csr as you suggested here #2969 (comment) . Working on that.. |
ogrisel
approved these changes
Sep 1, 2017
Member
ogrisel
left a comment
There was a problem hiding this comment.
LGTM. +1 as well for waiting to use that in actual estimator before adding an entry in changelog.
Member
Author
|
@jnothman Please let me know if you have other comments on this PR. Thanks! |
Member
|
Okay. You just make sure the changelog is appropriately attributed, etc. Thanks again @rth |
massich
pushed a commit
to massich/scikit-learn
that referenced
this pull request
Sep 15, 2017
maskani-moh
pushed a commit
to maskani-moh/scikit-learn
that referenced
this pull request
Nov 15, 2017
jwjohnson314
pushed a commit
to jwjohnson314/scikit-learn
that referenced
this pull request
Dec 18, 2017
9 tasks
This file contains hidden or 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
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.
This adds fused type to support 64 bit indices in
csr_row_norms,inplace_csr_row_normalize_l1andinplace_csr_row_normalize_l2.Fixes #6468 andbegins to adress #2969 .In this PR, for CSR array indices I define a fused
integraltype (int,long long) which should produce either 32 bit and 64 bit respectively on Linux / Windows and 64bit / 32bit platforms as far as I understand. The array indices variables are alwaysnp.npy_intp, while the array shapes(M, N)arelong longto support up to 64 bit array sizes. Please let me know if I missed something.cc @jnothman @lesteve @ogrisel
Also tested that the performance is not affected (with 32bit CSR indices) using the following script (needs to be run with ipython),