diff options
| author | Gagandeep Singh <gdp.1807@gmail.com> | 2021-11-02 11:28:17 +0530 |
|---|---|---|
| committer | Gagandeep Singh <gdp.1807@gmail.com> | 2021-11-02 11:28:17 +0530 |
| commit | c04509e86e97a69a0b5fcbeebdbec66faad3dbe0 (patch) | |
| tree | b5940db3ad46e55b88d566ec058007dc3c6b7e72 /numpy/array_api/__init__.py | |
| parent | 56647dd47345a7fd24b4ee8d9d52025fcdc3b9ae (diff) | |
| parent | fae6fa47a3cf9b9c64af2f5bd11a3b644b1763d2 (diff) | |
| download | numpy-c04509e86e97a69a0b5fcbeebdbec66faad3dbe0.tar.gz | |
resolved conflicts
Diffstat (limited to 'numpy/array_api/__init__.py')
| -rw-r--r-- | numpy/array_api/__init__.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/numpy/array_api/__init__.py b/numpy/array_api/__init__.py index 790157504..d8b29057e 100644 --- a/numpy/array_api/__init__.py +++ b/numpy/array_api/__init__.py @@ -143,6 +143,8 @@ from ._creation_functions import ( meshgrid, ones, ones_like, + tril, + triu, zeros, zeros_like, ) @@ -160,6 +162,8 @@ __all__ += [ "meshgrid", "ones", "ones_like", + "tril", + "triu", "zeros", "zeros_like", ] @@ -333,21 +337,22 @@ __all__ += [ # from ._linear_algebra_functions import einsum # __all__ += ['einsum'] -from ._linear_algebra_functions import matmul, tensordot, transpose, vecdot +from ._linear_algebra_functions import matmul, tensordot, matrix_transpose, vecdot -__all__ += ["matmul", "tensordot", "transpose", "vecdot"] +__all__ += ["matmul", "tensordot", "matrix_transpose", "vecdot"] from ._manipulation_functions import ( concat, expand_dims, flip, + permute_dims, reshape, roll, squeeze, stack, ) -__all__ += ["concat", "expand_dims", "flip", "reshape", "roll", "squeeze", "stack"] +__all__ += ["concat", "expand_dims", "flip", "permute_dims", "reshape", "roll", "squeeze", "stack"] from ._searching_functions import argmax, argmin, nonzero, where |