-
Notifications
You must be signed in to change notification settings - Fork 49
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]: Support for Array Api namespace as allocator #1771
Draft
havogt
wants to merge
12
commits into
GridTools:main
Choose a base branch
from
havogt:field_with_allocator
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
81d5cda
feat[next]: allocator in field
havogt fe09c5f
continue refactoring
havogt e4dabc8
save state
havogt 1b3e0c5
cleanup copying
havogt afbbc8e
fix storage inferface test
havogt 3bb206f
move to_array_api_dtype
havogt 1c5acd6
fix variable names
havogt 92b8ea6
refactor to an allocation namespace
havogt 7817ec3
fix compat
havogt 6709b04
fix tests
havogt 3ee60b8
move device to allocation namespace construction
havogt 4fb8bab
fix get_actual_allocator
havogt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -27,6 +27,7 @@ | |||||
Iterator, | ||||||
Literal, | ||||||
Protocol, | ||||||
Self, | ||||||
Sequence, | ||||||
Tuple, | ||||||
Type, | ||||||
|
@@ -405,6 +406,7 @@ class DeviceType(enum.IntEnum): | |||||
MetalDeviceTyping, | ||||||
VPIDeviceTyping, | ||||||
ROCMDeviceTyping, | ||||||
covariant=True, | ||||||
) | ||||||
|
||||||
|
||||||
|
@@ -454,7 +456,7 @@ def astype(self, dtype: npt.DTypeLike) -> NDArrayObject: ... | |||||
|
||||||
def any(self) -> bool: ... | ||||||
|
||||||
def __getitem__(self, item: Any) -> NDArrayObject: ... | ||||||
def __getitem__(self, item: Any) -> Self: ... | ||||||
|
||||||
def __abs__(self) -> NDArrayObject: ... | ||||||
|
||||||
|
@@ -505,3 +507,49 @@ def __and__(self, other: NDArrayObject | Scalar) -> NDArrayObject: ... | |||||
def __or__(self, other: NDArrayObject | Scalar) -> NDArrayObject: ... | ||||||
|
||||||
def __xor__(self, other: NDArrayObject | Scalar) -> NDArrayObject: ... | ||||||
|
||||||
|
||||||
class MutableNDArrayObject(NDArrayObject, Protocol): | ||||||
def __setitem__(self, index: Any, value: Any) -> None: ... | ||||||
|
||||||
|
||||||
class ArrayApiNamespace(Protocol): | ||||||
def empty(self, shape: Sequence[int], *, dtype: Any = None, device: Any = None) -> Any: ... | ||||||
def zeros(self, shape: Sequence[int], *, dtype: Any = None, device: Any = None) -> Any: ... | ||||||
def ones(self, shape: Sequence[int], *, dtype: Any = None, device: Any = None) -> Any: ... | ||||||
def full( | ||||||
self, shape: Sequence[int], fill_value: Scalar, *, dtype: Any = None, device: Any = None | ||||||
) -> Any: ... | ||||||
def asarray(self, obj: Any, *, dtype: Any = None, copy: Any = None) -> Any: ... | ||||||
|
||||||
# @property # once all relevant implementations have this attribute | ||||||
# def __array_api_version__(self) -> str: ... # noqa: ERA001 | ||||||
|
||||||
# TODO(havogt): add relevant methods and attributes or wait for the standard to provide it, see e.g. https://github.com/data-apis/array-api/issues/697 | ||||||
|
||||||
|
||||||
def is_array_api_namespace(obj: Any) -> TypeGuard[ArrayApiNamespace]: | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should start using
Suggested change
|
||||||
# return hasattr(obj, "__array_api_version__") # noqa: ERA001 # once all relevant implementations have this attribute | ||||||
return ( | ||||||
hasattr(obj, "empty") | ||||||
and hasattr(obj, "zeros") | ||||||
and hasattr(obj, "ones") | ||||||
and hasattr(obj, "full") | ||||||
and hasattr(obj, "asarray") | ||||||
) | ||||||
|
||||||
|
||||||
def to_array_api_dtype(xp: ArrayApiNamespace, dtype_: DTypeLike | None) -> Any: | ||||||
""" | ||||||
Converts a GT4Py `DTypeLike` to the dtype object of the given Array API namespace. | ||||||
|
||||||
Note: For convenience `None` is passed-through as it has a consistent meaning in all Array API implementations. | ||||||
""" | ||||||
if dtype_ is None: | ||||||
return None | ||||||
else: | ||||||
dtype_ = dtype(dtype_) | ||||||
assert ( | ||||||
dtype_.tensor_shape == () | ||||||
) # TODO(havogt): support tensor shapes (or remove from our DType) | ||||||
return getattr(xp, dtype_.scalar_type.__name__) |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess using
NDArrayObject
as output type doesn't work with mypy, right?