Fix main namespace linalg functions in numpy and cupy

Author: asmeurer

array_api_compat/common/_aliases.py

@@ -444,7 +444,8 @@ def vecdot(x1: ndarray, x2: ndarray, /, xp, *, axis: int = -1) -> ndarray:
     return res[..., 0, 0]
 
 __all__ = ['arange', 'empty', 'empty_like', 'eye', 'full', 'full_like',
-           'linspace', 'ones', 'ones_like', 'zeros', 'zeros_like', 'UniqueAllResult', 'UniqueCountsResult', 'UniqueInverseResult',
+           'linspace', 'ones', 'ones_like', 'zeros', 'zeros_like',
+           'UniqueAllResult', 'UniqueCountsResult', 'UniqueInverseResult',
            'unique_all', 'unique_counts', 'unique_inverse', 'unique_values',
            'astype', 'std', 'var', 'permute_dims', 'reshape', 'argsort',
            'sort', 'sum', 'prod', 'ceil', 'floor', 'trunc', 'matmul',

array_api_compat/common/_linalg.py

@@ -7,7 +7,7 @@
 
 from numpy.core.numeric import normalize_axis_tuple
 
-from .._aliases import matmul, matrix_transpose, tensordot, vecdot
+from ._aliases import matmul, matrix_transpose, tensordot, vecdot
 from .._internal import get_xp
 
 # These are in the main NumPy namespace but not in numpy.linalg

array_api_compat/cupy/_aliases.py

@@ -57,6 +57,10 @@
 ceil = get_xp(cp)(_aliases.ceil)
 floor = get_xp(cp)(_aliases.floor)
 trunc = get_xp(cp)(_aliases.trunc)
+matmul = get_xp(cp)(_aliases.matmul)
+matrix_transpose = get_xp(cp)(_aliases.matrix_transpose)
+tensordot = get_xp(cp)(_aliases.tensordot)
+vecdot = get_xp(cp)(_aliases.vecdot)
 
 __all__ = _aliases.__all__ + ['asarray', 'asarray_cupy', 'bool', 'acos',
                               'acosh', 'asin', 'asinh', 'atan', 'atan2',

array_api_compat/cupy/linalg.py

@@ -10,13 +10,12 @@
 
 from ..common import _linalg
 from .._internal import get_xp
+from ._aliases import (matmul, matrix_transpose, tensordot, vecdot)
 
 import cupy as cp
 
 cross = get_xp(cp)(_linalg.cross)
-matmul = get_xp(cp)(_linalg.matmul)
 outer = get_xp(cp)(_linalg.outer)
-tensordot = get_xp(cp)(_linalg.tensordot)
 EighResult = _linalg.EighResult
 QRResult = _linalg.QRResult
 SlogdetResult = _linalg.SlogdetResult
@@ -29,9 +28,7 @@
 matrix_rank = get_xp(cp)(_linalg.matrix_rank)
 pinv = get_xp(cp)(_linalg.pinv)
 matrix_norm = get_xp(cp)(_linalg.matrix_norm)
-matrix_transpose = get_xp(cp)(_linalg.matrix_transpose)
 svdvals = get_xp(cp)(_linalg.svdvals)
-vecdot = get_xp(cp)(_linalg.vecdot)
 vector_norm = get_xp(cp)(_linalg.vector_norm)
 diagonal = get_xp(cp)(_linalg.diagonal)
 trace = get_xp(cp)(_linalg.trace)

array_api_compat/numpy/_aliases.py

@@ -57,6 +57,10 @@
 ceil = get_xp(np)(_aliases.ceil)
 floor = get_xp(np)(_aliases.floor)
 trunc = get_xp(np)(_aliases.trunc)
+matmul = get_xp(np)(_aliases.matmul)
+matrix_transpose = get_xp(np)(_aliases.matrix_transpose)
+tensordot = get_xp(np)(_aliases.tensordot)
+vecdot = get_xp(np)(_aliases.vecdot)
 
 __all__ = _aliases.__all__ + ['asarray', 'asarray_numpy', 'bool', 'acos',
                               'acosh', 'asin', 'asinh', 'atan', 'atan2',

array_api_compat/numpy/linalg.py

@@ -3,13 +3,12 @@
 
 from ..common import _linalg
 from .._internal import get_xp
+from ._aliases import (matmul, matrix_transpose, tensordot, vecdot)
 
 import numpy as np
 
 cross = get_xp(np)(_linalg.cross)
-matmul = get_xp(np)(_linalg.matmul)
 outer = get_xp(np)(_linalg.outer)
-tensordot = get_xp(np)(_linalg.tensordot)
 EighResult = _linalg.EighResult
 QRResult = _linalg.QRResult
 SlogdetResult = _linalg.SlogdetResult
@@ -22,9 +21,7 @@
 matrix_rank = get_xp(np)(_linalg.matrix_rank)
 pinv = get_xp(np)(_linalg.pinv)
 matrix_norm = get_xp(np)(_linalg.matrix_norm)
-matrix_transpose = get_xp(np)(_linalg.matrix_transpose)
 svdvals = get_xp(np)(_linalg.svdvals)
-vecdot = get_xp(np)(_linalg.vecdot)
 vector_norm = get_xp(np)(_linalg.vector_norm)
 diagonal = get_xp(np)(_linalg.diagonal)
 trace = get_xp(np)(_linalg.trace)