Skip to content

Commit

Permalink
ak.flatten and ak.ravel should test for nplike.ndarray, not np.ndarra…
Browse files Browse the repository at this point in the history
…y. (#1340)
  • Loading branch information
jpivarski committed Mar 3, 2022
1 parent d4b04ae commit 62e15fd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions src/awkward/_v2/operations/structure/ak_flatten.py
Expand Up @@ -98,8 +98,9 @@ def flatten(array, axis=1, highlevel=True, behavior=None):

if axis is None:
out = layout.completely_flatten(function_name="ak.flatten")
assert isinstance(out, tuple) and all(isinstance(x, np.ndarray) for x in out)

assert isinstance(out, tuple) and all(
isinstance(x, nplike.ndarray) for x in out
)
out = ak._v2.contents.NumpyArray(nplike.concatenate(out))

elif axis == 0 or layout.axis_wrap_if_negative(axis) == 0:
Expand Down
2 changes: 1 addition & 1 deletion src/awkward/_v2/operations/structure/ak_ravel.py
Expand Up @@ -48,7 +48,7 @@ def ravel(array, highlevel=True, behavior=None):
nplike = ak.nplike.of(layout)

out = layout.completely_flatten(function_name="ak.ravel")
assert isinstance(out, tuple) and all(isinstance(x, np.ndarray) for x in out)
assert isinstance(out, tuple) and all(isinstance(x, nplike.ndarray) for x in out)

if any(isinstance(x, nplike.ma.MaskedArray) for x in out):
out = ak._v2.contents.NumpyArray(nplike.ma.concatenate(out))
Expand Down

0 comments on commit 62e15fd

Please sign in to comment.