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 for GTIR partial type inference #1840

Merged
merged 8 commits into from
Feb 4, 2025
Merged

bug[next]: Fix for GTIR partial type inference #1840

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9072778
fix for type inference
edopao Jan 22, 2025
6c4ad12
Fix typing
tehrengruber Jan 31, 2025
947b12c
Fix format
tehrengruber Jan 31, 2025
ad1fec8
Fix format
tehrengruber Jan 31, 2025
f2e0c4b
Merge branch 'main' into fix_type_inference
havogt Jan 31, 2025
83a301b
Merge remote-tracking branch 'origin/main' into fix_type_inference
tehrengruber Jan 31, 2025
aff54db
Revert uv.lock changes
tehrengruber Jan 31, 2025
789998a
Merge remote-tracking branch 'origin_tehrengruber/fix_type_inference'…
tehrengruber Jan 31, 2025
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
8 changes: 6 additions & 2 deletions src/gt4py/next/iterator/type_system/type_synthesizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,19 @@ def can_deref(it: it_ts.IteratorType | ts.DeferredType) -> ts.ScalarType:


@_register_builtin_type_synthesizer
def if_(pred: ts.ScalarType, true_branch: ts.DataType, false_branch: ts.DataType) -> ts.DataType:
def if_(
pred: ts.ScalarType | ts.DeferredType, true_branch: ts.DataType, false_branch: ts.DataType
) -> ts.DataType:
if isinstance(true_branch, ts.TupleType) and isinstance(false_branch, ts.TupleType):
return tree_map(
collection_type=ts.TupleType,
result_collection_constructor=lambda elts: ts.TupleType(types=[*elts]),
)(functools.partial(if_, pred))(true_branch, false_branch)

assert not isinstance(true_branch, ts.TupleType) and not isinstance(false_branch, ts.TupleType)
assert isinstance(pred, ts.ScalarType) and pred.kind == ts.ScalarKind.BOOL
assert isinstance(pred, ts.DeferredType) or (
isinstance(pred, ts.ScalarType) and pred.kind == ts.ScalarKind.BOOL
)
# TODO(tehrengruber): Enable this or a similar check. In case the true- and false-branch are
# iterators defined on different positions this fails. For the GTFN backend we also don't
# want this, but for roundtrip it is totally fine.
Expand Down