Skip to content

Commit 8704501

Browse files
Fix automatic broadcasting when wrapping array api class (#8669)
* test automatic broadcasting * fix bug * whatsnew * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent f5d22a6 commit 8704501

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

doc/whats-new.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ Deprecations
3737
Bug fixes
3838
~~~~~~~~~
3939

40+
- Fix bug with broadcasting when wrapping array API-compliant classes. (:issue:`8665`, :pull:`8669`)
41+
By `Tom Nicholas <https://github.com/TomNicholas>`_.
4042
- Ensure :py:meth:`DataArray.unstack` works when wrapping array API-compliant classes. (:issue:`8666`, :pull:`8668`)
4143
By `Tom Nicholas <https://github.com/TomNicholas>`_.
4244

xarray/core/variable.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1476,7 +1476,8 @@ def set_dims(self, dims, shape=None):
14761476
tmp_shape = tuple(dims_map[d] for d in expanded_dims)
14771477
expanded_data = duck_array_ops.broadcast_to(self.data, tmp_shape)
14781478
else:
1479-
expanded_data = self.data[(None,) * (len(expanded_dims) - self.ndim)]
1479+
indexer = (None,) * (len(expanded_dims) - self.ndim) + (...,)
1480+
expanded_data = self.data[indexer]
14801481

14811482
expanded_var = Variable(
14821483
expanded_dims, expanded_data, self._attrs, self._encoding, fastpath=True

xarray/tests/test_array_api.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,22 @@ def test_broadcast(arrays: tuple[xr.DataArray, xr.DataArray]) -> None:
7777
assert_equal(a, e)
7878

7979

80+
def test_broadcast_during_arithmetic(arrays: tuple[xr.DataArray, xr.DataArray]) -> None:
81+
np_arr, xp_arr = arrays
82+
np_arr2 = xr.DataArray(np.array([1.0, 2.0]), dims="x")
83+
xp_arr2 = xr.DataArray(xp.asarray([1.0, 2.0]), dims="x")
84+
85+
expected = np_arr * np_arr2
86+
actual = xp_arr * xp_arr2
87+
assert isinstance(actual.data, Array)
88+
assert_equal(actual, expected)
89+
90+
expected = np_arr2 * np_arr
91+
actual = xp_arr2 * xp_arr
92+
assert isinstance(actual.data, Array)
93+
assert_equal(actual, expected)
94+
95+
8096
def test_concat(arrays: tuple[xr.DataArray, xr.DataArray]) -> None:
8197
np_arr, xp_arr = arrays
8298
expected = xr.concat((np_arr, np_arr), dim="x")

0 commit comments

Comments
 (0)