Update dpnp.tests.tensor files by replacing dpctl.utils import

vlad-perevezentsev · vlad-perevezentsev · commit 01b92b82c0ce · 2026-04-08T15:38:41.000-07:00
diff --git a/dpnp/tests/tensor/elementwise/test_add.py b/dpnp/tests/tensor/elementwise/test_add.py
@@ -32,7 +32,6 @@
 import dpctl
 import numpy as np
 import pytest
-from dpctl.utils import ExecutionPlacementError
 
 import dpnp.tensor as dpt
 from dpnp.tensor._type_utils import _can_cast
@@ -101,9 +100,7 @@ def test_add_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.add(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
@@ -299,7 +296,7 @@ def test_add_errors():
     ar1 = dpt.ones(2, dtype="float32", sycl_queue=gpu_queue)
     ar2 = dpt.ones_like(ar1, sycl_queue=gpu_queue)
     y = dpt.empty_like(ar1, sycl_queue=cpu_queue)
-    with pytest.raises(ExecutionPlacementError) as excinfo:
+    with pytest.raises(dpt.ExecutionPlacementError) as excinfo:
         dpt.add(ar1, ar2, out=y)
     assert "Input and output allocation queues are not compatible" in str(
         excinfo.value
@@ -316,7 +313,7 @@ def test_add_errors():
 
     ar1 = np.ones(2, dtype="float32")
     ar2 = np.ones_like(ar1, dtype="int32")
-    with pytest.raises(ExecutionPlacementError) as excinfo:
+    with pytest.raises(dpt.ExecutionPlacementError) as excinfo:
         dpt.add(ar1, ar2)
     assert re.match(
         "Execution placement can not be unambiguously inferred.*",
@@ -484,7 +481,7 @@ def test_add_inplace_errors():
 
     ar1 = dpt.ones(2, dtype="float32", sycl_queue=gpu_queue)
     ar2 = dpt.ones_like(ar1, sycl_queue=cpu_queue)
-    with pytest.raises(ExecutionPlacementError):
+    with pytest.raises(dpt.ExecutionPlacementError):
         dpt.add(ar1, ar2, out=ar1)
 
     ar1 = dpt.ones(2, dtype="float32")
@@ -522,7 +519,7 @@ def test_add_inplace_operator_errors():
 
     x_q1 = dpt.ones(10, dtype="i4", sycl_queue=q1)
     x_q2 = dpt.ones(10, dtype="i4", sycl_queue=q2)
-    with pytest.raises(ExecutionPlacementError):
+    with pytest.raises(dpt.ExecutionPlacementError):
         dpt.add._inplace_op(x_q1, x_q2)
 
 
@@ -564,10 +561,10 @@ def test_add_cfd():
 
     x1 = dpt.ones(10, sycl_queue=q1)
     x2 = dpt.ones(10, sycl_queue=q2)
-    with pytest.raises(ExecutionPlacementError):
+    with pytest.raises(dpt.ExecutionPlacementError):
         dpt.add(x1, x2)
 
-    with pytest.raises(ExecutionPlacementError):
+    with pytest.raises(dpt.ExecutionPlacementError):
         dpt.add(x1, x1, out=x2)
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_divide.py b/dpnp/tests/tensor/elementwise/test_divide.py
@@ -95,9 +95,7 @@ def test_divide_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.divide(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_equal.py b/dpnp/tests/tensor/elementwise/test_equal.py
@@ -90,9 +90,7 @@ def test_equal_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.equal(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_floor_divide.py b/dpnp/tests/tensor/elementwise/test_floor_divide.py
@@ -92,9 +92,7 @@ def test_floor_divide_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.floor_divide(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_greater.py b/dpnp/tests/tensor/elementwise/test_greater.py
@@ -166,9 +166,7 @@ def test_greater_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.greater(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_greater_equal.py b/dpnp/tests/tensor/elementwise/test_greater_equal.py
@@ -164,9 +164,7 @@ def test_greater_equal_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.greater_equal(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_hypot.py b/dpnp/tests/tensor/elementwise/test_hypot.py
@@ -90,9 +90,7 @@ def test_hypot_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.hypot(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_less.py b/dpnp/tests/tensor/elementwise/test_less.py
@@ -166,9 +166,7 @@ def test_less_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.less(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_less_equal.py b/dpnp/tests/tensor/elementwise/test_less_equal.py
@@ -165,9 +165,7 @@ def test_less_equal_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.less_equal(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_logaddexp.py b/dpnp/tests/tensor/elementwise/test_logaddexp.py
@@ -95,9 +95,7 @@ def test_logaddexp_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.logaddexp(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_logical_and.py b/dpnp/tests/tensor/elementwise/test_logical_and.py
@@ -193,9 +193,7 @@ def test_logical_and_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.logical_and(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_logical_or.py b/dpnp/tests/tensor/elementwise/test_logical_or.py
@@ -194,9 +194,7 @@ def test_logical_or_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.logical_or(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_logical_xor.py b/dpnp/tests/tensor/elementwise/test_logical_xor.py
@@ -195,9 +195,7 @@ def test_logical_xor_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.logical_xor(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_maximum_minimum.py b/dpnp/tests/tensor/elementwise/test_maximum_minimum.py
@@ -208,16 +208,12 @@ def test_maximum_minimum_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.maximum(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
     r = dpt.minimum(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_multiply.py b/dpnp/tests/tensor/elementwise/test_multiply.py
@@ -91,9 +91,7 @@ def test_multiply_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.multiply(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_not_equal.py b/dpnp/tests/tensor/elementwise/test_not_equal.py
@@ -90,9 +90,7 @@ def test_not_equal_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.not_equal(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_pow.py b/dpnp/tests/tensor/elementwise/test_pow.py
@@ -91,9 +91,7 @@ def test_power_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.pow(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_remainder.py b/dpnp/tests/tensor/elementwise/test_remainder.py
@@ -91,9 +91,7 @@ def test_remainder_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.remainder(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_subtract.py b/dpnp/tests/tensor/elementwise/test_subtract.py
@@ -107,9 +107,7 @@ def test_subtract_usm_type_matrix(op1_usm_type, op2_usm_type):
 
     r = dpt.subtract(ar1, ar2)
     assert isinstance(r, dpt.usm_ndarray)
-    expected_usm_type = dpctl.utils.get_coerced_usm_type(
-        (op1_usm_type, op2_usm_type)
-    )
+    expected_usm_type = dpt.get_coerced_usm_type((op1_usm_type, op2_usm_type))
     assert r.usm_type == expected_usm_type
 
 
diff --git a/dpnp/tests/tensor/elementwise/test_type_utils.py b/dpnp/tests/tensor/elementwise/test_type_utils.py
@@ -154,7 +154,7 @@ def test_unary_func_arg_validation():
 
 
 def test_binary_func_arg_validation():
-    with pytest.raises(dpctl.utils.ExecutionPlacementError):
+    with pytest.raises(dpt.ExecutionPlacementError):
         dpt.add([1, 2, 3], 1)
     try:
         a = dpt.arange(8)
diff --git a/dpnp/tests/tensor/test_tensor_accumulation.py b/dpnp/tests/tensor/test_tensor_accumulation.py
@@ -29,7 +29,6 @@
 from random import randrange
 
 import pytest
-from dpctl.utils import ExecutionPlacementError
 
 import dpnp.tensor as dpt
 
@@ -308,7 +307,7 @@ def test_accumulator_arg_validation():
 
     # compute follows data
     out_wrong_queue = dpt.empty_like(x2, sycl_queue=q2)
-    with pytest.raises(ExecutionPlacementError):
+    with pytest.raises(dpt.ExecutionPlacementError):
         dpt.cumulative_sum(x2, out=out_wrong_queue)
 
 
diff --git a/dpnp/tests/tensor/test_tensor_asarray.py b/dpnp/tests/tensor/test_tensor_asarray.py
@@ -404,7 +404,7 @@ def test_asarray_seq_of_arrays_on_different_queues():
     assert res.sycl_queue == w.sycl_queue
     assert dpt.isdtype(res.dtype, "integral")
 
-    with pytest.raises(dpctl.utils.ExecutionPlacementError):
+    with pytest.raises(dpt.ExecutionPlacementError):
         dpt.asarray([m, [w, py_seq]])
 
 
diff --git a/dpnp/tests/tensor/test_tensor_clip.py b/dpnp/tests/tensor/test_tensor_clip.py
diff --git a/dpnp/tests/tensor/test_tensor_diff.py b/dpnp/tests/tensor/test_tensor_diff.py
diff --git a/dpnp/tests/tensor/test_tensor_isin.py b/dpnp/tests/tensor/test_tensor_isin.py
diff --git a/dpnp/tests/tensor/test_usm_ndarray_ctor.py b/dpnp/tests/tensor/test_usm_ndarray_ctor.py
diff --git a/dpnp/tests/tensor/test_usm_ndarray_indexing.py b/dpnp/tests/tensor/test_usm_ndarray_indexing.py
diff --git a/dpnp/tests/tensor/test_usm_ndarray_linalg.py b/dpnp/tests/tensor/test_usm_ndarray_linalg.py
diff --git a/dpnp/tests/tensor/test_usm_ndarray_manipulation.py b/dpnp/tests/tensor/test_usm_ndarray_manipulation.py
diff --git a/dpnp/tests/tensor/test_usm_ndarray_reductions.py b/dpnp/tests/tensor/test_usm_ndarray_reductions.py
diff --git a/dpnp/tests/tensor/test_usm_ndarray_search_functions.py b/dpnp/tests/tensor/test_usm_ndarray_search_functions.py
diff --git a/dpnp/tests/tensor/test_usm_ndarray_searchsorted.py b/dpnp/tests/tensor/test_usm_ndarray_searchsorted.py
