assumed size array handling for 'normalize_array_shape_and_access' #218
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
|
Documentation for this branch can be viewed at https://sites.ecmwf.int/docs/loki/218/index.html |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #218 +/- ##
=======================================
Coverage 92.26% 92.26%
=======================================
Files 96 96
Lines 17124 17135 +11
=======================================
+ Hits 15799 15810 +11
Misses 1325 1325
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
reuterbal
requested changes
Jan 25, 2024
Comment on lines
507
to
508
| return (isinstance(dim, sym.RangeIndex) and not dim.lower == 1 and not dim is None | ||
| and not dim.lower is None and not dim.upper is None) |
There was a problem hiding this comment.
This expression looks odd, I think it could be simplified:
Suggested change
| return (isinstance(dim, sym.RangeIndex) and not dim.lower == 1 and not dim is None | |
| and not dim.lower is None and not dim.upper is None) | |
| return isinstance(dim, sym.RangeIndex) and not (dim.lower == 1 or dim.lower is None or dim.upper is None) |
|
|
||
| vmap = {} | ||
| for v in FindVariables(unique=False).visit(routine.body): | ||
| if isinstance(v, sym.Array): | ||
| # skip if e.g., `array(len)`, passed as `call routine(array)` | ||
| if len(v.shape) != len(v.dimensions): |
There was a problem hiding this comment.
Shouldn't the only case be that v.dimensions is None? Otherwise, shape and dimensions should match or there's something fishy anyway.
|
|
||
| def validate_routine(routine): | ||
| arrays = [var for var in FindVariables().visit(routine.body) if isinstance(var, Array)] | ||
| for arr in arrays: | ||
| # print(f"arr: {arr} | {all(not isinstance(shape, sym.RangeIndex) for shape in arr.shape)}") |
There was a problem hiding this comment.
Suggested change
| # print(f"arr: {arr} | {all(not isinstance(shape, sym.RangeIndex) for shape in arr.shape)}") |
reuterbal
approved these changes
Jan 26, 2024
reuterbal
added
the
ready for merge
mlange05
approved these changes
Jan 31, 2024
mlange05
deleted the
nams_assumed_size_normalize_array_shape_and_access
branch
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.
normalize_array_shape_and_access()didn't handle assumed size arrays correctly.This is a proposed fix/extension.