Merge branch 'main' into dependabot/github_actions/actions-5909998ba8

Author: asmeurer

.github/workflows/array-api-tests-numpy-1-26.yml

@@ -0,0 +1,11 @@
+name: Array API Tests (NumPy 1.26)
+
+on: [push, pull_request]
+
+jobs:
+  array-api-tests-numpy-latest:
+    uses: ./.github/workflows/array-api-tests.yml
+    with:
+      package-name: numpy
+      package-version: '== 1.26.*'
+      xfails-file-extra: '-1-26'

.github/workflows/array-api-tests-numpy.yml renamed to .github/workflows/array-api-tests-numpy-latest.yml

@@ -28,6 +28,11 @@ jobs:
           else
             PIP_EXTRA='numpy==1.26.*'
           fi
+
+          if [ "${{ matrix.python-version }}" == "3.9" ]; then
+            sed -i '/^ndonnx/d' requirements-dev.txt
+          fi
+
           python -m pip install -r requirements-dev.txt $PIP_EXTRA
 
       - name: Run Tests

.github/workflows/tests.yml

@@ -2,8 +2,8 @@
 
 This is a small wrapper around common array libraries that is compatible with
 the [Array API standard](https://data-apis.org/array-api/latest/). Currently,
-NumPy, CuPy, PyTorch, Dask, JAX and `sparse` are supported. If you want support
-for other array libraries, or if you encounter any issues, please [open an
-issue](https://github.com/data-apis/array-api-compat/issues).
+NumPy, CuPy, PyTorch, Dask, JAX, ndonnx and `sparse` are supported. If you want
+support for other array libraries, or if you encounter any issues, please [open
+an issue](https://github.com/data-apis/array-api-compat/issues).
 
 See the documentation for more details https://data-apis.org/array-api-compat/

README.md

@@ -48,6 +48,7 @@ def is_numpy_array(x):
     is_array_api_obj
     is_cupy_array
     is_torch_array
+    is_ndonnx_array
     is_dask_array
     is_jax_array
     is_pydata_sparse_array
@@ -78,11 +79,12 @@ def is_cupy_array(x):
     is_array_api_obj
     is_numpy_array
     is_torch_array
+    is_ndonnx_array
     is_dask_array
     is_jax_array
     is_pydata_sparse_array
     """
-    # Avoid importing NumPy if it isn't already
+    # Avoid importing CuPy if it isn't already
     if 'cupy' not in sys.modules:
         return False
 
@@ -118,6 +120,33 @@ def is_torch_array(x):
     # TODO: Should we reject ndarray subclasses?
     return isinstance(x, torch.Tensor)
 
+def is_ndonnx_array(x):
+    """
+    Return True if `x` is a ndonnx Array.
+
+    This function does not import ndonnx if it has not already been imported
+    and is therefore cheap to use.
+
+    See Also
+    --------
+
+    array_namespace
+    is_array_api_obj
+    is_numpy_array
+    is_cupy_array
+    is_ndonnx_array
+    is_dask_array
+    is_jax_array
+    is_pydata_sparse_array
+    """
+    # Avoid importing torch if it isn't already
+    if 'ndonnx' not in sys.modules:
+        return False
+
+    import ndonnx as ndx
+
+    return isinstance(x, ndx.Array)  
+
 def is_dask_array(x):
     """
     Return True if `x` is a dask.array Array.
@@ -133,6 +162,7 @@ def is_dask_array(x):
     is_numpy_array
     is_cupy_array
     is_torch_array
+    is_ndonnx_array
     is_jax_array
     is_pydata_sparse_array
     """
@@ -160,6 +190,7 @@ def is_jax_array(x):
     is_numpy_array
     is_cupy_array
     is_torch_array
+    is_ndonnx_array
     is_dask_array
     is_pydata_sparse_array
     """
@@ -188,6 +219,7 @@ def is_pydata_sparse_array(x) -> bool:
     is_numpy_array
     is_cupy_array
     is_torch_array
+    is_ndonnx_array
     is_dask_array
     is_jax_array
     """
@@ -211,6 +243,7 @@ def is_array_api_obj(x):
     is_numpy_array
     is_cupy_array
     is_torch_array
+    is_ndonnx_array
     is_dask_array
     is_jax_array
     """
@@ -613,6 +646,7 @@ def size(x):
     "is_jax_array",
     "is_numpy_array",
     "is_torch_array",
+    "is_ndonnx_array",
     "is_pydata_sparse_array",
     "size",
     "to_device",

array_api_compat/common/_helpers.py

@@ -1,5 +1,17 @@
 # FFT isn't conformant
 array_api_tests/test_fft.py
+array_api_tests/test_signatures.py::test_extension_func_signature[fft.fft]
+array_api_tests/test_signatures.py::test_extension_func_signature[fft.ifft]
+array_api_tests/test_signatures.py::test_extension_func_signature[fft.fftn]
+array_api_tests/test_signatures.py::test_extension_func_signature[fft.ifftn]
+array_api_tests/test_signatures.py::test_extension_func_signature[fft.rfft]
+array_api_tests/test_signatures.py::test_extension_func_signature[fft.irfft]
+array_api_tests/test_signatures.py::test_extension_func_signature[fft.rfftn]
+array_api_tests/test_signatures.py::test_extension_func_signature[fft.irfftn]
+array_api_tests/test_signatures.py::test_extension_func_signature[fft.hfft]
+array_api_tests/test_signatures.py::test_extension_func_signature[fft.ihfft]
+array_api_tests/test_signatures.py::test_extension_func_signature[fft.fftfreq]
+array_api_tests/test_signatures.py::test_extension_func_signature[fft.rfftfreq]
 
 # slow and not implemented in dask
 array_api_tests/test_linalg.py::test_matrix_power

dask-skips.txt

@@ -0,0 +1,47 @@
+# asarray(copy=False) is not yet implemented
+array_api_tests/test_creation_functions.py::test_asarray_arrays
+
+# finfo(float32).eps returns float32 but should return float
+array_api_tests/test_data_type_functions.py::test_finfo[float32]
+
+# Array methods and attributes not already on np.ndarray cannot be wrapped
+array_api_tests/test_has_names.py::test_has_names[array_method-__array_namespace__]
+array_api_tests/test_has_names.py::test_has_names[array_method-to_device]
+array_api_tests/test_has_names.py::test_has_names[array_attribute-device]
+array_api_tests/test_has_names.py::test_has_names[array_attribute-mT]
+
+# Array methods and attributes not already on np.ndarray cannot be wrapped
+array_api_tests/test_signatures.py::test_array_method_signature[__array_namespace__]
+array_api_tests/test_signatures.py::test_array_method_signature[to_device]
+
+# NumPy deviates in some special cases for floordiv
+array_api_tests/test_special_cases.py::test_binary[floor_divide(x1_i is +infinity and isfinite(x2_i) and x2_i > 0) -> +infinity]
+array_api_tests/test_special_cases.py::test_binary[floor_divide(x1_i is +infinity and isfinite(x2_i) and x2_i < 0) -> -infinity]
+array_api_tests/test_special_cases.py::test_binary[floor_divide(x1_i is -infinity and isfinite(x2_i) and x2_i > 0) -> -infinity]
+array_api_tests/test_special_cases.py::test_binary[floor_divide(x1_i is -infinity and isfinite(x2_i) and x2_i < 0) -> +infinity]
+array_api_tests/test_special_cases.py::test_binary[floor_divide(isfinite(x1_i) and x1_i > 0 and x2_i is -infinity) -> -0]
+array_api_tests/test_special_cases.py::test_binary[floor_divide(isfinite(x1_i) and x1_i < 0 and x2_i is +infinity) -> -0]
+array_api_tests/test_special_cases.py::test_binary[__floordiv__(x1_i is +infinity and isfinite(x2_i) and x2_i > 0) -> +infinity]
+array_api_tests/test_special_cases.py::test_binary[__floordiv__(x1_i is +infinity and isfinite(x2_i) and x2_i < 0) -> -infinity]
+array_api_tests/test_special_cases.py::test_binary[__floordiv__(x1_i is -infinity and isfinite(x2_i) and x2_i > 0) -> -infinity]
+array_api_tests/test_special_cases.py::test_binary[__floordiv__(x1_i is -infinity and isfinite(x2_i) and x2_i < 0) -> +infinity]
+array_api_tests/test_special_cases.py::test_binary[__floordiv__(isfinite(x1_i) and x1_i > 0 and x2_i is -infinity) -> -0]
+array_api_tests/test_special_cases.py::test_binary[__floordiv__(isfinite(x1_i) and x1_i < 0 and x2_i is +infinity) -> -0]
+array_api_tests/test_special_cases.py::test_iop[__ifloordiv__(x1_i is +infinity and isfinite(x2_i) and x2_i > 0) -> +infinity]
+array_api_tests/test_special_cases.py::test_iop[__ifloordiv__(x1_i is +infinity and isfinite(x2_i) and x2_i < 0) -> -infinity]
+array_api_tests/test_special_cases.py::test_iop[__ifloordiv__(x1_i is -infinity and isfinite(x2_i) and x2_i > 0) -> -infinity]
+array_api_tests/test_special_cases.py::test_iop[__ifloordiv__(x1_i is -infinity and isfinite(x2_i) and x2_i < 0) -> +infinity]
+array_api_tests/test_special_cases.py::test_iop[__ifloordiv__(isfinite(x1_i) and x1_i > 0 and x2_i is -infinity) -> -0]
+array_api_tests/test_special_cases.py::test_iop[__ifloordiv__(isfinite(x1_i) and x1_i < 0 and x2_i is +infinity) -> -0]
+
+# https://github.com/numpy/numpy/issues/21213
+array_api_tests/test_special_cases.py::test_binary[__pow__(x1_i is -infinity and x2_i > 0 and not (x2_i.is_integer() and x2_i % 2 == 1)) -> +infinity]
+array_api_tests/test_special_cases.py::test_binary[__pow__(x1_i is -0 and x2_i > 0 and not (x2_i.is_integer() and x2_i % 2 == 1)) -> +0]
+array_api_tests/test_special_cases.py::test_iop[__ipow__(x1_i is -infinity and x2_i > 0 and not (x2_i.is_integer() and x2_i % 2 == 1)) -> +infinity]
+array_api_tests/test_special_cases.py::test_iop[__ipow__(x1_i is -0 and x2_i > 0 and not (x2_i.is_integer() and x2_i % 2 == 1)) -> +0]
+array_api_tests/meta/test_hypothesis_helpers.py::test_symmetric_matrices
+
+# The test suite is incorrectly checking sums that have loss of significance
+# (https://github.com/data-apis/array-api-tests/issues/168)
+array_api_tests/test_statistical_functions.py::test_sum
+array_api_tests/test_statistical_functions.py::test_prod

numpy-1-26-xfails.txt

@@ -1,19 +1,6 @@
-# asarray(copy=False) is not yet implemented
-array_api_tests/test_creation_functions.py::test_asarray_arrays
-
 # finfo(float32).eps returns float32 but should return float
 array_api_tests/test_data_type_functions.py::test_finfo[float32]
 
-# Array methods and attributes not already on np.ndarray cannot be wrapped
-array_api_tests/test_has_names.py::test_has_names[array_method-__array_namespace__]
-array_api_tests/test_has_names.py::test_has_names[array_method-to_device]
-array_api_tests/test_has_names.py::test_has_names[array_attribute-device]
-array_api_tests/test_has_names.py::test_has_names[array_attribute-mT]
-
-# Array methods and attributes not already on np.ndarray cannot be wrapped
-array_api_tests/test_signatures.py::test_array_method_signature[__array_namespace__]
-array_api_tests/test_signatures.py::test_array_method_signature[to_device]
-
 # NumPy deviates in some special cases for floordiv
 array_api_tests/test_special_cases.py::test_binary[floor_divide(x1_i is +infinity and isfinite(x2_i) and x2_i > 0) -> +infinity]
 array_api_tests/test_special_cases.py::test_binary[floor_divide(x1_i is +infinity and isfinite(x2_i) and x2_i < 0) -> -infinity]
@@ -45,3 +32,8 @@ array_api_tests/meta/test_hypothesis_helpers.py::test_symmetric_matrices
 # (https://github.com/data-apis/array-api-tests/issues/168)
 array_api_tests/test_statistical_functions.py::test_sum
 array_api_tests/test_statistical_functions.py::test_prod
+
+# The test suite cannot properly get the signature for vecdot
+# https://github.com/numpy/numpy/pull/26237
+array_api_tests/test_signatures.py::test_func_signature[vecdot]
+array_api_tests/test_signatures.py::test_extension_func_signature[linalg.vecdot]

numpy-xfails.txt

@@ -5,3 +5,4 @@ numpy
 pytest
 torch
 sparse >=0.15.1
+ndonnx