Merge branch 'master' into more-linalg2

Author: asmeurer

.github/workflows/numpy.yml

@@ -11,7 +11,10 @@ jobs:
         python-version: [3.8, 3.9]
 
     steps:
-    - uses: actions/checkout@v1
+    - name: Checkout array-api-tests
+      uses: actions/checkout@v1
+      with:
+        submodules: 'true'
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:
@@ -30,8 +33,6 @@ jobs:
 
         # copy not implemented
         array_api_tests/test_creation_functions.py::test_asarray_arrays
-        # https://github.com/numpy/numpy/issues/18881
-        array_api_tests/test_creation_functions.py::test_linspace
         # https://github.com/numpy/numpy/issues/20870
         array_api_tests/test_data_type_functions.py::test_can_cast
         # The return dtype for trace is not consistent in the spec
@@ -44,6 +45,37 @@ jobs:
         # https://github.com/numpy/numpy/issues/20326#issuecomment-1012380448
         array_api_tests/test_set_functions.py
 
+        # https://github.com/numpy/numpy/issues/21373
+        array_api_tests/test_array_object.py::test_getitem
+
+        # missing copy arg
+        array_api_tests/test_signatures.py::test_func_signature[reshape]
+
+        # https://github.com/numpy/numpy/issues/21211
+        array_api_tests/test_special_cases.py::test_iop[__iadd__(x1_i is -0 and x2_i is -0) -> -0]
+        # https://github.com/numpy/numpy/issues/21213
+        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]
+        # noted diversions from spec
+        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]
+
         EOF
 
         pytest -v -rxXfE --ci

.gitignore

@@ -127,3 +127,6 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+# pytest-json-report
+.report.json

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "array_api_tests/array-api"]
+	path = array-api
+	url = https://github.com/data-apis/array-api/

README.md

@@ -10,6 +10,15 @@ welcome!
 
 ### Setup
 
+Currently we pin the Array API specification repo [`array-api`](https://github.com/data-apis/array-api/)
+as a git submodule. This might change in the future to better support vendoring
+use cases (see [#107](https://github.com/data-apis/array-api-tests/issues/107)),
+but for now be sure submodules are pulled too, e.g.
+
+```bash
+$ git submodule update --init
+```
+
 To run the tests, install the testing dependencies.
 
 ```bash

array-api

@@ -1,14 +1,12 @@
 from functools import wraps
 
 from hypothesis import strategies as st
-from hypothesis.extra.array_api import make_strategies_namespace
+from hypothesis.extra import array_api
 
 from ._array_module import mod as _xp
 
 __all__ = ["xps"]
 
-xps = make_strategies_namespace(_xp)
-
 
 # We monkey patch floats() to always disable subnormals as they are out-of-scope
 
@@ -23,5 +21,29 @@ def floats(*a, **kw):
 
 st.floats = floats
 
+
+# We do the same with xps.from_dtype() - this is not strictly necessary, as
+# the underlying floats() will never generate subnormals. We only do this
+# because internal logic in xps.from_dtype() assumes xp.finfo() has its
+# attributes as scalar floats, which is expected behaviour but disrupts many
+# unrelated tests.
+try:
+    __from_dtype = array_api._from_dtype
+
+    @wraps(__from_dtype)
+    def _from_dtype(*a, **kw):
+        kw["allow_subnormal"] = False
+        return __from_dtype(*a, **kw)
+
+    array_api._from_dtype = _from_dtype
+except AttributeError:
+    # Ignore monkey patching if Hypothesis changes the private API
+    pass
+
+
+xps = array_api.make_strategies_namespace(_xp)
+
+
 from . import _version
-__version__ = _version.get_versions()['version']
+
+__version__ = _version.get_versions()["version"]

array_api_tests/__init__.py

@@ -1,7 +1,7 @@
 import os
 from importlib import import_module
 
-from . import function_stubs
+from . import stubs
 
 # Replace this with a specific array module to test it, for example,
 #
@@ -53,38 +53,18 @@ def __repr__(self):
     __call__ = _raise
     __getattr__ = _raise
 
-_integer_dtypes = [
-    'int8',
-    'int16',
-    'int32',
-    'int64',
-    'uint8',
-    'uint16',
-    'uint32',
-    'uint64',
-]
-
-_floating_dtypes = [
-    'float32',
-    'float64',
-]
-
-_numeric_dtypes = [
-    *_integer_dtypes,
-    *_floating_dtypes,
-]
-
-_boolean_dtypes = [
-    'bool',
-]
-
 _dtypes = [
-    *_boolean_dtypes,
-    *_numeric_dtypes
+    "bool",
+    "uint8", "uint16", "uint32", "uint64",
+    "int8", "int16", "int32", "int64",
+    "float32", "float64",
 ]
+_constants = ["e", "inf", "nan", "pi"]
+_funcs = [f.__name__ for funcs in stubs.category_to_funcs.values() for f in funcs]
+_top_level_attrs = _dtypes + _constants + _funcs + stubs.EXTENSIONS
 
-for func_name in function_stubs.__all__ + _dtypes:
+for attr in _top_level_attrs:
     try:
-        globals()[func_name] = getattr(mod, func_name)
+        globals()[attr] = getattr(mod, attr)
     except AttributeError:
-        globals()[func_name] = _UndefinedStub(func_name)
+        globals()[attr] = _UndefinedStub(attr)

array_api_tests/_array_module.py

@@ -0,0 +1,16 @@
+import re
+
+import pytest
+
+r_int_pow_promotion = re.compile(r"test.+promotion\[.*pow.*\(u?int.+\]")
+
+
+def pytest_collection_modifyitems(config, items):
+    """Skips the faulty integer type promotion tests for pow-related functions"""
+    for item in items:
+        if r_int_pow_promotion.match(item.name):
+            item.add_marker(
+                pytest.mark.skip(
+                    reason="faulty test logic - negative exponents generated"
+                )
+            )