BUG: Don't import helpers in namespaces

Author: crusaderky

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']

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'

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')

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'

array_api_compat/numpy/_aliases.py

@@ -10,6 +10,12 @@
 
 import numpy as np
 
+try:
+    # Note: On NumPy 1.26, without this line `hasattr(np, '_CopyMode') returns False
+    from numpy import _CopyMode
+except ImportError:
+    _CopyMode = None
+
 bool = np.bool_
 
 # Basic renames
@@ -86,7 +92,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:
     """
@@ -98,13 +104,13 @@ def asarray(
     if device not in ["cpu", None]:
         raise ValueError(f"Unsupported device for NumPy: {device!r}")
 
-    if hasattr(np, '_CopyMode'):
+    if _CopyMode is not None:
         if copy is None:
-            copy = np._CopyMode.IF_NEEDED
+            copy = _CopyMode.IF_NEEDED
         elif copy is False:
-            copy = np._CopyMode.NEVER
+            copy = _CopyMode.NEVER
         elif copy is True:
-            copy = np._CopyMode.ALWAYS
+            copy = _CopyMode.ALWAYS
     else:
         # Not present in older NumPys. In this case, we cannot really support
         # copy=False.

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'

tests/test_common.py

@@ -19,6 +19,8 @@
 )
 from ._helpers import all_libraries, import_, wrapped_libraries, xfail
 
+from array_api_compat.numpy._aliases import _CopyMode
+
 
 is_array_functions = {
     'numpy': 'is_numpy_array',
@@ -276,7 +278,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 _CopyMode is None:
         supports_copy_false_other_ns = False
         supports_copy_false_same_ns = False
     elif library == 'cupy':