change namespace

Author: lithomas1

array_api_compat/_dask_ci_shim.py

@@ -324,13 +324,11 @@ def _asarray(
     if copy in COPY_FALSE:
         # copy=False is not yet implemented in xp.asarray
         raise NotImplementedError("copy=False is not yet implemented")
-    # TODO: This feels wrong (__array__ is not in the standard)
-    # Dask doesn't support DLPack, though, so, this'll do
     if (hasattr(xp, "ndarray") and isinstance(obj, xp.ndarray)) or hasattr(obj, "__array__"):
         if dtype is not None and obj.dtype != dtype:
             copy = True
         # Dask arrays are immutable, so copy doesn't do anything
-        if copy in COPY_TRUE and namespace != "dask":
+        if copy in COPY_TRUE and namespace != "dask.array":
             return xp.array(obj, copy=True, dtype=dtype)
         return obj
 

array_api_compat/common/_aliases.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-from ..common import _aliases
-from ..common._helpers import _check_device
+from ...common import _aliases
+from ...common._helpers import _check_device
 
-from .._internal import get_xp
+from ..._internal import get_xp
 
 import numpy as np
 from numpy import (
@@ -36,7 +36,7 @@
 from typing import TYPE_CHECKING
 if TYPE_CHECKING:
     from typing import Optional, Union
-    from ..common._typing import ndarray, Device, Dtype
+    from ...common._typing import ndarray, Device, Dtype
 
 import dask.array as da
 

array_api_compat/dask/__init__.py array_api_compat/dask/array/__init__.pyarray_api_compat/dask/__init__.py renamed to array_api_compat/dask/array/__init__.py

@@ -5,7 +5,7 @@
 import numpy as np
 from numpy.testing import assert_allclose
 
-@pytest.mark.parametrize("library", ["cupy", "numpy", "torch", "dask"])
+@pytest.mark.parametrize("library", ["cupy", "numpy", "torch", "dask.array"])
 def test_to_device_host(library):
     # different libraries have different semantics
     # for DtoH transfers; ensure that we support a portable

array_api_compat/dask/_aliases.py array_api_compat/dask/array/_aliases.pyarray_api_compat/dask/_aliases.py renamed to array_api_compat/dask/array/_aliases.py

@@ -64,7 +64,7 @@ def isdtype_(dtype_, kind):
     assert type(res) is bool
     return res
 
-@pytest.mark.parametrize("library", ["cupy", "numpy", "torch", "dask"])
+@pytest.mark.parametrize("library", ["cupy", "numpy", "torch", "dask.array"])
 def test_isdtype_spec_dtypes(library):
     xp = import_('array_api_compat.' + library)
 
@@ -98,7 +98,7 @@ def test_isdtype_spec_dtypes(library):
     'bfloat16',
 ]
 
-@pytest.mark.parametrize("library", ["cupy", "numpy", "torch", "dask"])
+@pytest.mark.parametrize("library", ["cupy", "numpy", "torch", "dask.array"])
 @pytest.mark.parametrize("dtype_", additional_dtypes)
 def test_isdtype_additional_dtypes(library, dtype_):
     xp = import_('array_api_compat.' + library)

array_api_compat/dask/linalg.py array_api_compat/dask/array/linalg.pyarray_api_compat/dask/linalg.py renamed to array_api_compat/dask/array/linalg.py

@@ -1,6 +1,6 @@
 # Basic test that vendoring works
 
-from .vendored._compat import dask as dask_compat
+from .vendored._compat.dask import array as dask_compat
 
 import dask.array as da
 import numpy as np