array-api-strict 2.1.2__tar.gz → 2.1.3__tar.gz

{array_api_strict-2.1.2 → array_api_strict-2.1.3}/PKG-INFO

@@ -1,22 +1,21 @@
 Metadata-Version: 2.1
 Name: array_api_strict
-Version: 2.1.2
+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
 License: MIT
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.10
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy>=2.1
+Requires-Dist: numpy
 
 # array-api-strict
 

{array_api_strict-2.1.2 → array_api_strict-2.1.3}/array_api_strict/__init__.py

@@ -16,12 +16,6 @@ consuming libraries to test their array API usage.
 
 """
 
-import numpy as np
-from numpy.lib import NumpyVersion
-
-if NumpyVersion(np.__version__) < NumpyVersion('2.1.0'):
-    raise ImportError("array-api-strict requires NumPy >= 2.1.0")
-
 __all__ = []
 
 # Warning: __array_api_version__ could change globally with

{array_api_strict-2.1.2 → array_api_strict-2.1.3}/array_api_strict/_array_object.py

@@ -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,22 +149,37 @@ 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().
         if _allow_array:
             if self._device != CPU_DEVICE:
                 raise RuntimeError(f"Can not convert array on the '{self._device}' device to a Numpy array.")
-            return np.asarray(self._array, dtype=dtype, copy=copy)
+            # copy keyword is new in 2.0.0; for older versions don't use it
+            # retry without that keyword.
+            if np.__version__[0] < '2':
+                return np.asarray(self._array, dtype=dtype)
+            elif np.__version__.startswith('2.0.0-dev0'):
+                # Handle dev version for which we can't know based on version
+                # number whether or not the copy keyword is supported.
+                try:
+                    return np.asarray(self._array, dtype=dtype, copy=copy)
+                except TypeError:
+                    return np.asarray(self._array, dtype=dtype)
+            else:
+                return np.asarray(self._array, dtype=dtype, copy=copy)
         raise ValueError("Conversion from an array_api_strict array to a NumPy ndarray is not supported")
 
     # These are various helper functions to make the array behavior match the
@@ -574,14 +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")
 
-        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)
+        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)
+        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-2.1.2 → array_api_strict-2.1.3}/array_api_strict/_creation_functions.py

@@ -83,6 +83,29 @@ def asarray(
     if isinstance(obj, Array) and device is None:
         device = obj.device
 
+    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
+
+            # Work around it by creating the new array and seeing if NumPy
+            # copies it.
+            if isinstance(obj, Array):
+                new_array = np.array(obj._array, copy=copy, dtype=_np_dtype)
+                if new_array is not obj._array:
+                    raise ValueError("Unable to avoid copy while creating an array from given array.")
+                return Array._new(new_array, device=device)
+            elif _supports_buffer_protocol(obj):
+                # Buffer protocol will always support no-copy
+                return Array._new(np.array(obj, copy=copy, dtype=_np_dtype), device=device)
+            else:
+                # No-copy is unsupported for Python built-in types.
+                raise ValueError("Unable to avoid copy while creating an array from given object.")
+
+        if copy is None:
+            # NumPy 1 treats copy=False the same as the standard copy=None
+            copy = False
+
     if isinstance(obj, Array):
         return Array._new(np.array(obj._array, copy=copy, dtype=_np_dtype), device=device)
     if dtype is None and isinstance(obj, int) and (obj > 2 ** 64 or obj < -(2 ** 63)):

{array_api_strict-2.1.2 → array_api_strict-2.1.3}/array_api_strict/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-11-07T18:09:02-0700",
+ "date": "2024-11-08T16:00:41-0700",
  "dirty": false,
  "error": null,
- "full-revisionid": "c9fe697bec8de8e402d8beb71bbeb96ca70c772e",
- "version": "2.1.2"
+ "full-revisionid": "310bb626b04ea61e24feca146440dd4ec1f6cf5b",
+ "version": "2.1.3"
 }
 '''  # END VERSION_JSON
 

{array_api_strict-2.1.2 → array_api_strict-2.1.3}/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)
@@ -456,19 +473,41 @@ def dlpack_2023_12(api_version):
         set_array_api_strict_flags(api_version=api_version)
 
     a = asarray([1, 2, 3], dtype=int8)
-
-    # Do not error
+    # Never an error
     a.__dlpack__()
-    a.__dlpack__(dl_device=CPU_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)
-
-    x = np.from_dlpack(a)
-    assert isinstance(x, np.ndarray)
-    assert x.dtype == np.int8
-    assert x.shape == (3,)
-    assert np.all(x == np.asarray([1, 2, 3]))
+
+    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.2 → array_api_strict-2.1.3}/array_api_strict.egg-info/PKG-INFO

@@ -1,22 +1,21 @@
 Metadata-Version: 2.1
 Name: array_api_strict
-Version: 2.1.2
+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
 License: MIT
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.10
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy>=2.1
+Requires-Dist: numpy
 
 # array-api-strict
 

array_api_strict-2.1.3/array_api_strict.egg-info/requires.txt

@@ -0,0 +1 @@
+numpy

{array_api_strict-2.1.2 → array_api_strict-2.1.3}/setup.py

@@ -15,15 +15,14 @@ setup(
     long_description_content_type="text/markdown",
     url="https://data-apis.org/array-api-strict/",
     license="MIT",
-    python_requires=">=3.10",
-    install_requires=["numpy>=2.1"],
+    python_requires=">=3.9",
+    install_requires=["numpy"],
     classifiers=[
         "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
-        "Programming Language :: Python :: 3.13",
-        "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
     ],

array_api_strict-2.1.2/array_api_strict.egg-info/requires.txt

@@ -1 +0,0 @@
-numpy>=2.1