feat[next] Embedded field remove __array__ #1366
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
havogt
force-pushed
the
embedded_field_remove_array
branch
from
d7f31ee to
8234894
Compare
havogt
commented
Nov 21, 2023
| return impl | ||
|
|
||
|
|
||
| # TODO(havogt): consider moving to module like `field_utils` |
There was a problem hiding this comment.
I am introducing this in #1365
havogt
commented
Nov 21, 2023
| @@ -1119,13 +1122,6 @@ def _invalid_unpack() -> tuple[int32, float64, int32]: | |||
|
|
|||
|
|
|||
| def test_constant_closure_vars(cartesian_case): | |||
| if cartesian_case.backend is None: | |||
There was a problem hiding this comment.
this is why we are doing the PR
havogt
commented
Nov 21, 2023
havogt
commented
Nov 21, 2023
src/gt4py/next/utils.py
Outdated
|
|
||
| def is_tuple_of(v: Any, t: type[_T]) -> TypeGuard[tuple[_T, ...]]: | ||
| return isinstance(v, tuple) and all(isinstance(e, t) for e in v) | ||
|
|
||
|
|
||
| def apply_to_tuple_elements(fun: Callable[_P, _R]) -> Callable[..., _R | tuple[_R | tuple, ...]]: |
There was a problem hiding this comment.
Suggested change
| def apply_to_tuple_elements(fun: Callable[_P, _R]) -> Callable[..., _R | tuple[_R | tuple, ...]]: | |
| def deep_map(fun: Callable[_P, _R]) -> Callable[..., _R | tuple[_R | tuple, ...]]: |
maybe?
There was a problem hiding this comment.
Either deep_map or tree_map (jax calls tree_map to something similar)
There was a problem hiding this comment.
I'll take tree_map then
egparedes
approved these changes
Nov 21, 2023
src/gt4py/next/common.py
Outdated
| @@ -464,6 +464,9 @@ def dtype(self) -> core_defs.DType[core_defs.ScalarT]: | |||
| def ndarray(self) -> core_defs.NDArrayObject: | |||
| ... | |||
|
|
|||
| def asnumpy(self) -> np.ndarray: | |||
| return np.asarray(self.ndarray) | |||
There was a problem hiding this comment.
Should this be default implementation or just leave it blank?
src/gt4py/next/utils.py
Outdated
|
|
||
| def is_tuple_of(v: Any, t: type[_T]) -> TypeGuard[tuple[_T, ...]]: | ||
| return isinstance(v, tuple) and all(isinstance(e, t) for e in v) | ||
|
|
||
|
|
||
| def apply_to_tuple_elements(fun: Callable[_P, _R]) -> Callable[..., _R | tuple[_R | tuple, ...]]: |
There was a problem hiding this comment.
Either deep_map or tree_map (jax calls tree_map to something similar)
tehrengruber
added a commit
that referenced
this pull request
Dec 14, 2023
Changes to the quickstart guide to use `field.asnumpy()` (introduced in #1366) instead of `np.asarray(field)`. The quickstart guide is still broken though since the embedded backend (used by default) does not support skip neighbors connectivities.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add
.asnumpytoField. Implicit conversion via__array__creates a problem, because expressionnp.float*fieldwill return ndarray instead of field, becausenp.float's multiply operator willasarray(rhs).