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]: as_program embedded #1487

Draft
wants to merge 50 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
e351cf7
initial steps
nfarabullini Feb 28, 2024
ca4768f
progress
nfarabullini Feb 28, 2024
4d05daa
fix for test
nfarabullini Feb 28, 2024
775372d
Merge branch 'main' of https://github.com/nfarabullini/gt4py into c20…
nfarabullini Feb 29, 2024
ee6a764
ran pre-commit with ruff
nfarabullini Feb 29, 2024
6302c2a
fixed ruff errors
nfarabullini Feb 29, 2024
1cdbefd
streamline PAST stage
Feb 29, 2024
565a2fa
Merge branch 'c20_workflowefy' into c20-workflowify
Feb 29, 2024
209faa3
first attempt at as_program function generator
Feb 29, 2024
23bab15
Merge branch 'main' into c20-workflowify
Mar 1, 2024
065fe50
try linecache fix
Mar 1, 2024
35e90b2
fix __globals__ of generated function
Mar 1, 2024
54ebebd
fix as_program (?)
Mar 1, 2024
df34976
roundtrip conversion skeleton
Mar 1, 2024
c925663
edits
nfarabullini Mar 1, 2024
aef1438
workflowify double roundtrip
Mar 4, 2024
cdbb909
Merge branch 'c20-workflowify' into c20_workflowefy
Mar 4, 2024
f9b4198
edit for dims
nfarabullini Mar 4, 2024
55e24f2
small fix
nfarabullini Mar 4, 2024
b382ba2
added code for nested tuples
nfarabullini Mar 4, 2024
b4ee386
left over code
nfarabullini Mar 4, 2024
2796327
separate transforms from compile workflow, fix fendef call
Mar 4, 2024
7ff19a3
[wip] refactor backend to split transforms and executor
Mar 4, 2024
8218da6
[wip] refactor backend / executor
Mar 5, 2024
701b330
edits for past_to_func
nfarabullini Mar 5, 2024
81e6a99
[wip] refactor backend to start from PAST
Mar 6, 2024
3022f20
Merge branch 'main' of https://github.com/nfarabullini/gt4py into c20…
nfarabullini Mar 6, 2024
e6410e6
fixed some pre-commit errors
nfarabullini Mar 6, 2024
625c337
update remaining tests and test utils
DropD Mar 6, 2024
aa8187b
Merge branch 'c20-workflowify' into c20_workflowefy
DropD Mar 6, 2024
1561581
tests: fix xfail conditions in test_icon_like_scan
DropD Mar 6, 2024
413aea3
tests: fix xfail conditions in test_anton_toy
DropD Mar 6, 2024
86765b4
tests: fix xfail conditions in test_hdiff
DropD Mar 6, 2024
0807208
edits and pre-commit
nfarabullini Mar 6, 2024
c748ad7
fixed wrong code merge
nfarabullini Mar 6, 2024
00bf734
small edit
nfarabullini Mar 6, 2024
12b90fc
small edit
nfarabullini Mar 6, 2024
2bd16f5
start factoring _process_args out from Program
DropD Mar 7, 2024
260c323
fix and remove _process_args etc from decorator
DropD Mar 7, 2024
2b1b368
refactor otf.transforms -> ffront
DropD Mar 7, 2024
8f08fdb
remove empty `otf.transforms`
DropD Mar 8, 2024
9e70d69
minor roundtrip workflow refactor
DropD Mar 8, 2024
33c3ebc
remove debug lines, use flatten instead of comprehension
DropD Mar 8, 2024
30cff59
test
nfarabullini Mar 8, 2024
fb7b1ce
Merge branch 'c20_workflowefy' of https://github.com/nfarabullini/gt4…
nfarabullini Mar 8, 2024
6ed1dea
run formatting
DropD Mar 8, 2024
f0659a9
refactor type_info.flatten -> eve.utils.flatten_iter
DropD Mar 8, 2024
afefe12
refactor: past_to_itir_wf -> past_to_itir
DropD Mar 13, 2024
2477e31
rename: ffront.*_wf -> ffront.*
DropD Mar 13, 2024
1516b25
fix: undo false positive replacement from refactoring
DropD Mar 13, 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
fixed wrong code merge
  • Loading branch information
nfarabullini committed Mar 6, 2024
commit c748ad76d42e083b85d9bfcb5c59c22d89ed46ae
33 changes: 9 additions & 24 deletions src/gt4py/next/ffront/decorator.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
)
from gt4py.next.otf import stages, transforms as otf_transforms
from gt4py.next.otf.transforms.past_to_func import past_to_fun_def
from gt4py.next.program_processors import modular_executor, processor_interface as ppi
from gt4py.next.program_processors import processor_interface as ppi
from gt4py.next.type_system import type_info, type_specifications as ts, type_translation


Expand Down Expand Up @@ -269,35 +269,20 @@ def __call__(self, *args, offset_provider: dict[str, Dimension], **kwargs) -> No
definition = self.definition
ctx.run(definition, *rewritten_args, **kwargs)
return
elif isinstance(self.backend, modular_executor.ModularExecutor):
self.backend(
stages.PastClosure(
closure_vars=self.closure_vars,
past_node=self.past_node,
grid_type=self.grid_type,
args=[*rewritten_args, *size_args],
kwargs=kwargs
| {"offset_provider": offset_provider, "column_axis": self._column_axis},
),
*rewritten_args,
*size_args,
**kwargs,
offset_provider=offset_provider,
column_axis=self._column_axis,
)
return

ppi.ensure_processor_kind(self.backend, ppi.ProgramExecutor)
if "debug" in kwargs:
debug(self.itir)

self.backend(
self.itir,
*rewritten_args,
*size_args,
**kwargs,
offset_provider=offset_provider,
column_axis=self._column_axis,
stages.PastClosure(
closure_vars=self.closure_vars,
past_node=self.past_node,
grid_type=self.grid_type,
args=[*rewritten_args, *size_args],
kwargs=kwargs
| {"offset_provider": offset_provider, "column_axis": self._column_axis},
)
)

def format_itir(
Expand Down
Loading