Merge branch 'main' into where-with-scalars

Author: ev-br

.github/workflows/docs-deploy.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Download Artifact
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v7
         with:
           workflow: docs-build.yml
           name: docs-build

.github/workflows/publish-package.yml

@@ -97,14 +97,14 @@ jobs:
     #   if: >-
     #     (github.event_name == 'push' && startsWith(github.ref, 'refs/tags'))
     #     || (github.event_name == 'workflow_dispatch' && github.event.inputs.publish == 'true')
-    #   uses: pypa/[email protected].2
+    #   uses: pypa/[email protected].3
     #   with:
     #     repository-url: https://test.pypi.org/legacy/
     #     print-hash: true
 
     - name: Publish distribution 📦 to PyPI
       if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-      uses: pypa/[email protected].2
+      uses: pypa/[email protected].3
       with:
         print-hash: true
 

.gitignore

@@ -128,12 +128,12 @@ ENV/
 env.bak/
 venv.bak/
 
-# Spyder project settings
+# Project settings
+.idea
+.ropeproject
 .spyderproject
 .spyproject
-
-# Rope project settings
-.ropeproject
+.vscode
 
 # mkdocs documentation
 /site

array_api_strict/__init__.py

@@ -293,9 +293,9 @@
 
 __all__ += ["concat", "expand_dims", "flip", "moveaxis", "permute_dims", "repeat", "reshape", "roll", "squeeze", "stack", "tile", "unstack"]
 
-from ._searching_functions import argmax, argmin, nonzero, searchsorted, where
+from ._searching_functions import argmax, argmin, nonzero, count_nonzero, searchsorted, where
 
-__all__ += ["argmax", "argmin", "nonzero", "searchsorted", "where"]
+__all__ += ["argmax", "argmin", "nonzero", "count_nonzero", "searchsorted", "where"]
 
 from ._set_functions import unique_all, unique_counts, unique_inverse, unique_values
 
@@ -305,9 +305,9 @@
 
 __all__ += ["argsort", "sort"]
 
-from ._statistical_functions import cumulative_sum, max, mean, min, prod, std, sum, var
+from ._statistical_functions import cumulative_sum, cumulative_prod, max, mean, min, prod, std, sum, var
 
-__all__ += ["cumulative_sum", "max", "mean", "min", "prod", "std", "sum", "var"]
+__all__ += ["cumulative_sum", "cumulative_prod", "max", "mean", "min", "prod", "std", "sum", "var"]
 
 from ._utility_functions import all, any, diff
 

array_api_strict/_array_object.py

@@ -126,12 +126,6 @@ def __new__(cls, *args, **kwargs):
     # These functions are not required by the spec, but are implemented for
     # the sake of usability.
 
-    def __str__(self: Array, /) -> str:
-        """
-        Performs the operation __str__.
-        """
-        return self._array.__str__().replace("array", "Array")
-
     def __repr__(self: Array, /) -> str:
         """
         Performs the operation __repr__.
@@ -149,6 +143,8 @@ def __repr__(self: Array, /) -> str:
             mid = np.array2string(self._array, separator=', ', prefix=prefix, suffix=suffix)
         return prefix + mid + suffix
 
+    __str__ = __repr__
+
     # 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

array_api_strict/_creation_functions.py

@@ -226,6 +226,8 @@ def from_dlpack(
     # Going to wait for upstream numpy support
     if device is not _default:
         _check_device(device)
+    else:
+        device = None
     if copy not in [_default, None]:
         raise NotImplementedError("The copy argument to from_dlpack is not yet implemented")
 

array_api_strict/_data_type_functions.py

@@ -42,6 +42,13 @@ def astype(
 
     if not copy and dtype == x.dtype:
         return x
+
+    if isdtype(x.dtype, 'complex floating') and not isdtype(dtype, 'complex floating'):
+        raise TypeError(
+            f'The Array API standard stipulates that casting {x.dtype} to {dtype} should not be permitted. '
+             'array-api-strict thus prohibits this conversion.'
+        )
+
     return Array._new(x._array.astype(dtype=dtype._np_dtype, copy=copy), device=device)
 
 
@@ -160,6 +167,9 @@ def isdtype(
     https://data-apis.org/array-api/latest/API_specification/generated/array_api.isdtype.html
     for more details
     """
+    if not isinstance(dtype, _DType):
+       raise TypeError(f"'dtype' must be a dtype, not a {type(dtype)!r}")
+
     if isinstance(kind, tuple):
         # Disallow nested tuples
         if any(isinstance(k, tuple) for k in kind):