array-api-strict 2.1.1__py3-none-any.whl → 2.1.3__py3-none-any.whl

array_api_strict/_array_object.py

@@ -38,7 +38,7 @@ import types
 
 if TYPE_CHECKING:
     from typing import Optional, Tuple, Union, Any
-    from ._typing import PyCapsule, Device, Dtype
+    from ._typing import PyCapsule, Dtype
     import numpy.typing as npt
 
 import numpy as np
@@ -66,7 +66,9 @@ ALL_DEVICES = (CPU_DEVICE, Device("device1"), Device("device2"))
 
 _default = object()
 
-_allow_array = False
+# See https://github.com/data-apis/array-api-strict/issues/67 and the comment
+# on __array__ below.
+_allow_array = True
 
 class Array:
     """
@@ -147,15 +149,18 @@ class Array:
             mid = np.array2string(self._array, separator=', ', prefix=prefix, suffix=suffix)
         return prefix + mid + suffix
 
-    # Disallow __array__, meaning calling `np.func()` on an array_api_strict
-    # array will give an error. If we don't explicitly disallow it, NumPy
-    # defaults to creating an object dtype array, which would lead to
-    # confusing error messages at best and surprising bugs at worst.
-    #
-    # The alternative of course is to just support __array__, which is what we
-    # used to do. But this isn't actually supported by the standard, so it can
+    # In the future, _allow_array will be set to False, which will disallow
+    # __array__. This means calling `np.func()` on an array_api_strict array
+    # will give an error. If we don't explicitly disallow it, NumPy defaults
+    # to creating an object dtype array, which would lead to confusing error
+    # messages at best and surprising bugs at worst. The reason for doing this
+    # is that __array__ is not actually supported by the standard, so it can
     # lead to code assuming np.asarray(other_array) would always work in the
     # standard.
+    #
+    # This was implemented historically for compatibility, and removing it has
+    # caused issues for some libraries (see
+    # https://github.com/data-apis/array-api-strict/issues/67).
     def __array__(self, dtype: None | np.dtype[Any] = None, copy: None | bool = None) -> npt.NDArray[Any]:
         # We have to allow this to be internally enabled as there's no other
         # easy way to parse a list of Array objects in asarray().
@@ -586,15 +591,24 @@ class Array:
             if copy is not _default:
                 raise ValueError("The copy argument to __dlpack__ requires at least version 2023.12 of the array API")
 
-        # Going to wait for upstream numpy support
-        if max_version not in [_default, None]:
-            raise NotImplementedError("The max_version argument to __dlpack__ is not yet implemented")
-        if dl_device not in [_default, None]:
-            raise NotImplementedError("The device argument to __dlpack__ is not yet implemented")
-        if copy not in [_default, None]:
-            raise NotImplementedError("The copy argument to __dlpack__ is not yet implemented")
+        if np.lib.NumpyVersion(np.__version__) < '2.1.0':
+            if max_version not in [_default, None]:
+                raise NotImplementedError("The max_version argument to __dlpack__ is not yet implemented")
+            if dl_device not in [_default, None]:
+                raise NotImplementedError("The device argument to __dlpack__ is not yet implemented")
+            if copy not in [_default, None]:
+                raise NotImplementedError("The copy argument to __dlpack__ is not yet implemented")
 
-        return self._array.__dlpack__(stream=stream)
+            return self._array.__dlpack__(stream=stream)
+        else:
+            kwargs = {'stream': stream}
+            if max_version is not _default:
+                kwargs['max_version'] = max_version
+            if dl_device is not _default:
+                kwargs['dl_device'] = dl_device
+            if copy is not _default:
+                kwargs['copy'] = copy
+            return self._array.__dlpack__(**kwargs)
 
     def __dlpack_device__(self: Array, /) -> Tuple[IntEnum, int]:
         """

array_api_strict/_creation_functions.py

@@ -83,7 +83,7 @@ def asarray(
     if isinstance(obj, Array) and device is None:
         device = obj.device
 
-    if np.__version__[0] < '2':
+    if np.lib.NumpyVersion(np.__version__) < '2.0.0':
         if copy is False:
             # Note: copy=False is not yet implemented in np.asarray for
             # NumPy 1

array_api_strict/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-11-07T13:18:01-0700",
+ "date": "2024-11-08T16:00:41-0700",
  "dirty": false,
  "error": null,
- "full-revisionid": "6e59494cbfd3ed949cf2009f778fc4cfdfc3eb04",
- "version": "2.1.1"
+ "full-revisionid": "310bb626b04ea61e24feca146440dd4ec1f6cf5b",
+ "version": "2.1.3"
 }
 '''  # END VERSION_JSON
 

array_api_strict/tests/test_array_object.py

@@ -364,6 +364,23 @@ def test_array_conversion():
         with pytest.raises(RuntimeError, match="Can not convert array"):
             asarray([a])
 
+def test__array__():
+    # __array__ should work for now
+    a = ones((2, 3))
+    np.array(a)
+
+    # Test the _allow_array private global flag for disabling it in the
+    # future.
+    from .. import _array_object
+    original_value = _array_object._allow_array
+    try:
+        _array_object._allow_array = False
+        a = ones((2, 3))
+        with pytest.raises(ValueError, match="Conversion from an array_api_strict array to a NumPy ndarray is not supported"):
+            np.array(a)
+    finally:
+        _array_object._allow_array = original_value
+
 def test_allow_newaxis():
     a = ones(5)
     indexed_a = a[None, :]
@@ -448,7 +465,7 @@ def test_iter():
     pytest.raises(TypeError, lambda: iter(ones((3, 3))))
 
 @pytest.mark.parametrize("api_version", ['2021.12', '2022.12', '2023.12'])
-def dlpack_2023_12(api_version):
+def test_dlpack_2023_12(api_version):
     if api_version == '2021.12':
         with pytest.warns(UserWarning):
             set_array_api_strict_flags(api_version=api_version)
@@ -459,19 +476,38 @@ def dlpack_2023_12(api_version):
     # Never an error
     a.__dlpack__()
 
-
-    exception = NotImplementedError if api_version >= '2023.12' else ValueError
-    pytest.raises(exception, lambda:
-                  a.__dlpack__(dl_device=CPU_DEVICE))
-    pytest.raises(exception, lambda:
-                  a.__dlpack__(dl_device=None))
-    pytest.raises(exception, lambda:
-                  a.__dlpack__(max_version=(1, 0)))
-    pytest.raises(exception, lambda:
-                  a.__dlpack__(max_version=None))
-    pytest.raises(exception, lambda:
-                    a.__dlpack__(copy=False))
-    pytest.raises(exception, lambda:
-                    a.__dlpack__(copy=True))
-    pytest.raises(exception, lambda:
-                    a.__dlpack__(copy=None))
+    if api_version < '2023.12':
+        pytest.raises(ValueError, lambda:
+                      a.__dlpack__(dl_device=a.__dlpack_device__()))
+        pytest.raises(ValueError, lambda:
+                      a.__dlpack__(dl_device=None))
+        pytest.raises(ValueError, lambda:
+                      a.__dlpack__(max_version=(1, 0)))
+        pytest.raises(ValueError, lambda:
+                      a.__dlpack__(max_version=None))
+        pytest.raises(ValueError, lambda:
+                      a.__dlpack__(copy=False))
+        pytest.raises(ValueError, lambda:
+                      a.__dlpack__(copy=True))
+        pytest.raises(ValueError, lambda:
+                      a.__dlpack__(copy=None))
+    elif np.lib.NumpyVersion(np.__version__) < '2.1.0':
+        pytest.raises(NotImplementedError, lambda:
+                      a.__dlpack__(dl_device=CPU_DEVICE))
+        a.__dlpack__(dl_device=None)
+        pytest.raises(NotImplementedError, lambda:
+                      a.__dlpack__(max_version=(1, 0)))
+        a.__dlpack__(max_version=None)
+        pytest.raises(NotImplementedError, lambda:
+                      a.__dlpack__(copy=False))
+        pytest.raises(NotImplementedError, lambda:
+                      a.__dlpack__(copy=True))
+        a.__dlpack__(copy=None)
+    else:
+        a.__dlpack__(dl_device=a.__dlpack_device__())
+        a.__dlpack__(dl_device=None)
+        a.__dlpack__(max_version=(1, 0))
+        a.__dlpack__(max_version=None)
+        a.__dlpack__(copy=False)
+        a.__dlpack__(copy=True)
+        a.__dlpack__(copy=None)

{array_api_strict-2.1.1.dist-info → array_api_strict-2.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: array_api_strict
-Version: 2.1.1
+Version: 2.1.3
 Summary: A strict, minimal implementation of the Python array API standard.
 Home-page: https://data-apis.org/array-api-strict/
 Author: Consortium for Python Data API Standards

{array_api_strict-2.1.1.dist-info → array_api_strict-2.1.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 array_api_strict/__init__.py,sha256=iQRjMJ4h-MoNqhxYeerCVRPORO6W6KePiQ8xIeecDac,6788
-array_api_strict/_array_object.py,sha256=ElW2-ppgMqMTmpqlleKqCg1Fq798D40-y8I17gCJpNQ,51876
+array_api_strict/_array_object.py,sha256=Q69HJ8qdQqqugWIRf4RsifZUEypbhNV_y5EVSygmbrQ,52571
 array_api_strict/_constants.py,sha256=AYayN2jf1Dp5rXZ7WPBdUhtPBo_JMCi-pD9oW5zmFkI,87
-array_api_strict/_creation_functions.py,sha256=lmLDCAb0aq0naeJbCJ0NgnBRqp6eHs89jnARZhHMgJE,12963
+array_api_strict/_creation_functions.py,sha256=A9TTvPSznF9NsxT0Pd_G9yU6IZAfW1tpBkFMYoJyguw,12985
 array_api_strict/_data_type_functions.py,sha256=sKxKRQiwoXPwQJPbiN5BhF9rbc3ZtXfjRuglB7VsIgo,7016
 array_api_strict/_dtypes.py,sha256=QDGo9rqiS_o3quv7QRFM0j6DkvOjRauQ1Ymikwlu8Ns,6213
 array_api_strict/_elementwise_functions.py,sha256=g9YecX4gM4V6UCjl7b7I752EFXhRusjm-EKGZ12jDeI,38651
@@ -18,10 +18,10 @@ array_api_strict/_sorting_functions.py,sha256=GG7g2NYCFn2G2fFS6ZdfYOWpuuSIrdZdJW
 array_api_strict/_statistical_functions.py,sha256=dMJ-x8TQW5MD2rFYCmRH6QthA2KDKXjhkj4hcbd3LSU,5148
 array_api_strict/_typing.py,sha256=TpmU57g3EAPY9PT6hJEhzBduVrwXJUWvmoBlhy5bQuQ,1803
 array_api_strict/_utility_functions.py,sha256=khxtvqPWSDpNp65VgoJUtO4zEfTiGfZZGu_MHwyfmmI,913
-array_api_strict/_version.py,sha256=XW_77odg8qbb1HCC9FVKUxmwghy9Dj7x6np6j_akALk,497
+array_api_strict/_version.py,sha256=xJzT1_4sE3FOyJjocQQw38msTHLnEXjUj33S0uEZQ5M,497
 array_api_strict/tests/__init__.py,sha256=t_2GZ3lKcsu4ec4GMKPUDYaeMUJyDquBlQAcPgj7kFE,282
 array_api_strict/tests/conftest.py,sha256=-wIDryl2MdRLdSonU1G1xWssNq2TFKiWuHquNasXYA8,468
-array_api_strict/tests/test_array_object.py,sha256=r4IpleRQghC-l3B2IhrDadpyxlZB94LZ_X-9JB3jbQg,20250
+array_api_strict/tests/test_array_object.py,sha256=zzXoGDAHEdK8PBmp9owwoydlcKyIDMHFYg2e9XmjYrU,21685
 array_api_strict/tests/test_creation_functions.py,sha256=ve0MeqZPrG2dmCG3hTVhap1YgIW-lAaSZIJ_ZoOV9cQ,8323
 array_api_strict/tests/test_data_type_functions.py,sha256=pLAtm96gpAduNVqq-914JvjAollzhBp4YojVfNScBzs,2138
 array_api_strict/tests/test_device_support.py,sha256=zpfhHxeRREoXfp0qZTlilm2ZceBc71uCKea1GMVe-ZU,855
@@ -34,8 +34,8 @@ array_api_strict/tests/test_set_functions.py,sha256=ikzab1j3SXxGf0OqwHrOAM13HwQe
 array_api_strict/tests/test_sorting_functions.py,sha256=1xvQBKts5KTKYc-puMITX9iR_KTbzzVB8fY-SObad_Y,899
 array_api_strict/tests/test_statistical_functions.py,sha256=JwS4DhASt5T0YUNtbFK2nSXgDrVVZx1tVpe7LU2aPK4,1365
 array_api_strict/tests/test_validation.py,sha256=JdsK4z1M0U5YoJrfWSzOpEhmlehvZHF5SG0I0k6oDy8,672
-array_api_strict-2.1.1.dist-info/LICENSE,sha256=djDm4UfHAJmycwFUNyUmrTdRkrFF9Ac8uqIlbxH7j5Y,1585
-array_api_strict-2.1.1.dist-info/METADATA,sha256=B-jmIvTszl9pwlOp5tY9diRXDLwWQvl7y7XxJzV52yQ,1595
-array_api_strict-2.1.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-array_api_strict-2.1.1.dist-info/top_level.txt,sha256=M4cE8VLgRHp_d9TPkbk7_I4JriELFdEJz-NKJJqAkAE,17
-array_api_strict-2.1.1.dist-info/RECORD,,
+array_api_strict-2.1.3.dist-info/LICENSE,sha256=djDm4UfHAJmycwFUNyUmrTdRkrFF9Ac8uqIlbxH7j5Y,1585
+array_api_strict-2.1.3.dist-info/METADATA,sha256=cup_jx9CNgdyj14hC3Nou6-C7w7Lte1AqHZ58Fzc1Ug,1595
+array_api_strict-2.1.3.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+array_api_strict-2.1.3.dist-info/top_level.txt,sha256=M4cE8VLgRHp_d9TPkbk7_I4JriELFdEJz-NKJJqAkAE,17
+array_api_strict-2.1.3.dist-info/RECORD,,