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.

Sign up for GitHub

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

explicitly skip using __array_namespace__ for numpy.ndarray #8526

Merged
merged 4 commits into from
Dec 6, 2023
Merged

explicitly skip using __array_namespace__ for numpy.ndarray #8526

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5cd39a
explicitly skip using `__array_namespace__` for `numpy.ndarray`
keewis Dec 6, 2023
a2bdb56
Merge branch 'main' into concat
keewis Dec 6, 2023
d04a2e7
actually use the array in question
keewis Dec 6, 2023
d5e20c6
Merge branch 'main' into concat
dcherian Dec 6, 2023
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
5 changes: 4 additions & 1 deletion xarray/core/duck_array_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,10 @@ def fillna(data, other):

def concatenate(arrays, axis=0):
"""concatenate() with better dtype promotion rules."""
if hasattr(arrays[0], "__array_namespace__"):
# TODO: remove the additional check once `numpy` adds `concat` to its array namespace
if hasattr(arrays[0], "__array_namespace__") and not isinstance(
arrays[0], np.ndarray
):
xp = get_array_namespace(arrays[0])
return xp.concat(as_shared_dtype(arrays, xp=xp), axis=axis)
return _concatenate(as_shared_dtype(arrays), axis=axis)
Expand Down
Loading