diff --git a/array_api_compat/common/_linalg.py b/array_api_compat/common/_linalg.py index c77ee3b8..d1e7ebd8 100644 --- a/array_api_compat/common/_linalg.py +++ b/array_api_compat/common/_linalg.py @@ -174,3 +174,5 @@ def trace( 'svd', 'cholesky', 'matrix_rank', 'pinv', 'matrix_norm', 'matrix_transpose', 'svdvals', 'vecdot', 'vector_norm', 'diagonal', 'trace'] + +_all_ignore = ['math', 'normalize_axis_tuple', 'get_xp', 'np', 'isdtype'] diff --git a/array_api_compat/cupy/__init__.py b/array_api_compat/cupy/__init__.py index 59e01058..9a30f95d 100644 --- a/array_api_compat/cupy/__init__.py +++ b/array_api_compat/cupy/__init__.py @@ -8,9 +8,6 @@ # See the comment in the numpy __init__.py __import__(__package__ + '.linalg') - __import__(__package__ + '.fft') -from ..common._helpers import * # noqa: F401,F403 - __array_api_version__ = '2024.12' diff --git a/array_api_compat/dask/array/__init__.py b/array_api_compat/dask/array/__init__.py index a6e69ad3..bb649306 100644 --- a/array_api_compat/dask/array/__init__.py +++ b/array_api_compat/dask/array/__init__.py @@ -5,5 +5,6 @@ __array_api_version__ = '2024.12' +# See the comment in the numpy __init__.py __import__(__package__ + '.linalg') __import__(__package__ + '.fft') diff --git a/array_api_compat/numpy/__init__.py b/array_api_compat/numpy/__init__.py index 02c55d28..6a5d9867 100644 --- a/array_api_compat/numpy/__init__.py +++ b/array_api_compat/numpy/__init__.py @@ -14,17 +14,8 @@ # It doesn't overwrite np.linalg from above. The import is generated # dynamically so that the library can be vendored. __import__(__package__ + '.linalg') - __import__(__package__ + '.fft') from .linalg import matrix_transpose, vecdot # noqa: F401 -from ..common._helpers import * # noqa: F403 - -try: - # Used in asarray(). Not present in older versions. - from numpy import _CopyMode # noqa: F401 -except ImportError: - pass - __array_api_version__ = '2024.12' diff --git a/array_api_compat/numpy/_aliases.py b/array_api_compat/numpy/_aliases.py index 1d084b2b..9e4f1174 100644 --- a/array_api_compat/numpy/_aliases.py +++ b/array_api_compat/numpy/_aliases.py @@ -86,7 +86,7 @@ def asarray( *, dtype: Optional[DType] = None, device: Optional[Device] = None, - copy: "Optional[Union[bool, np._CopyMode]]" = None, + copy: Optional[Union[bool, np._CopyMode]] = None, **kwargs, ) -> Array: """ diff --git a/array_api_compat/torch/__init__.py b/array_api_compat/torch/__init__.py index a985986e..69fd19ce 100644 --- a/array_api_compat/torch/__init__.py +++ b/array_api_compat/torch/__init__.py @@ -9,16 +9,14 @@ or 'cpu' in n or 'backward' in n): continue - exec(n + ' = torch.' + n) + exec(f"{n} = torch.{n}") +del n # These imports may overwrite names from the import * above. from ._aliases import * # noqa: F403 # See the comment in the numpy __init__.py __import__(__package__ + '.linalg') - __import__(__package__ + '.fft') -from ..common._helpers import * # noqa: F403 - __array_api_version__ = '2024.12' diff --git a/tests/test_common.py b/tests/test_common.py index bbf14572..54024d47 100644 --- a/tests/test_common.py +++ b/tests/test_common.py @@ -276,7 +276,7 @@ def test_asarray_copy(library): is_lib_func = globals()[is_array_functions[library]] all = xp.all if library != 'dask.array' else lambda x: xp.all(x).compute() - if library == 'numpy' and xp.__version__[0] < '2' and not hasattr(xp, '_CopyMode') : + if library == 'numpy' and xp.__version__[0] < '2' and not hasattr(np, "_CopyMode"): supports_copy_false_other_ns = False supports_copy_false_same_ns = False elif library == 'cupy':