finish rename and fix linalg tests

Author: lithomas1

.github/workflows/array-api-tests-dask.yml

@@ -6,6 +6,6 @@ jobs:
   array-api-tests-dask:
     uses: ./.github/workflows/array-api-tests.yml
     with:
-      package-name: dask
+      package-name: dask.array
       extra-requires: numpy
       pytest-extra-args: --disable-deadline --max-examples=5

array_api_compat/common/_linalg.py

@@ -74,7 +74,8 @@ def matrix_rank(x: ndarray,
     # dimensional arrays.
     if x.ndim < 2:
         raise xp.linalg.LinAlgError("1-dimensional array given. Array must be at least two-dimensional")
-    S = xp.linalg.svd(x, compute_uv=False, **kwargs)
+    S = xp.linalg.svdvals(x, **kwargs)
+    #S = xp.linalg.svd(x, compute_uv=False, **kwargs)
     if rtol is None:
         tol = S.max(axis=-1, keepdims=True) * max(x.shape[-2:]) * xp.finfo(S.dtype).eps
     else:

array_api_compat/dask/array/__init__.py

@@ -4,3 +4,5 @@
 from ._aliases import *
 
 __array_api_version__ = '2022.12'
+
+__import__(__package__ + '.linalg')

array_api_compat/dask/array/_aliases.py

@@ -48,6 +48,8 @@
 # This arange func is modified from the common one to
 # not pass stop/step as keyword arguments, which will cause
 # an error with dask
+
+# TODO: delete the xp stuff, it shouldn't be necessary
 def dask_arange(
     start: Union[int, float],
     /,
@@ -118,3 +120,4 @@ def dask_arange(
     concatenate as concat,
 )
 
+del da

array_api_compat/dask/array/linalg.py

@@ -1,34 +1,42 @@
-from dask.array.linalg import *
-from dask.array.linalg import __all__ as linalg_all
+from __future__ import annotations
 
+from dask.array.linalg import *
 from ...common import _linalg
 from ..._internal import get_xp
-from ._aliases import (matmul, matrix_transpose, tensordot, vecdot)
+from dask.array import matmul, tensordot, trace, outer
+from ._aliases import matrix_transpose, vecdot
 
 import dask.array as da
 
-cross = get_xp(da)(_linalg.cross)
-outer = get_xp(da)(_linalg.outer)
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from typing import Optional, Union, Tuple
+    from ...common._typing import ndarray, Device, Dtype
+
+#cross = get_xp(da)(_linalg.cross)
+#outer = get_xp(da)(_linalg.outer)
 EighResult = _linalg.EighResult
 QRResult = _linalg.QRResult
 SlogdetResult = _linalg.SlogdetResult
 SVDResult = _linalg.SVDResult
-eigh = get_xp(da)(_linalg.eigh)
 qr = get_xp(da)(_linalg.qr)
-slogdet = get_xp(da)(_linalg.slogdet)
-svd = get_xp(da)(_linalg.svd)
+#svd = get_xp(da)(_linalg.svd)
 cholesky = get_xp(da)(_linalg.cholesky)
 matrix_rank = get_xp(da)(_linalg.matrix_rank)
-pinv = get_xp(da)(_linalg.pinv)
+#pinv = get_xp(da)(_linalg.pinv)
 matrix_norm = get_xp(da)(_linalg.matrix_norm)
-svdvals = get_xp(da)(_linalg.svdvals)
+
+def svdvals(x: ndarray) -> Union[ndarray, Tuple[ndarray, ...]]:
+    # TODO: can't avoid computing U or V for dask
+    _, s, _ =  svd(x)
+    return s
+
 vector_norm = get_xp(da)(_linalg.vector_norm)
 diagonal = get_xp(da)(_linalg.diagonal)
-trace = get_xp(da)(_linalg.trace)
 
-__all__ = linalg_all + _linalg.__all__
+#__all__ = linalg_all + _linalg.__all__
 
 del get_xp
 del da
-del linalg_all
+#del linalg_all
 del _linalg

dask-skips.txt

@@ -0,0 +1,5 @@
+# FFT isn't conformant
+array_api_tests/test_fft.py
+
+# slow and not implemented in dask
+array_api_tests/test_linalg.py::test_matrix_power

dask.array-skips.txt

@@ -71,65 +71,51 @@ array_api_tests/test_set_functions.py::test_unique_inverse
 array_api_tests/test_set_functions.py::test_unique_values
 
 # Linalg failures (signature failures/missing methods)
-array_api_tests/test_has_names.py::test_has_names[linalg-cross]
-array_api_tests/test_has_names.py::test_has_names[linalg-det]
-array_api_tests/test_has_names.py::test_has_names[linalg-diagonal]
-array_api_tests/test_has_names.py::test_has_names[linalg-eigh]
-array_api_tests/test_has_names.py::test_has_names[linalg-eigvalsh]
-array_api_tests/test_has_names.py::test_has_names[linalg-matmul]
-array_api_tests/test_has_names.py::test_has_names[linalg-matrix_norm]
-array_api_tests/test_has_names.py::test_has_names[linalg-matrix_power]
-array_api_tests/test_has_names.py::test_has_names[linalg-matrix_rank]
-array_api_tests/test_has_names.py::test_has_names[linalg-matrix_transpose]
-array_api_tests/test_has_names.py::test_has_names[linalg-outer]
-array_api_tests/test_has_names.py::test_has_names[linalg-pinv]
-array_api_tests/test_has_names.py::test_has_names[linalg-slogdet]
-array_api_tests/test_has_names.py::test_has_names[linalg-svdvals]
-array_api_tests/test_has_names.py::test_has_names[linalg-tensordot]
-array_api_tests/test_has_names.py::test_has_names[linalg-trace]
-array_api_tests/test_has_names.py::test_has_names[linalg-vecdot]
-array_api_tests/test_has_names.py::test_has_names[linalg-vector_norm]
-array_api_tests/test_has_names.py::test_has_names[creation-from_dlpack]
-array_api_tests/test_has_names.py::test_has_names[array_method-__dlpack__]
-array_api_tests/test_has_names.py::test_has_names[array_method-__dlpack_device__]
-array_api_tests/test_linalg.py::test_cross
-array_api_tests/test_linalg.py::test_det
-array_api_tests/test_linalg.py::test_diagonal
-array_api_tests/test_linalg.py::test_eigvalsh
-array_api_tests/test_linalg.py::test_matrix_norm
-array_api_tests/test_linalg.py::test_matrix_rank
-array_api_tests/test_linalg.py::test_outer
-array_api_tests/test_linalg.py::test_pinv
-array_api_tests/test_linalg.py::test_slogdet
+
+
+# fails for ndim > 2
 array_api_tests/test_linalg.py::test_svdvals
+array_api_tests/test_linalg.py::test_cholesky
+# dtype mismatch got uint64, but should be uint8, NPY_PROMOTION_STATE=weak doesn't help :(
 array_api_tests/test_linalg.py::test_tensordot
+# probably same reason for failing as numpy
 array_api_tests/test_linalg.py::test_trace
-array_api_tests/test_linalg.py::test_cholesky
-array_api_tests/test_signatures.py::test_extension_func_signature[linalg.cholesky]
+
+# Linalg - these don't exist in dask
 array_api_tests/test_signatures.py::test_extension_func_signature[linalg.cross]
 array_api_tests/test_signatures.py::test_extension_func_signature[linalg.det]
-array_api_tests/test_signatures.py::test_extension_func_signature[linalg.diagonal]
 array_api_tests/test_signatures.py::test_extension_func_signature[linalg.eigh]
 array_api_tests/test_signatures.py::test_extension_func_signature[linalg.eigvalsh]
-array_api_tests/test_signatures.py::test_extension_func_signature[linalg.matmul]
-array_api_tests/test_signatures.py::test_extension_func_signature[linalg.matrix_norm]
 array_api_tests/test_signatures.py::test_extension_func_signature[linalg.matrix_power]
-array_api_tests/test_signatures.py::test_extension_func_signature[linalg.matrix_rank]
-array_api_tests/test_signatures.py::test_extension_func_signature[linalg.matrix_transpose]
-array_api_tests/test_signatures.py::test_extension_func_signature[linalg.outer]
 array_api_tests/test_signatures.py::test_extension_func_signature[linalg.pinv]
-array_api_tests/test_signatures.py::test_extension_func_signature[linalg.qr]
 array_api_tests/test_signatures.py::test_extension_func_signature[linalg.slogdet]
-array_api_tests/test_signatures.py::test_extension_func_signature[linalg.svd]
-array_api_tests/test_signatures.py::test_extension_func_signature[linalg.svdvals]
-array_api_tests/test_signatures.py::test_extension_func_signature[linalg.tensordot]
-array_api_tests/test_signatures.py::test_extension_func_signature[linalg.trace]
-array_api_tests/test_signatures.py::test_extension_func_signature[linalg.vecdot]
-array_api_tests/test_signatures.py::test_extension_func_signature[linalg.vector_norm]
-# errors
-array_api_tests/test_linalg.py::test_matrix_power
+array_api_tests/test_linalg.py::test_cross
+array_api_tests/test_linalg.py::test_det
+array_api_tests/test_linalg.py::test_eigvalsh
+array_api_tests/test_linalg.py::test_pinv
+array_api_tests/test_linalg.py::test_slogdet
+array_api_tests/test_has_names.py::test_has_names[linalg-cross]
+array_api_tests/test_has_names.py::test_has_names[linalg-det]
+array_api_tests/test_has_names.py::test_has_names[linalg-eigh]
+array_api_tests/test_has_names.py::test_has_names[linalg-eigvalsh]
+array_api_tests/test_has_names.py::test_has_names[linalg-matrix_power]
+array_api_tests/test_has_names.py::test_has_names[linalg-pinv]
+array_api_tests/test_has_names.py::test_has_names[linalg-slogdet]
+
+array_api_tests/test_linalg.py::test_matrix_norm
+array_api_tests/test_linalg.py::test_matrix_rank
+
+# missing mode kw
+# https://github.com/dask/dask/issues/10388
 array_api_tests/test_linalg.py::test_qr
+
+# Constructing the input arrays fails to a weird shape error...
 array_api_tests/test_linalg.py::test_solve
+
+# missing full_matrics kw
+# https://github.com/dask/dask/issues/10389
+# also only supports 2-d inputs
+array_api_tests/test_signatures.py::test_extension_func_signature[linalg.svd]
 array_api_tests/test_linalg.py::test_svd
 
 # Missing dlpack stuff
@@ -138,6 +124,9 @@ array_api_tests/test_signatures.py::test_array_method_signature[__array_namespac
 array_api_tests/test_signatures.py::test_array_method_signature[__dlpack__]
 array_api_tests/test_signatures.py::test_array_method_signature[__dlpack_device__]
 array_api_tests/test_signatures.py::test_array_method_signature[to_device]
+array_api_tests/test_has_names.py::test_has_names[creation-from_dlpack]
+array_api_tests/test_has_names.py::test_has_names[array_method-__dlpack__]
+array_api_tests/test_has_names.py::test_has_names[array_method-__dlpack_device__]
 
 # Some cases unsupported by dask
 array_api_tests/test_manipulation_functions.py::test_roll