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

Array conversion methods #9823

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions doc/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ Dataset contents
Dataset.convert_calendar
Dataset.interp_calendar
Dataset.get_index
Dataset.as_array_type
Dataset.is_array_type

Comparisons
-----------
Expand Down Expand Up @@ -315,6 +317,8 @@ DataArray contents
DataArray.get_index
DataArray.astype
DataArray.item
DataArray.as_array_type
DataArray.is_array_type

Indexing
--------
Expand Down
3 changes: 3 additions & 0 deletions doc/whats-new.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ v2025.02.0 (unreleased)

New Features
~~~~~~~~~~~~
- Add convenience methods ``as_array_type`` and ``is_array_type`` for converting wrapped
data to other duck array types. (:issue:`7848`, :pull:`9823`).
By `Sam Levang <https://github.com/slevang>`_.


Breaking changes
Expand Down
40 changes: 40 additions & 0 deletions xarray/core/dataarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,46 @@ def as_numpy(self) -> Self:
coords = {k: v.as_numpy() for k, v in self._coords.items()}
return self._replace(self.variable.as_numpy(), coords, indexes=self._indexes)

def as_array_type(self, asarray: Callable, **kwargs) -> Self:
"""
Converts wrapped data into a specific array type.

If the data is a chunked array, the conversion is applied to each block.

`asarray` should output an object that supports the Array API Standard.
This method does not convert index coordinates, which can't generally be
represented as arbitrary array types.

Parameters
----------
asarray : Callable
Function that converts an array-like object to the desired array type.
For example, `cupy.asarray`, `jax.numpy.asarray`, `sparse.COO.from_numpy`,
or any `from_dlpack` method.
**kwargs : dict
Additional keyword arguments passed to the `asarray` function.

Returns
-------
DataArray
"""
return self._replace(self.variable.as_array_type(asarray, **kwargs))

def is_array_type(self, array_type: type) -> bool:
"""
Check if the wrapped data is of a specific array type.

Parameters
----------
array_type : type
The array type to check for.

Returns
-------
bool
"""
return self.variable.is_array_type(array_type)

@property
def _in_memory(self) -> bool:
return self.variable._in_memory
Expand Down
48 changes: 48 additions & 0 deletions xarray/core/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -1461,6 +1461,54 @@ def as_numpy(self) -> Self:
numpy_variables = {k: v.as_numpy() for k, v in self.variables.items()}
return self._replace(variables=numpy_variables)

def as_array_type(self, asarray: Callable, **kwargs) -> Self:
"""
Converts wrapped data into a specific array type.

If the data is a chunked array, the conversion is applied to each block.

`asarray` should output an object that supports the Array API Standard.
This method does not convert index coordinates, which can't generally be
represented as arbitrary array types.

Parameters
----------
asarray : Callable
Function that converts an array-like object to the desired array type.
For example, `cupy.asarray`, `jax.numpy.asarray`, `sparse.COO.from_numpy`,
or any `from_dlpack` method.
**kwargs : dict
Additional keyword arguments passed to the `asarray` function.

Returns
-------
Dataset
"""
array_variables = {
k: v.as_array_type(asarray, **kwargs) if k not in self._indexes else v
for k, v in self.variables.items()
}
return self._replace(variables=array_variables)

def is_array_type(self, array_type: type) -> bool:
"""
Check if all data variables and non-index coordinates are of a specific array type.

Parameters
----------
array_type : type
The array type to check for.

Returns
-------
bool
"""
return all(
v.is_array_type(array_type)
for k, v in self.variables.items()
if k not in self._indexes
)

def _copy_listed(self, names: Iterable[Hashable]) -> Self:
"""Create a new Dataset with the listed variables from this dataset and
the all relevant coordinates. Skips all validation.
Expand Down
47 changes: 45 additions & 2 deletions xarray/namedarray/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
_SupportsImag,
_SupportsReal,
)
from xarray.namedarray.parallelcompat import guess_chunkmanager
from xarray.namedarray.pycompat import to_numpy
from xarray.namedarray.parallelcompat import get_chunked_array_type, guess_chunkmanager
from xarray.namedarray.pycompat import is_chunked_array, to_numpy
from xarray.namedarray.utils import (
either_dict_or_kwargs,
infix_dims,
Expand Down Expand Up @@ -261,7 +261,7 @@
attrs: _AttrsLike = None,
):
self._data = data
self._dims = self._parse_dimensions(dims)

Check warning on line 264 in xarray/namedarray/core.py

View workflow job for this annotation

GitHub Actions / ubuntu-latest py3.10 bare-minimum

Duplicate dimension names present: dimensions {'x'} appear more than once in dims=('x', 'x'). We do not yet support duplicate dimension names, but we do allow initial construction of the object. We recommend you rename the dims immediately to become distinct, as most xarray functionality is likely to fail silently if you do not. To rename the dimensions you will need to set the ``.dims`` attribute of each variable, ``e.g. var.dims=('x0', 'x1')``.

Check warning on line 264 in xarray/namedarray/core.py

View workflow job for this annotation

GitHub Actions / ubuntu-latest py3.10 bare-minimum

Duplicate dimension names present: dimensions {'x'} appear more than once in dims=('x', 'x'). We do not yet support duplicate dimension names, but we do allow initial construction of the object. We recommend you rename the dims immediately to become distinct, as most xarray functionality is likely to fail silently if you do not. To rename the dimensions you will need to set the ``.dims`` attribute of each variable, ``e.g. var.dims=('x0', 'x1')``.
self._attrs = dict(attrs) if attrs else None

def __init_subclass__(cls, **kwargs: Any) -> None:
Expand Down Expand Up @@ -863,6 +863,49 @@
"""Coerces wrapped data into a numpy array, returning a Variable."""
return self._replace(data=self.to_numpy())

def as_array_type(
self,
asarray: Callable[[duckarray[Any, _DType_co]], duckarray[Any, _DType_co]],
**kwargs: Any,
) -> Self:
"""Converts wrapped data into a specific array type.

If the data is a chunked array, the conversion is applied to each block.

Parameters
----------
asarray : callable
Function that converts the data into a specific array type.
**kwargs : dict
Additional keyword arguments passed on to `asarray`.

Returns
-------
array : NamedArray
Array with the same data, but converted into a specific array type
"""
if is_chunked_array(self._data):
chunkmanager = get_chunked_array_type(self._data)
new_data = chunkmanager.map_blocks(asarray, self._data, **kwargs)
else:
new_data = asarray(self._data, **kwargs)

return self._replace(data=new_data)

def is_array_type(self, array_type: type) -> bool:
"""Check if the data is an instance of a specific array type.

Parameters
----------
array_type : type
Array type to check against.

Returns
-------
is_array_type : bool
"""
return isinstance(self._data, array_type)

def reduce(
self,
func: Callable[..., Any],
Expand Down
27 changes: 27 additions & 0 deletions xarray/tests/test_dataarray.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
from xarray.core.utils import is_scalar
from xarray.testing import _assert_internal_invariants
from xarray.tests import (
DuckArrayWrapper,
InaccessibleArray,
ReturnItem,
assert_allclose,
Expand Down Expand Up @@ -7167,6 +7168,32 @@ def test_from_pint_wrapping_dask(self) -> None:
np.testing.assert_equal(da.to_numpy(), arr)


def test_as_array_type_is_array_type() -> None:
da = xr.DataArray([1, 2, 3], dims=["x"], coords={"x": [4, 5, 6]})

assert da.is_array_type(np.ndarray)

result = da.as_array_type(lambda x: DuckArrayWrapper(x))

assert isinstance(result.data, DuckArrayWrapper)
assert isinstance(result.x.data, np.ndarray)
assert result.is_array_type(DuckArrayWrapper)


@requires_dask
def test_as_array_type_dask() -> None:
import dask.array

da = xr.DataArray([1, 2, 3], dims=["x"], coords={"x": [4, 5, 6]}).chunk()

result = da.as_array_type(lambda x: DuckArrayWrapper(x))

assert isinstance(result.data, dask.array.Array)
assert isinstance(result.data._meta, DuckArrayWrapper)
assert isinstance(result.x.data, np.ndarray)
assert result.is_array_type(dask.array.Array)


class TestStackEllipsis:
# https://github.com/pydata/xarray/issues/6051
def test_result_as_expected(self) -> None:
Expand Down
34 changes: 34 additions & 0 deletions xarray/tests/test_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -7641,6 +7641,40 @@ def test_from_pint_wrapping_dask(self) -> None:
assert_identical(result, expected)


def test_as_array_type_is_array_type() -> None:
ds = xr.Dataset(
{"a": ("x", [1, 2, 3])}, coords={"lat": ("x", [4, 5, 6]), "x": [7, 8, 9]}
)
# lat is a PandasIndex here
assert ds.drop_vars("lat").is_array_type(np.ndarray)

result = ds.as_array_type(lambda x: DuckArrayWrapper(x))

assert isinstance(result.a.data, DuckArrayWrapper)
assert isinstance(result.lat.data, DuckArrayWrapper)
assert isinstance(result.x.data, np.ndarray)
assert result.is_array_type(DuckArrayWrapper)


@requires_dask
def test_as_array_type_dask() -> None:
import dask.array

ds = xr.Dataset(
{"a": ("x", [1, 2, 3])}, coords={"lat": ("x", [4, 5, 6]), "x": [7, 8, 9]}
).chunk()

assert ds.is_array_type(dask.array.Array)

result = ds.as_array_type(lambda x: DuckArrayWrapper(x))

assert isinstance(result.a.data, dask.array.Array)
assert isinstance(result.a.data._meta, DuckArrayWrapper)
assert isinstance(result.lat.data, dask.array.Array)
assert isinstance(result.lat.data._meta, DuckArrayWrapper)
assert isinstance(result.x.data, np.ndarray)


def test_string_keys_typing() -> None:
"""Tests that string keys to `variables` are permitted by mypy"""

Expand Down
Loading