Move all the NumPy functionality into a numpy submodule

There will also be a 'cupy' submodule. Common code will be factored out into
the 'common' submodule.

Author: asmeurer

numpy_array_api_compat/__init__.py

@@ -40,21 +40,3 @@
 - NumPy functions which are not wrapped may not use positional-only arguments.
 
 """
-
-from numpy import *
-
-# These imports may overwrite names from the import * above.
-from ._aliases import *
-
-# Don't know why, but we have to do an absolute import to import linalg. If we
-# instead do
-#
-# from . import linalg
-#
-# It doesn't overwrite np.linalg from above. The import is generated
-# dynamically so that the library can be vendored.
-__import__(__package__ + '.linalg')
-
-from .linalg import matrix_transpose, vecdot
-
-from ._helpers import *

numpy_array_api_compat/_internal.py

@@ -5,7 +5,7 @@
 from functools import wraps
 from inspect import signature
 
-from ._helpers import get_namespace
+from .common._helpers import get_namespace
 
 def get_xp(f):
     """

numpy_array_api_compat/common/__init__.py

@@ -0,0 +1,37 @@
+"""
+Various helper functions which are not part of the spec.
+"""
+def get_namespace(*xs, _use_compat=True):
+    """
+    Get the array API compatible namespace for the arrays `xs`.
+
+    `xs` should contain one or more arrays.
+    """
+    from ..numpy._helpers import _is_numpy_array
+
+    namespaces = set()
+    for x in xs:
+        if isinstance(x, (tuple, list)):
+            namespaces.add(get_namespace(*x, _use_compat=_use_compat))
+        elif hasattr(x, '__array_namespace__'):
+            namespaces.add(x.__array_namespace__)
+        elif _is_numpy_array(x):
+            if _use_compat:
+                from .. import numpy as numpy_namespace
+                namespaces.add(numpy_namespace)
+            else:
+                import numpy as np
+                namespaces.add(np)
+        else:
+            # TODO: Support Python scalars?
+            raise ValueError("The input is not a supported array type")
+
+    if not namespaces:
+        raise ValueError("Unrecognized array input")
+
+    if len(namespaces) != 1:
+        raise ValueError(f"Multiple namespaces for array inputs: {namespaces}")
+
+    xp, = namespaces
+
+    return xp

numpy_array_api_compat/common/_helpers.py

@@ -0,0 +1,20 @@
+from numpy import *
+
+# from numpy import * doesn't overwrite these builtin names
+from numpy import abs, max, min, round
+
+# These imports may overwrite names from the import * above.
+from ._aliases import *
+
+# Don't know why, but we have to do an absolute import to import linalg. If we
+# instead do
+#
+# from . import linalg
+#
+# It doesn't overwrite np.linalg from above. The import is generated
+# dynamically so that the library can be vendored.
+__import__(__package__ + '.linalg')
+
+from .linalg import matrix_transpose, vecdot
+
+from ._helpers import *

numpy_array_api_compat/numpy/__init__.py

@@ -9,11 +9,12 @@
     from typing import Optional, Tuple, Union, List
     from ._typing import ndarray, Device, Dtype, NestedSequence, SupportsBufferProtocol
 
+from functools import partial
 from typing import NamedTuple
 from types import ModuleType
 
 from ._helpers import _is_numpy_array, get_namespace
-from ._internal import get_xp
+from .._internal import get_xp
 
 # Basic renames
 @get_xp
@@ -194,7 +195,7 @@ def _check_device(device):
         raise ValueError(f"Unsupported device {device!r}")
 
 # asarray also adds the copy keyword
-def asarray(
+def _asarray(
     obj: Union[
         ndarray,
         bool,
@@ -245,6 +246,8 @@ def asarray(
 
     return xp.asarray(obj, dtype=dtype)
 
+asarray_numpy = partial(_asarray, namespace='numpy')
+
 @get_xp
 def arange(
     start: Union[int, float],
@@ -462,15 +465,12 @@ def trunc(x: ndarray, /, xp) -> ndarray:
         return x
     return xp.trunc(x)
 
-# from numpy import * doesn't overwrite these builtin names
-from numpy import abs, max, min, round
-
 __all__ = ['acos', 'acosh', 'asin', 'asinh', 'atan', 'atan2', 'atanh',
            'bitwise_left_shift', 'bitwise_invert', 'bitwise_right_shift',
            'bool', 'concat', 'pow', 'UniqueAllResult', 'UniqueCountsResult',
            'UniqueInverseResult', 'unique_all', 'unique_counts',
-           'unique_inverse', 'unique_values', 'astype', 'abs', 'max', 'min',
-           'round', 'std', 'var', 'permute_dims', 'asarray', 'arange',
-           'empty', 'empty_like', 'eye', 'full', 'full_like', 'linspace',
-           'ones', 'ones_like', 'zeros', 'zeros_like', 'reshape', 'argsort',
-           'sort', 'sum', 'prod', 'ceil', 'floor', 'trunc']
+           'unique_inverse', 'unique_values', 'astype', 'std', 'var',
+           'permute_dims', 'asarray_numpy', 'arange', 'empty', 'empty_like',
+           'eye', 'full', 'full_like', 'linspace', 'ones', 'ones_like',
+           'zeros', 'zeros_like', 'reshape', 'argsort', 'sort', 'sum', 'prod',
+           'ceil', 'floor', 'trunc']

numpy_array_api_compat/_aliases.py renamed to numpy_array_api_compat/numpy/_aliases.py

@@ -4,11 +4,10 @@
 
 from __future__ import annotations
 
-import importlib
-compat_namespace = importlib.import_module(__package__)
-
 import numpy as np
 
+from ..common._helpers import get_namespace
+
 def _is_numpy_array(x):
     # TODO: Should we reject ndarray subclasses?
     return isinstance(x, (np.ndarray, np.generic))
@@ -19,37 +18,6 @@ def is_array_api_obj(x):
     """
     return _is_numpy_array(x) or hasattr(x, '__array_namespace__')
 
-def get_namespace(*xs, _use_compat=True):
-    """
-    Get the array API compatible namespace for the arrays `xs`.
-
-    `xs` should contain one or more arrays.
-    """
-    namespaces = set()
-    for x in xs:
-        if isinstance(x, (tuple, list)):
-            namespaces.add(get_namespace(*x, _use_compat=_use_compat))
-        elif hasattr(x, '__array_namespace__'):
-            namespaces.add(x.__array_namespace__)
-        elif _is_numpy_array(x):
-            if _use_compat:
-                namespaces.add(compat_namespace)
-            else:
-                namespaces.add(np)
-        else:
-            # TODO: Support Python scalars?
-            raise ValueError("The input is not a supported array type")
-
-    if not namespaces:
-        raise ValueError("Unrecognized array input")
-
-    if len(namespaces) != 1:
-        raise ValueError(f"Multiple namespaces for array inputs: {namespaces}")
-
-    xp, = namespaces
-
-    return xp
-
 # device and to_device are not included in array object of this library
 # because this library just reuses ndarray without wrapping or subclassing it.
 # These helper functions can be used instead of the wrapper functions for