From 64212d14eed7ae9146739361d9044411618830d6 Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Wed, 4 Mar 2026 22:30:52 +0100 Subject: [PATCH 1/4] Import AxisError from dpnp.exceptions module --- dpnp/dpnp_array.py | 2 +- dpnp/dpnp_iface_manipulation.py | 2 +- dpnp/dpnp_utils/dpnp_utils_linearalgebra.py | 2 +- dpnp/tests/test_arraymanipulation.py | 2 +- dpnp/tests/test_counting.py | 2 +- dpnp/tests/test_flipping.py | 2 +- dpnp/tests/test_indexing.py | 2 +- dpnp/tests/test_linalg.py | 2 +- dpnp/tests/test_manipulation.py | 2 +- dpnp/tests/test_mathematical.py | 6 ++---- dpnp/tests/test_product.py | 2 +- dpnp/tests/test_sort.py | 2 +- dpnp/tests/third_party/cupy/core_tests/test_ndarray.py | 4 +--- dpnp/tests/third_party/cupy/lib_tests/test_shape_base.py | 2 +- dpnp/tests/third_party/cupy/manipulation_tests/test_dims.py | 2 +- dpnp/tests/third_party/cupy/manipulation_tests/test_join.py | 5 +++-- .../third_party/cupy/manipulation_tests/test_transpose.py | 2 +- dpnp/tests/third_party/cupy/math_tests/test_sumprod.py | 2 +- dpnp/tests/third_party/cupy/sorting_tests/test_sort.py | 2 +- .../tests/third_party/cupy/statistics_tests/test_meanvar.py | 2 +- dpnp/tests/third_party/cupy/testing/_loops.py | 2 +- 21 files changed, 24 insertions(+), 27 deletions(-) diff --git a/dpnp/dpnp_array.py b/dpnp/dpnp_array.py index bb864d4444a9..35580119b60c 100644 --- a/dpnp/dpnp_array.py +++ b/dpnp/dpnp_array.py @@ -39,9 +39,9 @@ import dpctl.tensor as dpt import dpctl.tensor._type_utils as dtu -from dpctl.tensor._numpy_helper import AxisError import dpnp +from dpnp.exceptions import AxisError from . import memory as dpm diff --git a/dpnp/dpnp_iface_manipulation.py b/dpnp/dpnp_iface_manipulation.py index dd872485a602..07b34beae2e0 100644 --- a/dpnp/dpnp_iface_manipulation.py +++ b/dpnp/dpnp_iface_manipulation.py @@ -48,12 +48,12 @@ import dpctl.tensor as dpt import numpy from dpctl.tensor._numpy_helper import ( - AxisError, normalize_axis_index, normalize_axis_tuple, ) import dpnp +from dpnp.exceptions import AxisError from .dpnp_array import dpnp_array diff --git a/dpnp/dpnp_utils/dpnp_utils_linearalgebra.py b/dpnp/dpnp_utils/dpnp_utils_linearalgebra.py index 191b8aa65d13..a1de3d2f7ebe 100644 --- a/dpnp/dpnp_utils/dpnp_utils_linearalgebra.py +++ b/dpnp/dpnp_utils/dpnp_utils_linearalgebra.py @@ -32,7 +32,6 @@ import dpctl.utils as dpu import numpy from dpctl.tensor._numpy_helper import ( - AxisError, normalize_axis_index, normalize_axis_tuple, ) @@ -42,6 +41,7 @@ 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 __all__ = [ "dpnp_cross", diff --git a/dpnp/tests/test_arraymanipulation.py b/dpnp/tests/test_arraymanipulation.py index ba83ee94d8b0..fe74368a8c81 100644 --- a/dpnp/tests/test_arraymanipulation.py +++ b/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 diff --git a/dpnp/tests/test_counting.py b/dpnp/tests/test_counting.py index 762abd58b687..821471068fd1 100644 --- a/dpnp/tests/test_counting.py +++ b/dpnp/tests/test_counting.py @@ -1,6 +1,5 @@ import numpy import pytest -from dpctl.tensor._numpy_helper import AxisError from numpy.testing import ( assert_allclose, assert_equal, @@ -8,6 +7,7 @@ ) import dpnp +from dpnp.exceptions import AxisError from .helper import ( get_all_dtypes, diff --git a/dpnp/tests/test_flipping.py b/dpnp/tests/test_flipping.py index cc84242f4557..f48db162f002 100644 --- a/dpnp/tests/test_flipping.py +++ b/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, diff --git a/dpnp/tests/test_indexing.py b/dpnp/tests/test_indexing.py index 9a55efe138b7..d9ec43d1ea45 100644 --- a/dpnp/tests/test_indexing.py +++ b/dpnp/tests/test_indexing.py @@ -4,7 +4,6 @@ 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 ( @@ -17,6 +16,7 @@ import dpnp from dpnp.dpnp_array import dpnp_array +from dpnp.exceptions import AxisError from .helper import ( get_abs_array, diff --git a/dpnp/tests/test_linalg.py b/dpnp/tests/test_linalg.py index 7d8018fa83a2..ac110344a59e 100644 --- a/dpnp/tests/test_linalg.py +++ b/dpnp/tests/test_linalg.py @@ -4,7 +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, @@ -15,6 +14,7 @@ ) import dpnp +from dpnp.exceptions import AxisError from .helper import ( assert_dtype_allclose, diff --git a/dpnp/tests/test_manipulation.py b/dpnp/tests/test_manipulation.py index 8ddba08dbb92..c35050afaa86 100644 --- a/dpnp/tests/test_manipulation.py +++ b/dpnp/tests/test_manipulation.py @@ -3,7 +3,6 @@ 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, @@ -11,6 +10,7 @@ ) import dpnp +from dpnp.exceptions import AxisError from .helper import ( assert_dtype_allclose, diff --git a/dpnp/tests/test_mathematical.py b/dpnp/tests/test_mathematical.py index e1f32bbd7931..11e556b63b52 100644 --- a/dpnp/tests/test_mathematical.py +++ b/dpnp/tests/test_mathematical.py @@ -2,10 +2,7 @@ import dpctl.tensor as dpt import numpy import pytest -from dpctl.tensor._numpy_helper import ( - AxisError, - normalize_axis_index, -) +from dpctl.tensor._numpy_helper import normalize_axis_index from dpctl.utils import ExecutionPlacementError from numpy.testing import ( assert_allclose, @@ -18,6 +15,7 @@ import dpnp from dpnp.dpnp_array import dpnp_array from dpnp.dpnp_utils import map_dtype_to_device +from dpnp.exceptions import AxisError from .helper import ( LTS_VERSION, diff --git a/dpnp/tests/test_product.py b/dpnp/tests/test_product.py index afe767a5e5d9..deb6390874b8 100644 --- a/dpnp/tests/test_product.py +++ b/dpnp/tests/test_product.py @@ -1,12 +1,12 @@ 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 from .helper import ( assert_dtype_allclose, diff --git a/dpnp/tests/test_sort.py b/dpnp/tests/test_sort.py index 5e883c575f85..27a2afe79b6a 100644 --- a/dpnp/tests/test_sort.py +++ b/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, diff --git a/dpnp/tests/third_party/cupy/core_tests/test_ndarray.py b/dpnp/tests/third_party/cupy/core_tests/test_ndarray.py index 95d753c90473..ac6073a3098e 100644 --- a/dpnp/tests/third_party/cupy/core_tests/test_ndarray.py +++ b/dpnp/tests/third_party/cupy/core_tests/test_ndarray.py @@ -6,12 +6,12 @@ import dpctl import numpy import pytest -from dpctl.tensor._numpy_helper import AxisError # from cupy_backends.cuda.api import driver # from cupy_backends.cuda.api import runtime # from cupy_backends.cuda import stream as stream_module import dpnp as cupy +from dpnp.exceptions import AxisError # from cupy import _util # from cupy import _core @@ -19,8 +19,6 @@ # from cupy import get_array_module from dpnp.tests.third_party.cupy import testing -# from cupy.exceptions import AxisError - def get_array_module(*args): for arg in args: diff --git a/dpnp/tests/third_party/cupy/lib_tests/test_shape_base.py b/dpnp/tests/third_party/cupy/lib_tests/test_shape_base.py index c241824fa81d..d6a163906ce9 100644 --- a/dpnp/tests/third_party/cupy/lib_tests/test_shape_base.py +++ b/dpnp/tests/third_party/cupy/lib_tests/test_shape_base.py @@ -2,9 +2,9 @@ import numpy import pytest -from dpctl.tensor._numpy_helper import AxisError import dpnp as cupy +from dpnp.exceptions import AxisError from dpnp.tests.helper import has_support_aspect64 from dpnp.tests.third_party.cupy import testing diff --git a/dpnp/tests/third_party/cupy/manipulation_tests/test_dims.py b/dpnp/tests/third_party/cupy/manipulation_tests/test_dims.py index 7355d07e1d9b..ae0f6ce18b47 100644 --- a/dpnp/tests/third_party/cupy/manipulation_tests/test_dims.py +++ b/dpnp/tests/third_party/cupy/manipulation_tests/test_dims.py @@ -2,9 +2,9 @@ import numpy import pytest -from dpctl.tensor._numpy_helper import AxisError import dpnp as cupy +from dpnp.exceptions import AxisError from dpnp.tests.third_party.cupy import testing diff --git a/dpnp/tests/third_party/cupy/manipulation_tests/test_join.py b/dpnp/tests/third_party/cupy/manipulation_tests/test_join.py index 0695de034e0c..838bb3646c1e 100644 --- a/dpnp/tests/third_party/cupy/manipulation_tests/test_join.py +++ b/dpnp/tests/third_party/cupy/manipulation_tests/test_join.py @@ -2,11 +2,12 @@ import pytest if numpy.lib.NumpyVersion(numpy.__version__) >= "2.0.0b1": - from numpy.exceptions import AxisError, ComplexWarning + from numpy.exceptions import ComplexWarning else: - from numpy import AxisError, ComplexWarning + from numpy import ComplexWarning import dpnp as cupy +from dpnp.exceptions import AxisError from dpnp.tests.helper import has_support_aspect64 from dpnp.tests.third_party.cupy import testing diff --git a/dpnp/tests/third_party/cupy/manipulation_tests/test_transpose.py b/dpnp/tests/third_party/cupy/manipulation_tests/test_transpose.py index 7e7a62dce52a..0a3555fe7798 100644 --- a/dpnp/tests/third_party/cupy/manipulation_tests/test_transpose.py +++ b/dpnp/tests/third_party/cupy/manipulation_tests/test_transpose.py @@ -2,9 +2,9 @@ import numpy import pytest -from dpctl.tensor._numpy_helper import AxisError import dpnp as cupy +from dpnp.exceptions import AxisError from dpnp.tests.third_party.cupy import testing diff --git a/dpnp/tests/third_party/cupy/math_tests/test_sumprod.py b/dpnp/tests/third_party/cupy/math_tests/test_sumprod.py index b8f98456a13a..b1c1e569ae2f 100644 --- a/dpnp/tests/third_party/cupy/math_tests/test_sumprod.py +++ b/dpnp/tests/third_party/cupy/math_tests/test_sumprod.py @@ -2,9 +2,9 @@ import numpy import pytest -from dpctl.tensor._numpy_helper import AxisError import dpnp as cupy +from dpnp.exceptions import AxisError from dpnp.tests.helper import ( has_support_aspect16, has_support_aspect64, diff --git a/dpnp/tests/third_party/cupy/sorting_tests/test_sort.py b/dpnp/tests/third_party/cupy/sorting_tests/test_sort.py index 7e0eade13254..ba64ef949cb0 100644 --- a/dpnp/tests/third_party/cupy/sorting_tests/test_sort.py +++ b/dpnp/tests/third_party/cupy/sorting_tests/test_sort.py @@ -4,9 +4,9 @@ import numpy import pytest -from dpctl.tensor._numpy_helper import AxisError import dpnp as cupy +from dpnp.exceptions import AxisError from dpnp.tests.helper import has_support_aspect64 from dpnp.tests.third_party.cupy import testing diff --git a/dpnp/tests/third_party/cupy/statistics_tests/test_meanvar.py b/dpnp/tests/third_party/cupy/statistics_tests/test_meanvar.py index bf5d37df2fba..2eda8849e819 100644 --- a/dpnp/tests/third_party/cupy/statistics_tests/test_meanvar.py +++ b/dpnp/tests/third_party/cupy/statistics_tests/test_meanvar.py @@ -2,9 +2,9 @@ import numpy import pytest -from dpctl.tensor._numpy_helper import AxisError import dpnp as cupy +from dpnp.exceptions import AxisError from dpnp.tests.helper import has_support_aspect16, has_support_aspect64 from dpnp.tests.third_party.cupy import testing diff --git a/dpnp/tests/third_party/cupy/testing/_loops.py b/dpnp/tests/third_party/cupy/testing/_loops.py index 63cd09147c4b..026c451e71e3 100644 --- a/dpnp/tests/third_party/cupy/testing/_loops.py +++ b/dpnp/tests/third_party/cupy/testing/_loops.py @@ -10,9 +10,9 @@ import numpy import pytest from dpctl import select_default_device -from dpctl.tensor._numpy_helper import AxisError import dpnp as cupy +from dpnp.exceptions import AxisError from dpnp.tests import config from dpnp.tests.third_party.cupy.testing import _array, _parameterized from dpnp.tests.third_party.cupy.testing._pytest_impl import is_available From bc8e8fb22ebddff53e3297e857c08ffc7b52e305 Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Wed, 4 Mar 2026 22:46:43 +0100 Subject: [PATCH 2/4] Import ExecutionPlacementError from dpnp.exceptions module --- dpnp/dpnp_algo/dpnp_fill.py | 3 ++- dpnp/dpnp_iface_indexing.py | 5 +++-- dpnp/dpnp_iface_logic.py | 3 ++- dpnp/dpnp_iface_mathematical.py | 3 ++- dpnp/dpnp_utils/dpnp_utils_einsum.py | 2 +- dpnp/dpnp_utils/dpnp_utils_linearalgebra.py | 3 +-- dpnp/dpnp_utils/dpnp_utils_statistics.py | 2 +- dpnp/fft/dpnp_utils_fft.py | 2 +- dpnp/tests/test_fft.py | 2 +- dpnp/tests/test_fill.py | 2 +- dpnp/tests/test_indexing.py | 3 +-- dpnp/tests/test_linalg.py | 3 +-- dpnp/tests/test_logic.py | 2 +- dpnp/tests/test_mathematical.py | 3 +-- dpnp/tests/test_nanfunctions.py | 2 +- dpnp/tests/test_product.py | 3 +-- dpnp/tests/test_sycl_queue.py | 2 +- 17 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dpnp/dpnp_algo/dpnp_fill.py b/dpnp/dpnp_algo/dpnp_fill.py index 112ea3af0fdb..c3bfa8fa2e80 100644 --- a/dpnp/dpnp_algo/dpnp_fill.py +++ b/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) diff --git a/dpnp/dpnp_iface_indexing.py b/dpnp/dpnp_iface_indexing.py index 7718412701e8..2f57b685b73e 100644 --- a/dpnp/dpnp_iface_indexing.py +++ b/dpnp/dpnp_iface_indexing.py @@ -56,6 +56,7 @@ # pylint: disable=no-name-in-module import dpnp.backend.extensions.indexing._indexing_impl as indexing_ext +from dpnp.exceptions import ExecutionPlacementError # pylint: disable=no-name-in-module from .dpnp_algo import ( @@ -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" ) diff --git a/dpnp/dpnp_iface_logic.py b/dpnp/dpnp_iface_logic.py index 1834f25a0485..8d7817d8f225 100644 --- a/dpnp/dpnp_iface_logic.py +++ b/dpnp/dpnp_iface_logic.py @@ -52,6 +52,7 @@ import dpnp import dpnp.backend.extensions.ufunc._ufunc_impl as ufi from dpnp.dpnp_algo.dpnp_elementwise_common import DPNPBinaryFunc, DPNPUnaryFunc +from dpnp.exceptions import ExecutionPlacementError from .dpnp_array import dpnp_array from .dpnp_utils import get_usm_allocations @@ -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) diff --git a/dpnp/dpnp_iface_mathematical.py b/dpnp/dpnp_iface_mathematical.py index e339c24d384c..1d6c8e069693 100644 --- a/dpnp/dpnp_iface_mathematical.py +++ b/dpnp/dpnp_iface_mathematical.py @@ -59,6 +59,7 @@ import dpnp import dpnp.backend.extensions.ufunc._ufunc_impl as ufi +from dpnp.exceptions import ExecutionPlacementError from .dpnp_algo.dpnp_elementwise_common import ( DPNPI0, @@ -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" ) diff --git a/dpnp/dpnp_utils/dpnp_utils_einsum.py b/dpnp/dpnp_utils/dpnp_utils_einsum.py index 284268e2868b..4a1a58635989 100644 --- a/dpnp/dpnp_utils/dpnp_utils_einsum.py +++ b/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" diff --git a/dpnp/dpnp_utils/dpnp_utils_linearalgebra.py b/dpnp/dpnp_utils/dpnp_utils_linearalgebra.py index a1de3d2f7ebe..d2a1cdfbac46 100644 --- a/dpnp/dpnp_utils/dpnp_utils_linearalgebra.py +++ b/dpnp/dpnp_utils/dpnp_utils_linearalgebra.py @@ -35,13 +35,12 @@ 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 +from dpnp.exceptions import AxisError, ExecutionPlacementError __all__ = [ "dpnp_cross", diff --git a/dpnp/dpnp_utils/dpnp_utils_statistics.py b/dpnp/dpnp_utils/dpnp_utils_statistics.py index 3a3bc04a31af..c8414b661851 100644 --- a/dpnp/dpnp_utils/dpnp_utils_statistics.py +++ b/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"] diff --git a/dpnp/fft/dpnp_utils_fft.py b/dpnp/fft/dpnp_utils_fft.py index 709494e6255e..28032b9d3be2 100644 --- a/dpnp/fft/dpnp_utils_fft.py +++ b/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 diff --git a/dpnp/tests/test_fft.py b/dpnp/tests/test_fft.py index 226420057748..b10bf1b46016 100644 --- a/dpnp/tests/test_fft.py +++ b/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, diff --git a/dpnp/tests/test_fill.py b/dpnp/tests/test_fill.py index 3102de395d93..db53ab976cba 100644 --- a/dpnp/tests/test_fill.py +++ b/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( diff --git a/dpnp/tests/test_indexing.py b/dpnp/tests/test_indexing.py index d9ec43d1ea45..b6cae0733d40 100644 --- a/dpnp/tests/test_indexing.py +++ b/dpnp/tests/test_indexing.py @@ -5,7 +5,6 @@ import numpy import pytest from dpctl.tensor._type_utils import _to_device_supported_dtype -from dpctl.utils import ExecutionPlacementError from numpy.testing import ( assert_, assert_array_equal, @@ -16,7 +15,7 @@ import dpnp from dpnp.dpnp_array import dpnp_array -from dpnp.exceptions import AxisError +from dpnp.exceptions import AxisError, ExecutionPlacementError from .helper import ( get_abs_array, diff --git a/dpnp/tests/test_linalg.py b/dpnp/tests/test_linalg.py index ac110344a59e..170a2a7b5a13 100644 --- a/dpnp/tests/test_linalg.py +++ b/dpnp/tests/test_linalg.py @@ -4,7 +4,6 @@ import dpctl.tensor as dpt import numpy import pytest -from dpctl.utils import ExecutionPlacementError from numpy.testing import ( assert_allclose, assert_array_equal, @@ -14,7 +13,7 @@ ) import dpnp -from dpnp.exceptions import AxisError +from dpnp.exceptions import AxisError, ExecutionPlacementError from .helper import ( assert_dtype_allclose, diff --git a/dpnp/tests/test_logic.py b/dpnp/tests/test_logic.py index cae51e6777ef..e68ba8162442 100644 --- a/dpnp/tests/test_logic.py +++ b/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, diff --git a/dpnp/tests/test_mathematical.py b/dpnp/tests/test_mathematical.py index 11e556b63b52..4bac0e0cc314 100644 --- a/dpnp/tests/test_mathematical.py +++ b/dpnp/tests/test_mathematical.py @@ -3,7 +3,6 @@ import numpy import pytest from dpctl.tensor._numpy_helper import normalize_axis_index -from dpctl.utils import ExecutionPlacementError from numpy.testing import ( assert_allclose, assert_array_equal, @@ -15,7 +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 +from dpnp.exceptions import AxisError, ExecutionPlacementError from .helper import ( LTS_VERSION, diff --git a/dpnp/tests/test_nanfunctions.py b/dpnp/tests/test_nanfunctions.py index d92cee045a72..48520015d354 100644 --- a/dpnp/tests/test_nanfunctions.py +++ b/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, diff --git a/dpnp/tests/test_product.py b/dpnp/tests/test_product.py index deb6390874b8..3ac324b055e8 100644 --- a/dpnp/tests/test_product.py +++ b/dpnp/tests/test_product.py @@ -1,12 +1,11 @@ import dpctl import numpy import pytest -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 +from dpnp.exceptions import AxisError, ExecutionPlacementError from .helper import ( assert_dtype_allclose, diff --git a/dpnp/tests/test_sycl_queue.py b/dpnp/tests/test_sycl_queue.py index 560f235bb56f..b0f746720af8 100644 --- a/dpnp/tests/test_sycl_queue.py +++ b/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, From a0dfbec402645d7aca37e9e4f2912cf9ca11b62b Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Wed, 4 Mar 2026 22:47:51 +0100 Subject: [PATCH 3/4] Use single dot import where applicable --- dpnp/dpnp_array.py | 2 +- dpnp/dpnp_iface_indexing.py | 2 +- dpnp/dpnp_iface_logic.py | 2 +- dpnp/dpnp_iface_manipulation.py | 2 +- dpnp/dpnp_iface_mathematical.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dpnp/dpnp_array.py b/dpnp/dpnp_array.py index 35580119b60c..dad67fc1b584 100644 --- a/dpnp/dpnp_array.py +++ b/dpnp/dpnp_array.py @@ -41,9 +41,9 @@ import dpctl.tensor._type_utils as dtu import dpnp -from dpnp.exceptions import AxisError from . import memory as dpm +from .exceptions import AxisError def _get_unwrapped_index_key(key): diff --git a/dpnp/dpnp_iface_indexing.py b/dpnp/dpnp_iface_indexing.py index 2f57b685b73e..db70f1fd2384 100644 --- a/dpnp/dpnp_iface_indexing.py +++ b/dpnp/dpnp_iface_indexing.py @@ -56,7 +56,6 @@ # pylint: disable=no-name-in-module import dpnp.backend.extensions.indexing._indexing_impl as indexing_ext -from dpnp.exceptions import ExecutionPlacementError # pylint: disable=no-name-in-module from .dpnp_algo import ( @@ -64,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): diff --git a/dpnp/dpnp_iface_logic.py b/dpnp/dpnp_iface_logic.py index 8d7817d8f225..6464bd49af1b 100644 --- a/dpnp/dpnp_iface_logic.py +++ b/dpnp/dpnp_iface_logic.py @@ -52,10 +52,10 @@ import dpnp import dpnp.backend.extensions.ufunc._ufunc_impl as ufi from dpnp.dpnp_algo.dpnp_elementwise_common import DPNPBinaryFunc, DPNPUnaryFunc -from dpnp.exceptions import ExecutionPlacementError 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): diff --git a/dpnp/dpnp_iface_manipulation.py b/dpnp/dpnp_iface_manipulation.py index 07b34beae2e0..ff7ac85666a1 100644 --- a/dpnp/dpnp_iface_manipulation.py +++ b/dpnp/dpnp_iface_manipulation.py @@ -53,13 +53,13 @@ ) import dpnp -from dpnp.exceptions import AxisError from .dpnp_array import dpnp_array # 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): diff --git a/dpnp/dpnp_iface_mathematical.py b/dpnp/dpnp_iface_mathematical.py index 1d6c8e069693..366a3363404a 100644 --- a/dpnp/dpnp_iface_mathematical.py +++ b/dpnp/dpnp_iface_mathematical.py @@ -59,7 +59,6 @@ import dpnp import dpnp.backend.extensions.ufunc._ufunc_impl as ufi -from dpnp.exceptions import ExecutionPlacementError from .dpnp_algo.dpnp_elementwise_common import ( DPNPI0, @@ -85,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): From 883205e81907ee7651ff6a80fe08a0dc0148397a Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Wed, 4 Mar 2026 22:50:27 +0100 Subject: [PATCH 4/4] Import SyclDeviceCreationError from dpnp.exceptions module --- dpnp/tests/test_array_api_info.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dpnp/tests/test_array_api_info.py b/dpnp/tests/test_array_api_info.py index b310192ffc59..0e2fe7dc5a04 100644 --- a/dpnp/tests/test_array_api_info.py +++ b/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,