Fix bug in AdvancedSubtensor infer_shape #101
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
The underlying utility `indexed_result_shape` was off by 1 in terms of when do the advanced index operations have to be brought to the front of the array.
aseyboldt
approved these changes
Dec 9, 2022
pytensor/tensor/subtensor.py
Outdated
| @@ -489,8 +489,10 @@ def indexed_result_shape(array_shape, indices, indices_are_shapes=False): | |||
| remaining_dims = range(pytensor.tensor.basic.get_vector_length(array_shape)) | |||
| idx_groups = group_indices(indices) | |||
|
|
|||
| if len(idx_groups) > 2 or len(idx_groups) > 1 and not idx_groups[0][0]: | |||
| # Bring adv. index groups to the front and merge each group | |||
| if len(idx_groups) > 3 or len(idx_groups) == 3 and not idx_groups[0][0]: | |||
There was a problem hiding this comment.
I had to look up operator precedence for and and or here. :-)
Turns out and has higher precedence, which I think is correct here.
Is that just me, or should we maybe add parenthesis here to make it obvious?
There was a problem hiding this comment.
Always in favor of parenthesis. Brings us closer to lisp!
ricardoV94
commented
Dec 9, 2022
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #101 +/- ##
==========================================
- Coverage 80.42% 74.26% -6.17%
==========================================
Files 170 175 +5
Lines 45376 48929 +3553
Branches 11082 10395 -687
==========================================
- Hits 36495 36335 -160
- Misses 6654 10291 +3637
- Partials 2227 2303 +76
|
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.
The underlying utility
indexed_result_shapewas off by 1 in terms of when do the advanced index operations have to be brought to the front of the array.Closes #98