Import exceptions directly from dpnp.exceptions module

dpnp/dpnp_algo/dpnp_fill.py

@@ -38,6 +38,7 @@
 )
 
 import dpnp
+from dpnp.exceptions import ExecutionPlacementError
 
 
 def dpnp_fill(arr, val):
@@ -50,7 +51,7 @@ def dpnp_fill(arr, val):
         if val.shape != ():
             raise ValueError("`val` must be a scalar or 0D-array")
         if dpu.get_execution_queue((exec_q, val.sycl_queue)) is None:
-            raise dpu.ExecutionPlacementError(
+            raise ExecutionPlacementError(
                 "Input arrays have incompatible queues."
             )
         a_val = dpt.astype(val, arr.dtype)

dpnp/dpnp_array.py

@@ -39,11 +39,11 @@
 
 import dpctl.tensor as dpt
 import dpctl.tensor._type_utils as dtu
-from dpctl.tensor._numpy_helper import AxisError
 
 import dpnp
 
 from . import memory as dpm
+from .exceptions import AxisError
 
 
 def _get_unwrapped_index_key(key):

dpnp/dpnp_iface_indexing.py

@@ -63,6 +63,7 @@
 )
 from .dpnp_array import dpnp_array
 from .dpnp_utils import call_origin, get_usm_allocations
+from .exceptions import ExecutionPlacementError
 
 
 def _ravel_multi_index_checks(multi_index, dims, order):
@@ -129,7 +130,7 @@ def _choose_run(inds, chcs, q, usm_type, out=None, mode=0):
             )
 
         if dpu.get_execution_queue((q, out.sycl_queue)) is None:
-            raise dpu.ExecutionPlacementError(
+            raise ExecutionPlacementError(
                 "Input and output allocation queues are not compatible"
             )
 
@@ -291,7 +292,7 @@ def _take_index(x, inds, axis, q, usm_type, out=None, mode=0):
             )
 
         if dpu.get_execution_queue((q, out.sycl_queue)) is None:
-            raise dpu.ExecutionPlacementError(
+            raise ExecutionPlacementError(
                 "Input and output allocation queues are not compatible"
             )
 

dpnp/dpnp_iface_logic.py

@@ -55,6 +55,7 @@
 
 from .dpnp_array import dpnp_array
 from .dpnp_utils import get_usm_allocations
+from .exceptions import ExecutionPlacementError
 
 
 def _isclose_scalar_tol(a, b, rtol, atol, equal_nan):
@@ -1267,7 +1268,7 @@ def isin(
             )
             is None
         ):
-            raise dpu.ExecutionPlacementError(
+            raise ExecutionPlacementError(
                 "Input arrays have incompatible allocation queues"
             )
         usm_element = dpnp.get_usm_ndarray(element)

dpnp/dpnp_iface_manipulation.py

@@ -48,7 +48,6 @@
 import dpctl.tensor as dpt
 import numpy
 from dpctl.tensor._numpy_helper import (
-    AxisError,
     normalize_axis_index,
     normalize_axis_tuple,
 )
@@ -60,6 +59,7 @@
 # pylint: disable=no-name-in-module
 from .dpnp_utils import get_usm_allocations
 from .dpnp_utils.dpnp_utils_pad import dpnp_pad
+from .exceptions import AxisError
 
 
 class InsertDeleteParams(NamedTuple):

dpnp/dpnp_iface_mathematical.py

@@ -84,6 +84,7 @@
 from .dpnp_utils import get_usm_allocations
 from .dpnp_utils.dpnp_utils_linearalgebra import dpnp_cross
 from .dpnp_utils.dpnp_utils_reduction import dpnp_wrap_reduction_call
+from .exceptions import ExecutionPlacementError
 
 
 def _get_max_min(dtype):
@@ -273,7 +274,7 @@ def _process_ediff1d_args(arg, arg_name, ary_dtype, ary_sycl_queue, usm_type):
         usm_type = dpu.get_coerced_usm_type([usm_type, arg.usm_type])
         # check that arrays have the same allocation queue
         if dpu.get_execution_queue([ary_sycl_queue, arg.sycl_queue]) is None:
-            raise dpu.ExecutionPlacementError(
+            raise ExecutionPlacementError(
                 f"ary and {arg_name} must be allocated on the same SYCL queue"
             )
 

dpnp/dpnp_utils/dpnp_utils_einsum.py

@@ -33,11 +33,11 @@
 
 import dpctl
 import numpy
-from dpctl.utils import ExecutionPlacementError
 
 import dpnp
 from dpnp.dpnp_array import dpnp_array
 from dpnp.dpnp_utils import get_usm_allocations, map_dtype_to_device
+from dpnp.exceptions import ExecutionPlacementError
 
 _einsum_symbols = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 

dpnp/dpnp_utils/dpnp_utils_linearalgebra.py

@@ -32,16 +32,15 @@
 import dpctl.utils as dpu
 import numpy
 from dpctl.tensor._numpy_helper import (
-    AxisError,
     normalize_axis_index,
     normalize_axis_tuple,
 )
-from dpctl.utils import ExecutionPlacementError
 
 import dpnp
 import dpnp.backend.extensions.blas._blas_impl as bi
 from dpnp.dpnp_array import dpnp_array
 from dpnp.dpnp_utils import get_usm_allocations
+from dpnp.exceptions import AxisError, ExecutionPlacementError
 
 __all__ = [
     "dpnp_cross",

dpnp/dpnp_utils/dpnp_utils_statistics.py

@@ -31,10 +31,10 @@
 import dpctl
 import dpctl.tensor as dpt
 from dpctl.tensor._numpy_helper import normalize_axis_tuple
-from dpctl.utils import ExecutionPlacementError
 
 import dpnp
 from dpnp.dpnp_array import dpnp_array
+from dpnp.exceptions import ExecutionPlacementError
 
 __all__ = ["dpnp_cov", "dpnp_median"]
 

dpnp/fft/dpnp_utils_fft.py

@@ -49,10 +49,10 @@
     normalize_axis_index,
     normalize_axis_tuple,
 )
-from dpctl.utils import ExecutionPlacementError
 
 import dpnp
 import dpnp.backend.extensions.fft._fft_impl as fi
+from dpnp.exceptions import ExecutionPlacementError
 
 from ..dpnp_array import dpnp_array
 from ..dpnp_utils import map_dtype_to_device

dpnp/tests/test_array_api_info.py

@@ -1,9 +1,10 @@
 import numpy
 import pytest
-from dpctl import SyclDeviceCreationError, get_devices, select_default_device
+from dpctl import get_devices, select_default_device
 from dpctl.tensor._tensor_impl import default_device_complex_type
 
 import dpnp
+from dpnp.exceptions import SyclDeviceCreationError
 from dpnp.tests.helper import (
     has_support_aspect64,
     is_win_platform,

dpnp/tests/test_arraymanipulation.py

@@ -3,10 +3,10 @@
 import dpctl.tensor as dpt
 import numpy
 import pytest
-from dpctl.tensor._numpy_helper import AxisError
 from numpy.testing import assert_array_equal, assert_equal, assert_raises
 
 import dpnp
+from dpnp.exceptions import AxisError
 
 from .helper import get_all_dtypes, get_float_complex_dtypes
 from .third_party.cupy import testing

dpnp/tests/test_counting.py

@@ -1,13 +1,13 @@
 import numpy
 import pytest
-from dpctl.tensor._numpy_helper import AxisError
 from numpy.testing import (
     assert_allclose,
     assert_equal,
     assert_raises,
 )
 
 import dpnp
+from dpnp.exceptions import AxisError
 
 from .helper import (
     get_all_dtypes,

dpnp/tests/test_fft.py

@@ -2,11 +2,11 @@
 import dpctl.tensor as dpt
 import numpy
 import pytest
-from dpctl.utils import ExecutionPlacementError
 from numpy.testing import assert_raises
 
 import dpnp
 from dpnp.dpnp_utils import map_dtype_to_device
+from dpnp.exceptions import ExecutionPlacementError
 
 from .helper import (
     assert_dtype_allclose,

dpnp/tests/test_fill.py

@@ -1,9 +1,9 @@
 import dpctl
 import pytest
-from dpctl.utils import ExecutionPlacementError
 from numpy.testing import assert_array_equal
 
 import dpnp
+from dpnp.exceptions import ExecutionPlacementError
 
 
 @pytest.mark.parametrize(

dpnp/tests/test_flipping.py

@@ -2,12 +2,12 @@
 
 import numpy
 import pytest
-from dpctl.tensor._numpy_helper import AxisError
 from numpy.testing import (
     assert_equal,
 )
 
 import dpnp
+from dpnp.exceptions import AxisError
 
 from .helper import (
     get_all_dtypes,

dpnp/tests/test_indexing.py

@@ -4,9 +4,7 @@
 import dpctl.tensor as dpt
 import numpy
 import pytest
-from dpctl.tensor._numpy_helper import AxisError
 from dpctl.tensor._type_utils import _to_device_supported_dtype
-from dpctl.utils import ExecutionPlacementError
 from numpy.testing import (
     assert_,
     assert_array_equal,
@@ -17,6 +15,7 @@
 
 import dpnp
 from dpnp.dpnp_array import dpnp_array
+from dpnp.exceptions import AxisError, ExecutionPlacementError
 
 from .helper import (
     get_abs_array,

dpnp/tests/test_linalg.py

@@ -4,8 +4,6 @@
 import dpctl.tensor as dpt
 import numpy
 import pytest
-from dpctl.tensor._numpy_helper import AxisError
-from dpctl.utils import ExecutionPlacementError
 from numpy.testing import (
     assert_allclose,
     assert_array_equal,
@@ -15,6 +13,7 @@
 )
 
 import dpnp
+from dpnp.exceptions import AxisError, ExecutionPlacementError
 
 from .helper import (
     assert_dtype_allclose,

dpnp/tests/test_logic.py

@@ -1,7 +1,6 @@
 import dpctl
 import numpy
 import pytest
-from dpctl.utils import ExecutionPlacementError
 from numpy.testing import (
     assert_allclose,
     assert_array_equal,
@@ -10,6 +9,7 @@
 )
 
 import dpnp
+from dpnp.exceptions import ExecutionPlacementError
 
 from .helper import (
     generate_random_numpy_array,

dpnp/tests/test_manipulation.py

@@ -3,14 +3,14 @@
 import dpctl.tensor as dpt
 import numpy
 import pytest
-from dpctl.tensor._numpy_helper import AxisError
 from numpy.testing import (
     assert_array_equal,
     assert_equal,
     assert_raises,
 )
 
 import dpnp
+from dpnp.exceptions import AxisError
 
 from .helper import (
     assert_dtype_allclose,

dpnp/tests/test_mathematical.py

@@ -2,11 +2,7 @@
 import dpctl.tensor as dpt
 import numpy
 import pytest
-from dpctl.tensor._numpy_helper import (
-    AxisError,
-    normalize_axis_index,
-)
-from dpctl.utils import ExecutionPlacementError
+from dpctl.tensor._numpy_helper import normalize_axis_index
 from numpy.testing import (
     assert_allclose,
     assert_array_equal,
@@ -18,6 +14,7 @@
 import dpnp
 from dpnp.dpnp_array import dpnp_array
 from dpnp.dpnp_utils import map_dtype_to_device
+from dpnp.exceptions import AxisError, ExecutionPlacementError
 
 from .helper import (
     LTS_VERSION,

dpnp/tests/test_nanfunctions.py

@@ -2,7 +2,6 @@
 import dpctl.tensor as dpt
 import numpy
 import pytest
-from dpctl.utils import ExecutionPlacementError
 from numpy.testing import (
     assert_allclose,
     assert_almost_equal,
@@ -13,6 +12,7 @@
 )
 
 import dpnp
+from dpnp.exceptions import ExecutionPlacementError
 
 from .helper import (
     assert_dtype_allclose,

dpnp/tests/test_product.py

@@ -1,12 +1,11 @@
 import dpctl
 import numpy
 import pytest
-from dpctl.tensor._numpy_helper import AxisError
-from dpctl.utils import ExecutionPlacementError
 from numpy.testing import assert_allclose, assert_array_equal, assert_raises
 
 import dpnp
 from dpnp.dpnp_utils import map_dtype_to_device
+from dpnp.exceptions import AxisError, ExecutionPlacementError
 
 from .helper import (
     assert_dtype_allclose,

dpnp/tests/test_sort.py

@@ -1,9 +1,9 @@
 import numpy
 import pytest
-from dpctl.tensor._numpy_helper import AxisError
 from numpy.testing import assert_array_equal, assert_equal, assert_raises
 
 import dpnp
+from dpnp.exceptions import AxisError
 
 from .helper import (
     assert_dtype_allclose,

dpnp/tests/test_sycl_queue.py

@@ -5,13 +5,13 @@
 import dpctl.tensor as dpt
 import numpy
 import pytest
-from dpctl.utils import ExecutionPlacementError
 from numpy.testing import assert_array_equal, assert_raises
 
 import dpnp
 import dpnp.linalg
 from dpnp.dpnp_array import dpnp_array
 from dpnp.dpnp_utils import get_usm_allocations
+from dpnp.exceptions import ExecutionPlacementError
 
 from .helper import (
     generate_random_numpy_array,