Skip to content

Commit

Permalink
Merge branch 'main' into agoose77/fix-dont-use-asarray-on-content-or-…
Browse files Browse the repository at this point in the history
…index
  • Loading branch information
agoose77 authored Oct 4, 2023
2 parents c680b1c + c377185 commit 8473c7f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/awkward/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,10 @@ def __cuda_array_interface__(self):
def __array_interface__(self):
return self._data.__array_interface__

def __dlpack__(self) -> tuple[int, int]:
def __dlpack_device__(self) -> tuple[int, int]:
return self._data.__dlpack_device__()

def __dlpack_device__(self, stream: Any = None) -> Any:
def __dlpack__(self, stream: Any = None) -> Any:
if stream is None:
return self._data.__dlpack__()
else:
Expand Down

0 comments on commit 8473c7f

Please sign in to comment.