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.

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

feat[next]: Improve fieldop fusion #1764

Draft
wants to merge 191 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
191 commits
Select commit Hold shift + click to select a range
b0d688a
Add support for IfStmt in ITIR
tehrengruber Sep 25, 2024
65a22fe
Initial version of FuseAsFieldOp
tehrengruber Sep 28, 2024
8a27d16
Merge branch 'main' into gtir_fuse_as_fieldop
tehrengruber Sep 28, 2024
3edc130
Move symbolic domain utilities out of global tmp pass into seperate m…
tehrengruber Sep 28, 2024
031e459
Merge branch 'gtir_if_stmt' into gtir_temporaries_pass
tehrengruber Sep 28, 2024
dd63122
feat[next]: gtir lowering of broadcasted scalars
havogt Oct 1, 2024
2d840cb
Merge origin/main
tehrengruber Oct 1, 2024
7172442
Second draft of temporary pass
tehrengruber Oct 1, 2024
3313191
Merge remote-tracking branch 'origin/main' into gtir_if_stmt
tehrengruber Oct 1, 2024
4a20973
Merge branch 'gtir_temporaries_pass' into gtir_temporaries2
tehrengruber Oct 2, 2024
f3cbc18
Merge branch 'gtir_fuse_as_fieldop' into gtir_temporaries2
tehrengruber Oct 2, 2024
d4f066a
Cleanup
tehrengruber Oct 2, 2024
9a69dea
Merge branch 'gtir_temporaries_pass' into gtir_temporaries2
tehrengruber Oct 2, 2024
c1038fa
Address review comments
tehrengruber Oct 3, 2024
31cd94e
Merge branch 'main' into gtir_if_stmt
tehrengruber Oct 3, 2024
160aeaf
Add type inference test for IfStmt
tehrengruber Oct 3, 2024
67682ed
Merge remote-tracking branch 'origin_tehrengruber/gtir_if_stmt' into …
tehrengruber Oct 3, 2024
881babf
Merge origin/main
tehrengruber Oct 3, 2024
2bf9231
Merge remote-tracking branch 'origin/main' into gtir_fuse_as_fieldop
tehrengruber Oct 4, 2024
19a2c5e
Cleanup
tehrengruber Oct 9, 2024
a6a010c
Merge gtir_fuse_as_fieldop
tehrengruber Oct 9, 2024
a57cb99
Merge branch 'main' into gtir_fuse_as_fieldop
tehrengruber Oct 9, 2024
b50b85a
Cleanup
tehrengruber Oct 9, 2024
e2e3fa1
Merge remote-tracking branch 'origin_tehrengruber/gtir_fuse_as_fieldo…
tehrengruber Oct 9, 2024
bb2f2b1
Cleanup
tehrengruber Oct 9, 2024
729968e
Cleanup
tehrengruber Oct 9, 2024
cdcaac0
Cleanup
tehrengruber Oct 9, 2024
9472502
Cleanup
tehrengruber Oct 9, 2024
01dd86e
Cleanup
tehrengruber Oct 9, 2024
e078b36
Cleanup
tehrengruber Oct 10, 2024
f0331cb
Cleanup
tehrengruber Oct 10, 2024
21d2fb5
Merge origin_tehrengruber/gtir_if_stmt
tehrengruber Oct 10, 2024
3bd3ad6
Merge remote-tracking branch 'origin/main' into gtir_temporaries_pass
tehrengruber Oct 10, 2024
61e9665
Cleanup
tehrengruber Oct 10, 2024
f9dff50
Cleanup
tehrengruber Oct 10, 2024
71f512f
Cleanup
tehrengruber Oct 10, 2024
6fb424f
Cleanup
tehrengruber Oct 10, 2024
7d809fb
Cleanup
tehrengruber Oct 10, 2024
c7b79c0
Cleanup
tehrengruber Oct 10, 2024
f16a961
Cleanup
tehrengruber Oct 10, 2024
3e3f9a1
Cleanup
tehrengruber Oct 10, 2024
edffd97
Cleanup
tehrengruber Oct 10, 2024
3196a11
Cleanup
tehrengruber Oct 10, 2024
6a4d227
Merge remote-tracking branch 'origin/main' into gtir_temporaries_pass
tehrengruber Oct 10, 2024
183139b
Merge branch 'gtir_temporaries_pass' into gtir_temporaries2
tehrengruber Oct 10, 2024
04f59dd
Inline lambda pass: ensure opcount preserving option works whether `i…
tehrengruber Oct 10, 2024
feab647
Retrigger CI
tehrengruber Oct 10, 2024
5869769
Merge branch 'fix_inline_lambda_opcount_preserving' into gtir_tempora…
tehrengruber Oct 10, 2024
376153f
Address review comments
tehrengruber Oct 11, 2024
b61be89
Merge branch 'gtir_fuse_as_fieldop' into gtir_temporaries2
tehrengruber Oct 11, 2024
52a1b90
Allow type inference without domain argument to `as_fieldop`
tehrengruber Oct 14, 2024
a1b4448
Cleanup
tehrengruber Oct 14, 2024
f93c8b4
Merge branch 'type_inf_before_domain_inf' into gtir_temporaries2
tehrengruber Oct 14, 2024
9684507
Merge origin/main
tehrengruber Oct 15, 2024
5b86f19
Remove comment
tehrengruber Oct 15, 2024
7784896
Merge branch 'gtir_temporaries_pass' into gtir_temporaries2
tehrengruber Oct 15, 2024
0e50214
Use GTIR in embedded and gtfn
tehrengruber Oct 15, 2024
068ff06
Cleanup
tehrengruber Oct 16, 2024
aaba729
Cleanup
tehrengruber Oct 16, 2024
6044d76
Cleanup
tehrengruber Oct 16, 2024
1dc9ebb
Cleanup
tehrengruber Oct 16, 2024
685bedb
Cleanup
tehrengruber Oct 16, 2024
378b3b3
Cleanup
tehrengruber Oct 16, 2024
83e5ce2
Cleanup
tehrengruber Oct 16, 2024
b3ae17b
Cleanup
tehrengruber Oct 16, 2024
4637b7a
Merge origin_tehrengruber/lower_broadcasted_scalars_to_fieldops
tehrengruber Oct 16, 2024
dbd71a9
Small fix
tehrengruber Oct 16, 2024
0990858
Merge branch 'main' into gtir_temporaries
tehrengruber Oct 16, 2024
da4a63c
Merge remote-tracking branch 'origin/main' into gtir_temporaries
tehrengruber Oct 16, 2024
c4b1ed8
Merge remote-tracking branch 'origin_tehrengruber/gtir_temporaries' i…
tehrengruber Oct 16, 2024
f545984
Remove superfluous test backend
tehrengruber Oct 16, 2024
0904d88
Cleanup
tehrengruber Oct 16, 2024
6f6c65b
Cleanup
tehrengruber Oct 16, 2024
606f662
Cleanup
tehrengruber Oct 16, 2024
b917011
Cleanup
tehrengruber Oct 16, 2024
6c9e8ab
Cleanup
tehrengruber Oct 16, 2024
320c7f8
Cleanup
tehrengruber Oct 17, 2024
b589346
Cleanup
tehrengruber Oct 17, 2024
309d58f
Merge branch 'gtir_temporaries_pass' into gtir_temporaries
tehrengruber Oct 17, 2024
4d2b3da
Fix format
tehrengruber Oct 17, 2024
cfb59d7
Merge branch 'main' into gtir_temporaries_pass
tehrengruber Oct 17, 2024
1fe44e0
Merge branch 'gtir_temporaries_pass' into gtir_temporaries
tehrengruber Oct 17, 2024
ab5a6a2
Merge remote-tracking branch 'origin_tehrengruber/gtir_temporaries_pa…
tehrengruber Oct 18, 2024
6072d53
Merge commit 'cb77ccb85c1d5baa83720493c626a66c0c116451' into gtir_tem…
tehrengruber Oct 18, 2024
821af59
Merge origin/main
tehrengruber Oct 18, 2024
70c0dff
Fix scalar let in gtfn
tehrengruber Oct 19, 2024
108af05
Fix some tests
tehrengruber Oct 20, 2024
7380d6e
Fix
tehrengruber Oct 20, 2024
c268ee1
Fix some tests
tehrengruber Oct 20, 2024
c5b0171
Address review comments
tehrengruber Oct 21, 2024
bba6aa4
Allow partial type inference in ITIR
tehrengruber Oct 24, 2024
840c004
Merge remote-tracking branch 'origin/main' into allow_partial_type_in…
tehrengruber Oct 24, 2024
f9fc5c5
Small fix
tehrengruber Oct 24, 2024
c241bc4
Add tests
tehrengruber Oct 28, 2024
e120849
Merge origin/main
tehrengruber Oct 28, 2024
45f41be
Address review comments
tehrengruber Oct 28, 2024
fccd43b
Fix tests
tehrengruber Oct 28, 2024
1874eba
Fix tests
tehrengruber Nov 5, 2024
8685731
Merge origin/main
tehrengruber Nov 5, 2024
dd5bfa7
Fix tests
tehrengruber Nov 5, 2024
8f1e84a
Fix tests
tehrengruber Nov 5, 2024
d53d3bb
Fix tests
tehrengruber Nov 5, 2024
4bfef54
Fix tests
tehrengruber Nov 5, 2024
78b7a98
Fix tests
tehrengruber Nov 5, 2024
88a7660
Fix tests
tehrengruber Nov 5, 2024
1b79b3a
Fix tests
tehrengruber Nov 5, 2024
b6b603e
Bump CI version to 22.04
tehrengruber Nov 5, 2024
5beccf0
Bump CI version to 22.04
tehrengruber Nov 5, 2024
deca907
Bump CI version to 22.04
tehrengruber Nov 5, 2024
af9d776
Bump CI version to 22.04
tehrengruber Nov 5, 2024
8cb36da
Merge origin/main
tehrengruber Nov 5, 2024
ee0b94a
Fix failing dace tests
tehrengruber Nov 5, 2024
270e173
Address review comments
tehrengruber Nov 5, 2024
8e2ba0c
Revert CI changes & skip failing test
tehrengruber Nov 8, 2024
229d3ac
Merge origin/main
tehrengruber Nov 8, 2024
580cb79
Fix format
tehrengruber Nov 8, 2024
c67d355
Ugly fix
tehrengruber Nov 8, 2024
79ab838
Format
tehrengruber Nov 8, 2024
d53fda9
Small fix
tehrengruber Nov 8, 2024
24c3e87
Bump gridtools-cpp to 2.3.7 in preperation of #1648
tehrengruber Nov 11, 2024
04f110f
Merge branch 'bump_gridtools' into gtir_temporaries
tehrengruber Nov 11, 2024
c399f65
Merge remote-tracking branch 'origin/main' into gtir_temporaries
tehrengruber Nov 11, 2024
0faa7ef
Test tuple fix in gridtools
tehrengruber Nov 11, 2024
8e8a0a1
Fix typo
tehrengruber Nov 11, 2024
e03dd38
Fix ITIR program hash stability
tehrengruber Nov 12, 2024
7a4c692
Merge branch 'fix_itir_hash_stability' into gtir_temporaries
tehrengruber Nov 12, 2024
405cbb0
Revert "Fix typo"
tehrengruber Nov 13, 2024
4c27279
Revert "Test tuple fix in gridtools"
tehrengruber Nov 13, 2024
a666eef
Test 2.3.8
tehrengruber Nov 13, 2024
8402e4f
Fix type preservation in CSE
tehrengruber Nov 13, 2024
4547295
Fix type preservation in CSE
tehrengruber Nov 13, 2024
2d6464f
Fix test skip matrix
tehrengruber Nov 14, 2024
4b67a99
Fix format
tehrengruber Nov 14, 2024
af2ed5f
Address review comments
tehrengruber Nov 14, 2024
1188a55
Merge origin/inline_dynamic_offsets
tehrengruber Nov 14, 2024
bff17b2
Inline dynamic shifts
tehrengruber Nov 14, 2024
52df315
Merge remote-tracking branch 'origin/main' into gtir_temporaries
tehrengruber Nov 14, 2024
262ffdd
Merge origin/main
tehrengruber Nov 14, 2024
79026c7
dace-related changes
edopao Nov 15, 2024
16f143f
Address review comments
tehrengruber Nov 15, 2024
75695d9
Address review comments
tehrengruber Nov 15, 2024
f3b1c6c
Merge origin/main
tehrengruber Nov 15, 2024
1ab17ca
Merge branch 'gtir_temporaries' into inline_dynamic_offsets
tehrengruber Nov 15, 2024
9df5e4f
Merge remote-tracking branch 'origin/main' into inline_dynamic_offsets
tehrengruber Nov 15, 2024
f268ae1
Merge remote-tracking branch 'origin_tehrengruber/inline_dynamic_offs…
tehrengruber Nov 15, 2024
6e40499
Small cleanup
tehrengruber Nov 15, 2024
b0bd658
Address review comments
tehrengruber Nov 27, 2024
7b67ecb
Small cleanup
tehrengruber Nov 27, 2024
438eb6b
Small cleanup
tehrengruber Nov 27, 2024
306a82a
Merge
tehrengruber Nov 27, 2024
752e08a
Small fix
tehrengruber Nov 27, 2024
395e6ee
Small fix
tehrengruber Nov 27, 2024
ff00b55
Small fix
tehrengruber Nov 27, 2024
34d6040
Non-tree-size-increasing collapse tuple on ifs
tehrengruber Dec 1, 2024
48abc08
Fix typos
tehrengruber Dec 1, 2024
3790944
Fix typos
tehrengruber Dec 1, 2024
a8a63bf
Disable PROPAGATE_TO_IF_ON_TUPLES by default in pass manager
tehrengruber Dec 1, 2024
2c44ffc
Improve doc
tehrengruber Dec 1, 2024
42b5817
Improve typo
tehrengruber Dec 1, 2024
9da19a2
Improve typo
tehrengruber Dec 1, 2024
bcd9e48
Improve typo
tehrengruber Dec 1, 2024
0a212bd
Improve typo
tehrengruber Dec 1, 2024
70562fe
Fix typo
tehrengruber Dec 1, 2024
9cee650
Improve doc
tehrengruber Dec 1, 2024
43f5741
Format
tehrengruber Dec 1, 2024
7b37f1c
Fix type synthesizer for partially typed arithmetic ops
tehrengruber Dec 1, 2024
a0341a6
Fix test
tehrengruber Dec 1, 2024
5a892f3
Fix test
tehrengruber Dec 1, 2024
cd04fb3
Merge branch 'inline_dynamic_offsets' into improve_fieldop_fusion
tehrengruber Dec 1, 2024
bd02cc7
Merge remote-tracking branch 'origin/main' into inline_dynamic_offsets
tehrengruber Dec 1, 2024
31ebf0c
Merge branch 'inline_dynamic_offsets' into improve_fieldop_fusion
tehrengruber Dec 1, 2024
ae8a36f
Merge origin_tehrengruber/ct_cps (contains partial type inference)
tehrengruber Dec 1, 2024
93688a8
Improve field operator fusion
tehrengruber Dec 2, 2024
7c271ca
Small fix
tehrengruber Dec 2, 2024
22dbf5e
Fix inlining of multiple-use, dynamically-calculated neighbor field
tehrengruber Dec 2, 2024
bfacda6
Fix broken iterator tests containing lifts
tehrengruber Dec 2, 2024
92b7533
Support inlining into scan
tehrengruber Dec 3, 2024
1eeca75
Small fix
tehrengruber Dec 3, 2024
e3306fc
Address review comments.
tehrengruber Dec 5, 2024
2928503
Address review comments.
tehrengruber Dec 5, 2024
447b467
Address review comments.
tehrengruber Dec 5, 2024
54cd6b1
Fix type annotation
tehrengruber Dec 5, 2024
e043d0a
Add type annotation in extract_tmp pass.
tehrengruber Dec 6, 2024
20fb59e
Update src/gt4py/next/iterator/transforms/infer_domain.py
tehrengruber Dec 6, 2024
d8d3913
Address review comments
tehrengruber Dec 6, 2024
e9ea52b
Merge remote-tracking branch 'origin_tehrengruber/inline_dynamic_offs…
tehrengruber Dec 6, 2024
5832371
Address review comments
tehrengruber Dec 6, 2024
3aa6421
Merge branch 'main' into inline_dynamic_offsets
tehrengruber Dec 6, 2024
668e3ec
Fix format
tehrengruber Dec 6, 2024
da63e23
Merge origin/main
tehrengruber Dec 8, 2024
15c1212
Merge origin/main
tehrengruber Dec 8, 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
Prev Previous commit
Next Next commit
Small fix
  • Loading branch information
tehrengruber committed Dec 3, 2024

Verified

This commit was signed with the committer’s verified signature.
jmacd Joshua MacDonald
commit 1eeca75880c98c16493e661bb0b89a6467216e0b
4 changes: 2 additions & 2 deletions src/gt4py/next/iterator/transforms/fuse_as_fieldop.py
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ def _canonicalize_as_fieldop(expr: itir.FunCall) -> itir.FunCall:
if cpm.is_ref_to(stencil, "deref"):
stencil = im.lambda_("arg")(im.deref("arg"))
new_expr = im.as_fieldop(stencil, domain)(*expr.args)
type_inference.copy_type(from_=expr, to=new_expr)
type_inference.copy_type(from_=expr, to=new_expr, allow_untyped=True)

return new_expr

@@ -200,7 +200,7 @@ def fuse_as_fieldop(

new_node = im.as_fieldop(new_stencil, domain)(*new_args.values())

type_inference.copy_type(from_=expr, to=new_node)
type_inference.copy_type(from_=expr, to=new_node, allow_untyped=True)
return new_node


Loading