feature[next]: Extend cartesian offset syntax #1484
Merged
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
tehrengruber
changed the title
…handle several arguments
… 1 + 2 and some mypy fixes
havogt
requested changes
Apr 11, 2024
tehrengruber
requested changes
Apr 11, 2024
Comment on lines
312
to
327
| case foast.BinOp( | ||
| op=dialect_ast_enums.BinaryOperator.ADD | ||
| | dialect_ast_enums.BinaryOperator.SUB, | ||
| left=foast.BinOp( | ||
| op=dialect_ast_enums.BinaryOperator.ADD | ||
| | dialect_ast_enums.BinaryOperator.SUB, | ||
| left=foast.Name(id=dimension), | ||
| right=foast.Constant(value=offset_index_left), | ||
| ), | ||
| right=foast.Constant(value=offset_index), | ||
| ): | ||
| if node.args[i].op == dialect_ast_enums.BinaryOperator.SUB: # type: ignore[attr-defined] # ensured by pattern | ||
| offset_index *= -1 | ||
| shift_offsets.append( | ||
| im.shift(f"{dimension}off", offset_index_left + offset_index) | ||
| ) |
There was a problem hiding this comment.
This is for the IDim+1+1 case right? Let's remove it for now since it is not generic anyway (i.e. doesn't work for IDim+1+1+1).
There was a problem hiding this comment.
As discussed, I removed all sopport for (IDim +1) + 1 again and raise an error in type_deduction.py instaed.
|
I tried to resolve the conflict with |
…ring, fixed lowering of `as_offset` (offset field erroneously was captured)
tehrengruber
approved these changes
Sep 9, 2024
tehrengruber
added a commit
that referenced
this pull request
Sep 11, 2024
#1484 introduced support for writing `field(I+1)`. The implicit offset providers we generate for this accidentally also included local dimensions, which broke e.g. Icon4Py with errors like: ``` if not dim.kind == common.DimensionKind.VERTICAL: > raise ValueError( "Mapping an offset to a horizontal dimension in unstructured is not allowed." ) E ValueError: Mapping an offset to a horizontal dimension in unstructured is not allowed. ``` This PR fixes that by only including horizontal and vertical, but not local dimensions in the implicit offset providers.
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.
Description
Add support for replacing the syntax for Cartesian offsets
field(Ioff[1])(Joff[-1])byfield(I+1,J-1).Current status: finished for embedded execution
Requirements
TODOs