diff options
| author | Sebastian Berg <sebastian@sipsolutions.net> | 2021-11-09 13:18:57 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 13:18:57 -0600 |
| commit | 0de29c58e3eede2bb65b51dbf72a93b767d04d49 (patch) | |
| tree | 1c4bcd57119ec18d434bcd8947783d1d377299f8 /numpy/core/numeric.py | |
| parent | c280e21a74f2a6fd16d9c318696fcf167689baa3 (diff) | |
| parent | 5b94a03b93d171232e0a64dc2160e4f2139e9b1a (diff) | |
| download | numpy-0de29c58e3eede2bb65b51dbf72a93b767d04d49.tar.gz | |
Merge pull request #19083 from hameerabbasi/dlpack
ENH: Implement the DLPack Array API protocols for ndarray.
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index 1654e8364..344d40d93 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -13,8 +13,8 @@ from .multiarray import ( WRAP, arange, array, asarray, asanyarray, ascontiguousarray, asfortranarray, broadcast, can_cast, compare_chararrays, concatenate, copyto, dot, dtype, empty, - empty_like, flatiter, frombuffer, fromfile, fromiter, fromstring, - inner, lexsort, matmul, may_share_memory, + empty_like, flatiter, frombuffer, _from_dlpack, fromfile, fromiter, + fromstring, inner, lexsort, matmul, may_share_memory, min_scalar_type, ndarray, nditer, nested_iters, promote_types, putmask, result_type, set_numeric_ops, shares_memory, vdot, where, zeros, normalize_axis_index) @@ -41,7 +41,7 @@ __all__ = [ 'newaxis', 'ndarray', 'flatiter', 'nditer', 'nested_iters', 'ufunc', 'arange', 'array', 'asarray', 'asanyarray', 'ascontiguousarray', 'asfortranarray', 'zeros', 'count_nonzero', 'empty', 'broadcast', 'dtype', - 'fromstring', 'fromfile', 'frombuffer', 'where', + 'fromstring', 'fromfile', 'frombuffer', '_from_dlpack', 'where', 'argwhere', 'copyto', 'concatenate', 'fastCopyAndTranspose', 'lexsort', 'set_numeric_ops', 'can_cast', 'promote_types', 'min_scalar_type', 'result_type', 'isfortran', 'empty_like', 'zeros_like', 'ones_like', |