feat[next]: Slicing field to 0d to return field not scalar #1427

nfarabullini · 2024-01-25T18:00:14Z

Extracting a single value from a field should return an empty field, not a scalar

Given the following example:

    @gtx.field_operator
    def testee_fo(a: cases.IKField) -> cases.IKField:
        return a

    @gtx.program
    def testee_prog(a: cases.IKField):
        testee_fo(a, out=a[1:2, 3:4])

The program return type should be:

     gtx.Field[[], int]

Additionally, a small fix was made in past_passes.type_deduction such that arg_types is used instead of nodes.args.type

…o_d_return

…into zero_d_return

Co-authored-by: Hannes Vogt <[email protected]>

…s/test_horizontal_indirection.py Co-authored-by: Hannes Vogt <[email protected]>

havogt

I have to look at the details again tomorrow. We can talk in the morning...

src/gt4py/next/embedded/nd_array_field.py

havogt · 2024-02-06T16:36:42Z

src/gt4py/next/embedded/nd_array_field.py

+    def _scalar_to_field(self, value: core_defs.Scalar) -> np.ndarray:
+        if self.array_ns == cp:
+            return cp.asarray(value)
+        else:
+            return np.asarray(value)
+


Shouldn't this be removed already?

src/gt4py/next/iterator/embedded.py

tests/next_tests/unit_tests/embedded_tests/test_nd_array_field.py

havogt · 2024-02-06T16:44:33Z

src/gt4py/next/embedded/operators.py

        res = field[pos] if common.is_field(field) else field
-        res = res.item() if hasattr(res, "item") else res  # extract scalar value from array
+        res = (
+            res.ndarray.item() if hasattr(res, "ndarray") else res  # type: ignore[union-attr]
+        )  # extract scalar value from array


…into zero_d_return

src/gt4py/next/common.py

egparedes

ILGTM

edit to return array from slicing instead of scalar

7292b2e

nfarabullini marked this pull request as draft January 25, 2024 18:00

nfarabullini added 13 commits January 29, 2024 12:17

removed as_scalar builtin

75c96ea

removed as_scalar builtin from test

92f92d1

further cleanup

4a19cf9

further cleanup and fixed pre-commit

1e6d90f

removed small thing

5034f63

ran pre-commit

8f64d19

edit to restrict

b3f7292

edit to restrict and test

1ef427d

small edit for scalar index

75339ba

small change in nomenclature

1de57a1

edit to test file

41bdf23

fixed tests and ran pre-commit

bed69b4

inverted if condition to avoid negation

20970ab

nfarabullini marked this pull request as ready for review January 30, 2024 08:49

nfarabullini changed the title ~~edit to return array from slicing instead of scalar~~ refactor[next]: single array slicing to return array not scalar Jan 30, 2024

nfarabullini changed the title ~~refactor[next]: single array slicing to return array not scalar~~ feat[next]: single array slicing to return array not scalar Jan 30, 2024

nfarabullini and others added 4 commits January 30, 2024 09:59

Merge branch 'main' of https://github.com/nfarabullini/gt4py into zer…

d6b3d93

…o_d_return

edit to test

687e724

Update test_horizontal_indirection.py

621aab0

ran pre-commit

4d56367

nfarabullini requested a review from egparedes January 30, 2024 10:50

nfarabullini and others added 7 commits January 31, 2024 08:44

removed if condition for specific dims

0c5ce05

edits

e1de878

edit for empty field

ff1d87e

Update test_horizontal_indirection.py

ab0a830

edits to tests and typehint

e412aed

Merge branch 'zero_d_return' of https://github.com/nfarabullini/gt4py …

7fb99e2

…into zero_d_return

modified assertion

7d4e8c3

nfarabullini and others added 10 commits February 5, 2024 13:59

Update tests/next_tests/unit_tests/embedded_tests/test_nd_array_field.py

c1a4be3

Co-authored-by: Hannes Vogt <[email protected]>

Update tests/next_tests/integration_tests/feature_tests/iterator_test…

6c3a28a

…s/test_horizontal_indirection.py Co-authored-by: Hannes Vogt <[email protected]>

Update tests/next_tests/integration_tests/feature_tests/iterator_test…

bc7e1bc

…s/test_horizontal_indirection.py Co-authored-by: Hannes Vogt <[email protected]>

edits following review

3cfa2af

edit to test

71ea725

re-introduced _scalar_to_field function

e70edcf

edit to embedded for _scalar_to_field function

fd96f26

edits for _scalar_to_field function

76cbf20

edits to nd_array_field tests

ebb5045

edits to embedded restricts

9308e18

nfarabullini requested a review from havogt February 6, 2024 12:44

small pre-commit edit

23eb8df

havogt requested changes Feb 6, 2024

View reviewed changes

nfarabullini and others added 5 commits February 7, 2024 16:42

edits following review

1d50c00

Merge remote-tracking branch 'upstream/main' into zero_d_return

39ec79f

edit to embedded

ccdebc2

changes to itir as_scalar

b50305b

Merge branch 'zero_d_return' of https://github.com/nfarabullini/gt4py …

3f68e55

…into zero_d_return

havogt reviewed Feb 8, 2024

View reviewed changes

src/gt4py/next/common.py Outdated Show resolved Hide resolved

havogt reviewed Feb 8, 2024

View reviewed changes

src/gt4py/next/common.py Show resolved Hide resolved

nfarabullini added 3 commits February 8, 2024 11:41

edit to embedded

99609fa

merge with upstream

5f59b22

ran pre-commit

5126919

havogt changed the title ~~feat[next]: single array slicing to return array not scalar~~ feat[next]: Slicing field to 0d to return field not scalar Feb 8, 2024

nfarabullini and others added 2 commits February 8, 2024 12:52

fix for ndarray test

f15783c

disallow slicing CartesianConnectivity

55cf242

havogt requested a review from egparedes February 8, 2024 15:54

egparedes approved these changes Feb 8, 2024

View reviewed changes

havogt approved these changes Feb 8, 2024

View reviewed changes

nfarabullini merged commit 1d305e1 into GridTools:main Feb 9, 2024
39 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat[next]: Slicing field to 0d to return field not scalar #1427

feat[next]: Slicing field to 0d to return field not scalar #1427

nfarabullini commented Jan 25, 2024 •

edited

Loading

havogt left a comment

havogt Feb 6, 2024

havogt Feb 6, 2024

egparedes left a comment

feat[next]: Slicing field to 0d to return field not scalar #1427

feat[next]: Slicing field to 0d to return field not scalar #1427

Conversation

nfarabullini commented Jan 25, 2024 • edited Loading

havogt left a comment

Choose a reason for hiding this comment

havogt Feb 6, 2024

Choose a reason for hiding this comment

havogt Feb 6, 2024

Choose a reason for hiding this comment

egparedes left a comment

Choose a reason for hiding this comment

nfarabullini commented Jan 25, 2024 •

edited

Loading