allow for use of different dtypes in coords, indices, and indptr #441
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
Codecov Report
@@ Coverage Diff @@
## master #441 +/- ##
==========================================
+ Coverage 95.37% 95.61% +0.23%
==========================================
Files 19 20 +1
Lines 2809 2939 +130
==========================================
+ Hits 2679 2810 +131
+ Misses 130 129 -1 |
hameerabbasi
requested changes
Mar 12, 2021
There was a problem hiding this comment.
A general comment: We should strive for 100% test coverage. If we cannot hit a line with a test, it is probably dead code anyway. In this particular instance, I see that most of the code here can be hit; but I'd like to see it tested since this is a major feature/refactor.
hameerabbasi
requested changes
Mar 13, 2021
| @@ -93,6 +96,9 @@ def stack(arrays, axis=0, compressed_axes=None): | |||
| data = np.concatenate([arr.data for arr in arrays]) | |||
| ptr_len = arrays[0].indptr.shape[0] | |||
| nnz = arrays[0].nnz | |||
| total_nnz = sum(int(arr.nnz) for arr in arrays) | |||
| if not can_store(indptr.dtype, total_nnz): | |||
| indptr = indptr.astype(np.min_scalar_type(total_nnz)) | |||
There was a problem hiding this comment.
This branch needs hitting or removing.
| @@ -49,16 +50,28 @@ def _from_coo(x, compressed_axes=None): | |||
| compressed_shape = (row_size, col_size) | |||
| shape = x.shape | |||
|
|
|||
| if storage_dtype and not can_store(storage_dtype, max(compressed_shape)): | |||
| raise ValueError( | |||
| if can_store(storage_dtype, max(shape)): | ||
| ar.coords = ar.coords.astype(storage_dtype) | ||
| else: | ||
| raise ValueError( |
|
Thanks for looking into this more @daletovar! Minor naming suggestion: something like |
hameerabbasi
approved these changes
Mar 16, 2021
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.
In this version, I've added a
storage_dtypeargument in theCOOandGCXSconstructors. For most operations, the result array will use the same storage dtype as the input array. There are a few places where the output is upcast to a larger dtype if the input dtype is too small. I decided to do this because in these situations no error is raised and the output is simply wrong. Where it doesn't make sense to upcast, I have it raise an error.