Update dpnp.tests files by replacing dpctl.utils import

Author: vlad-perevezentsev

dpnp/tests/test_fft.py

@@ -1,7 +1,6 @@
 import dpctl
 import numpy
 import pytest
-from dpctl.utils import ExecutionPlacementError
 from numpy.testing import assert_raises
 
 import dpnp
@@ -277,7 +276,7 @@ def test_validate_out(self):
         # Inconsistent sycl_queue
         a = dpnp.ones((10,), dtype=dpnp.complex64, sycl_queue=dpctl.SyclQueue())
         out = dpnp.empty((10,), sycl_queue=dpctl.SyclQueue())
-        assert_raises(ExecutionPlacementError, dpnp.fft.fft, a, out=out)
+        assert_raises(dpt.ExecutionPlacementError, dpnp.fft.fft, a, out=out)
 
         # Invalid shape
         a = dpnp.ones((10,), dtype=dpnp.complex64)

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.tensor import ExecutionPlacementError
 
 
 @pytest.mark.parametrize(

dpnp/tests/test_indexing.py

@@ -3,7 +3,6 @@
 import dpctl
 import numpy
 import pytest
-from dpctl.utils import ExecutionPlacementError
 from numpy.testing import (
     assert_,
     assert_array_equal,
@@ -1380,7 +1379,7 @@ def test_compress_invalid_out_errors(self):
         with pytest.raises(ValueError):
             dpnp.compress(condition, a, out=out_bad_shape)
         out_bad_queue = dpnp.empty(1, dtype="i4", sycl_queue=q2)
-        with pytest.raises(ExecutionPlacementError):
+        with pytest.raises(dpt.ExecutionPlacementError):
             dpnp.compress(condition, a, out=out_bad_queue)
         out_bad_dt = dpnp.empty(1, dtype="i8", sycl_queue=q1)
         with pytest.raises(TypeError):
@@ -1496,7 +1495,7 @@ def test_choose_invalid_out_errors(self):
         with pytest.raises(ValueError):
             dpnp.choose(inds, [chcs], out=out_bad_shape)
         out_bad_queue = dpnp.empty(chcs.shape, dtype=chcs.dtype, sycl_queue=q2)
-        with pytest.raises(ExecutionPlacementError):
+        with pytest.raises(dpt.ExecutionPlacementError):
             dpnp.choose(inds, [chcs], out=out_bad_queue)
         out_bad_dt = dpnp.empty(chcs.shape, dtype="i8", sycl_queue=q1)
         with pytest.raises(TypeError):

dpnp/tests/test_linalg.py

@@ -3,7 +3,6 @@
 import dpctl
 import numpy
 import pytest
-from dpctl.utils import ExecutionPlacementError
 from numpy.testing import (
     assert_allclose,
     assert_array_equal,
@@ -607,7 +606,9 @@ def test_einsum_error1(self):
         a = dpnp.ones((5, 5))
         out = dpnp.empty((5,), sycl_queue=dpctl.SyclQueue())
         # inconsistent sycl_queue
-        assert_raises(ExecutionPlacementError, dpnp.einsum, "ii->i", a, out=out)
+        assert_raises(
+            dpt.ExecutionPlacementError, dpnp.einsum, "ii->i", a, out=out
+        )
 
         # unknown value for optimize keyword
         assert_raises(TypeError, dpnp.einsum, "ii->i", a, optimize="blah")
@@ -2777,7 +2778,7 @@ def test_matrix_rank_errors(self):
         a_dp_q = dpnp.array(a_dp, sycl_queue=a_queue)
         tol_dp_q = dpnp.array([0.5], dtype="float32", sycl_queue=tol_queue)
         assert_raises(
-            ExecutionPlacementError,
+            dpt.ExecutionPlacementError,
             dpnp.linalg.matrix_rank,
             a_dp_q,
             tol_dp_q,

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.tensor import ExecutionPlacementError
 
 from .helper import (
     generate_random_numpy_array,

dpnp/tests/test_mathematical.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,
@@ -710,12 +709,14 @@ def test_errors(self):
         # another `to_begin` sycl queue
         to_begin = dpnp.array([-20, -15], sycl_queue=dpctl.SyclQueue())
         assert_raises(
-            ExecutionPlacementError, dpnp.ediff1d, ia, to_begin=to_begin
+            dpt.ExecutionPlacementError, dpnp.ediff1d, ia, to_begin=to_begin
         )
 
         # another `to_end` sycl queue
         to_end = dpnp.array([15, 20], sycl_queue=dpctl.SyclQueue())
-        assert_raises(ExecutionPlacementError, dpnp.ediff1d, ia, to_end=to_end)
+        assert_raises(
+            dpt.ExecutionPlacementError, dpnp.ediff1d, ia, to_end=to_end
+        )
 
 
 class TestGradient:
@@ -2131,13 +2132,13 @@ def test_unary_two_outs_cfd_error(self, func):
         out1 = dpnp.empty((), sycl_queue=dpctl.SyclQueue())
         out2 = dpnp.empty((), sycl_queue=dpctl.SyclQueue())
         with pytest.raises(
-            ExecutionPlacementError,
+            dpt.ExecutionPlacementError,
             match="Input and output allocation queues are not compatible",
         ):
             _ = fn(*args, out1)
 
         with pytest.raises(
-            ExecutionPlacementError,
+            dpt.ExecutionPlacementError,
             match="Input and output allocation queues are not compatible",
         ):
             _ = fn(*args, out=(None, out2))

dpnp/tests/test_nanfunctions.py

@@ -1,7 +1,6 @@
 import dpctl
 import numpy
 import pytest
-from dpctl.utils import ExecutionPlacementError
 from numpy.testing import (
     assert_allclose,
     assert_almost_equal,
@@ -496,7 +495,7 @@ def test_error(self):
         # out has a different queue
         exec_q = dpctl.SyclQueue()
         res = dpnp.empty(2, dtype=a.dtype, sycl_queue=exec_q)
-        with pytest.raises(ExecutionPlacementError):
+        with pytest.raises(dpt.ExecutionPlacementError):
             dpnp.nanmedian(a, axis=1, out=res)
 
 

dpnp/tests/test_product.py

@@ -1,11 +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.tensor import ExecutionPlacementError
 from dpnp.tensor._numpy_helper import AxisError
 
 from .helper import (

dpnp/tests/test_sycl_queue.py

@@ -4,7 +4,6 @@
 import dpctl
 import numpy
 import pytest
-from dpctl.utils import ExecutionPlacementError
 from numpy.testing import assert_array_equal, assert_raises
 
 import dpnp
@@ -50,7 +49,7 @@ def assert_sycl_queue_equal(result, expected):
     assert result.sycl_device == expected.sycl_device
     assert result.is_in_order == expected.is_in_order
     assert result.has_enable_profiling == expected.has_enable_profiling
-    exec_queue = dpctl.utils.get_execution_queue([result, expected])
+    exec_queue = dpt.get_execution_queue([result, expected])
     assert exec_queue is not None
 
 
@@ -657,7 +656,7 @@ def test_2in_broadcasting(func, data1, data2, device):
 def test_2in_1out_diff_queue_but_equal_context(func, device):
     x1 = dpnp.arange(10)
     x2 = dpnp.arange(10, sycl_queue=dpctl.SyclQueue(device))[::-1]
-    with assert_raises((ValueError, ExecutionPlacementError)):
+    with assert_raises((ValueError, dpt.ExecutionPlacementError)):
         getattr(dpnp, func)(x1, x2)