CLN: allow label memviews to be None #42260
Merged
Conversation
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
mzeitlin11
added
the
Algos
pandas/_libs/algos.pyx
Outdated
| rankedy = rank_1d(np.array(maskedy)[:nobs], | ||
| labels=labels_nobs) | ||
| rankedx = rank_1d(np.array(maskedx)[:nobs]) | ||
| rankedy = rank_1d(np.array(maskedy)[:nobs]) |
There was a problem hiding this comment.
not sure if it makes a difference, but np.array -> np.asarray?
There was a problem hiding this comment.
good catch, was an oversight no reason to copy here
| const intp_t[:] sort_indexer, | ||
| # Can make const with cython3 (https://github.com/cython/cython/issues/3222) | ||
| rank_t[:] masked_vals, | ||
| const uint8_t[:] mask, | ||
| TiebreakEnumType tiebreak, |
There was a problem hiding this comment.
as long as you're shifting these around, can you make everything from here-ish on keyword-only
There was a problem hiding this comment.
I don't think cdef functions support keyword-only enforced by "*" (unless you have a workaround, I just tried and saw a cython compile error :)
Changed callers to treat it as keyword-only from after mask, though, which should help
|
Small comments, generally looks very nice |
|
thanks @mzeitlin11 |
JulianWgs
pushed a commit
to JulianWgs/pandas
that referenced
this pull request
Jul 3, 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.
Saves some unnecessary memory allocations, plus moving towards making
rank_sorted_1deasier to call. Also have done something similar for allowingmaskto be None, but split that off this pr to keep it simpler.