-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
BUG: Fix group index calculation to prevent hitting maximum recursion depth (#21524) #21541
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
Changes from all commits
ee30e60
91a284e
fac97d5
7e9f315
727e654
befa65d
c02b188
eebb8cf
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -52,7 +52,21 @@ def _int64_cut_off(shape): | |
return i | ||
return len(shape) | ||
|
||
def loop(labels, shape): | ||
def maybe_lift(lab, size): | ||
# promote nan values (assigned -1 label in lab array) | ||
# so that all output values are non-negative | ||
return (lab + 1, size + 1) if (lab == -1).any() else (lab, size) | ||
|
||
labels = map(_ensure_int64, labels) | ||
if not xnull: | ||
labels, shape = map(list, zip(*map(maybe_lift, labels, shape))) | ||
|
||
labels = list(labels) | ||
shape = list(shape) | ||
|
||
# Iteratively process all the labels in chunks sized so less | ||
# than _INT64_MAX unique int ids will be required for each chunk | ||
while True: | ||
# how many levels can be done without overflow: | ||
nlev = _int64_cut_off(shape) | ||
|
||
|
@@ -74,7 +88,7 @@ def loop(labels, shape): | |
out[mask] = -1 | ||
|
||
if nlev == len(shape): # all levels done! | ||
return out | ||
break | ||
|
||
# compress what has been done so far in order to avoid overflow | ||
# to retain lexical ranks, obs_ids should be sorted | ||
|
@@ -83,16 +97,7 @@ def loop(labels, shape): | |
labels = [comp_ids] + labels[nlev:] | ||
shape = [len(obs_ids)] + shape[nlev:] | ||
|
||
return loop(labels, shape) | ||
|
||
def maybe_lift(lab, size): # pormote nan values | ||
return (lab + 1, size + 1) if (lab == -1).any() else (lab, size) | ||
|
||
labels = map(_ensure_int64, labels) | ||
if not xnull: | ||
labels, shape = map(list, zip(*map(maybe_lift, labels, shape))) | ||
|
||
return loop(list(labels), list(shape)) | ||
return out | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. does out need a definition outside of the loop? e.g. is it always defined There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. it is always defined here - out is assigned before the exit from the loop can happen. |
||
|
||
|
||
def get_compressed_ids(labels, sizes): | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you comment on the purpose of the loop
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would try, though I'm not the author of original code - I've just changed it from recursion to loop, so I can't be sure I understand 100% all the nuances here...