Skip to content
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.

Sign up for GitHub

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

bug[next]: Fix codegen in gtfn for unused vertical offset provider #1746

Merged
merged 15 commits into from
Dec 3, 2024
Merged

bug[next]: Fix codegen in gtfn for unused vertical offset provider #1746

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7fbf5ad
small kdim fix
nfarabullini Nov 25, 2024
1714fb8
added execution test
nfarabullini Nov 25, 2024
e42ab70
Merge branch 'main' into koff_small_fix
nfarabullini Nov 25, 2024
e0871e0
Update tests/next_tests/integration_tests/feature_tests/ffront_tests/…
nfarabullini Dec 2, 2024
2fc336e
Update tests/next_tests/integration_tests/feature_tests/ffront_tests/…
nfarabullini Dec 2, 2024
3e89939
edits following review
nfarabullini Dec 2, 2024
740bb42
further edits
nfarabullini Dec 2, 2024
ac4b5ee
small edit
nfarabullini Dec 2, 2024
bdfa7b1
Merge branch 'main' into koff_small_fix
nfarabullini Dec 2, 2024
b657a50
edits to test
nfarabullini Dec 2, 2024
32be9e8
Merge branch 'koff_small_fix' of https://github.com/nfarabullini/gt4p…
nfarabullini Dec 2, 2024
9c18a0f
Update tests/next_tests/integration_tests/cases.py
nfarabullini Dec 2, 2024
667642c
Update tests/next_tests/integration_tests/cases.py
nfarabullini Dec 2, 2024
43255b5
small fix
nfarabullini Dec 2, 2024
a849b2b
Merge branch 'main' into koff_small_fix
nfarabullini Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/gt4py/next/program_processors/codegens/gtfn/itir_to_gtfn_ir.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@ def _collect_offset_definitions(
"Mapping an offset to a horizontal dimension in unstructured is not allowed."
)
# create alias from vertical offset to vertical dimension
offset_definitions[dim.value] = TagDefinition(
name=Sym(id=dim.value), alias=_vertical_dimension
)
offset_definitions[offset_name] = TagDefinition(
name=Sym(id=offset_name), alias=SymRef(id=dim.value)
)
Expand Down
2 changes: 2 additions & 0 deletions tests/next_tests/integration_tests/feature_tests/ffront_tests/ffront_test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ def simple_mesh() -> MeshDescriptor:
C2E.value: gtx.NeighborTableOffsetProvider(
c2e_arr, Cell, Edge, 4, has_skip_values=False
),
Koff.value: KDim,
Copy link
Contributor

@havogt havogt Nov 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this change here? I don't understand how this is related. Is it required to make the test below fail before the fix?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an easy way to trigger the error.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But not the best I guess. An isolated test would be one that has an Cartesian offset for a dimension that is not in any field?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any updates on this? I would need it for C2SM/icon4py#564

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nfarabullini Let's introduce a new unstructured_case_3d fixture that starting from the unstructured_case fixture adds the default size and offset provider for the KDim.
@jcanton I think we can merge this soon, but this will likely not help you much since icon4py is pinned to an older version of GT4PY until #1738 is merged.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't think about that, thanks!

},
)

Expand Down Expand Up @@ -305,6 +306,7 @@ def skip_value_mesh() -> MeshDescriptor:
C2E.value: gtx.NeighborTableOffsetProvider(
c2e_arr, Cell, Edge, 3, has_skip_values=False
),
Koff.value: KDim,
},
)

Expand Down
15 changes: 14 additions & 1 deletion tests/next_tests/integration_tests/feature_tests/ffront_tests/test_execution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def testee(a: cases.IJKField) -> cases.IJKField:


@pytest.mark.uses_unstructured_shift
def test_unstructured_shift(unstructured_case):
def test_unstructured_shift_indexed(unstructured_case):
nfarabullini marked this conversation as resolved.
Show resolved Hide resolved
@gtx.field_operator
def testee(a: cases.VField) -> cases.EField:
return a(E2V[0])
Expand All @@ -93,6 +93,19 @@ def testee(a: cases.VField) -> cases.EField:
)


@pytest.mark.uses_unstructured_shift
def test_unstructured_shift(unstructured_case):
nfarabullini marked this conversation as resolved.
Show resolved Hide resolved
@gtx.field_operator
def testee(a: cases.VField) -> cases.EField:
return neighbor_sum(a(E2V), axis=E2VDim)

cases.verify_with_default_data(
unstructured_case,
testee,
ref=lambda a: np.sum(a[unstructured_case.offset_provider["E2V"].table], axis=1),
)


@pytest.mark.uses_unstructured_shift
def test_composed_unstructured_shift(unstructured_case):
@gtx.field_operator
Expand Down
Loading