Merge pull request #1496 from IntelPython/replace-typeerror-with-valueerror-as-appropriate

oleksandr-pavlyk · web-flow · commit 2cb368cd3f4f · 2024-01-18T20:14:46.000-06:00
diff --git a/dpctl/tensor/_elementwise_common.py b/dpctl/tensor/_elementwise_common.py
@@ -188,7 +188,7 @@ def __call__(self, x, out=None, order="K"):
             acceptance_fn=self.acceptance_fn_,
         )
         if res_dt is None:
-            raise TypeError(
+            raise ValueError(
                 f"function '{self.name_}' does not support input type "
                 f"({x.dtype}), "
                 "and the input could not be safely coerced to any "
@@ -209,7 +209,7 @@ def __call__(self, x, out=None, order="K"):
                 )
 
             if res_dt != out.dtype:
-                raise TypeError(
+                raise ValueError(
                     f"Output array of type {res_dt} is needed,"
                     f" got {out.dtype}"
                 )
@@ -587,7 +587,7 @@ def __call__(self, o1, o2, out=None, order="K"):
         )
 
         if res_dt is None:
-            raise TypeError(
+            raise ValueError(
                 f"function '{self.name_}' does not support input types "
                 f"({o1_dtype}, {o2_dtype}), "
                 "and the inputs could not be safely coerced to any "
@@ -608,7 +608,7 @@ def __call__(self, o1, o2, out=None, order="K"):
                 )
 
             if res_dt != out.dtype:
-                raise TypeError(
+                raise ValueError(
                     f"Output array of type {res_dt} is needed,"
                     f"got {out.dtype}"
                 )
diff --git a/dpctl/tests/elementwise/test_add.py b/dpctl/tests/elementwise/test_add.py
@@ -337,7 +337,7 @@ def test_add_dtype_error(
 
     y = dpt.zeros_like(ar1, dtype="int8")
     assert_raises_regex(
-        TypeError, "Output array of type.*is needed", dpt.add, ar1, ar2, y
+        ValueError, "Output array of type.*is needed", dpt.add, ar1, ar2, y
     )
 
 
@@ -384,7 +384,7 @@ def test_add_inplace_dtype_matrix(op1_dtype, op2_dtype):
             dpt.asnumpy(ar3) == np.full(ar3.shape, 2, dtype=ar3.dtype)
         ).all()
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             ar1 += ar2
             dpt.add(ar1, ar2, out=ar1)
 
@@ -404,7 +404,7 @@ def test_add_inplace_dtype_matrix(op1_dtype, op2_dtype):
             dpt.asnumpy(ar4) == np.full(ar4.shape, 2, dtype=ar4.dtype)
         ).all()
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             dpt.add(ar1, ar2, out=ar2)
 
 
diff --git a/dpctl/tests/elementwise/test_bitwise_and.py b/dpctl/tests/elementwise/test_bitwise_and.py
@@ -123,7 +123,7 @@ def test_bitwise_and_inplace_dtype_matrix(op1_dtype, op2_dtype):
         ar3 &= ar4
         assert dpt.all(ar3 == 1)
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             ar1 &= ar2
             dpt.bitwise_and(ar1, ar2, out=ar1)
 
@@ -139,5 +139,5 @@ def test_bitwise_and_inplace_dtype_matrix(op1_dtype, op2_dtype):
         dpt.bitwise_and(ar3, ar4, out=ar4)
         dpt.all(ar4 == 1)
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             dpt.bitwise_and(ar1, ar2, out=ar2)
diff --git a/dpctl/tests/elementwise/test_bitwise_left_shift.py b/dpctl/tests/elementwise/test_bitwise_left_shift.py
@@ -131,7 +131,7 @@ def test_bitwise_left_shift_inplace_dtype_matrix(op1_dtype, op2_dtype):
         ar3 <<= ar4
         assert dpt.all(ar3 == 2)
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             ar1 <<= ar2
             dpt.bitwise_left_shift(ar1, ar2, out=ar1)
 
@@ -147,5 +147,5 @@ def test_bitwise_left_shift_inplace_dtype_matrix(op1_dtype, op2_dtype):
         dpt.bitwise_left_shift(ar3, ar4, out=ar4)
         dpt.all(ar4 == 2)
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             dpt.bitwise_left_shift(ar1, ar2, out=ar2)
diff --git a/dpctl/tests/elementwise/test_bitwise_or.py b/dpctl/tests/elementwise/test_bitwise_or.py
@@ -123,7 +123,7 @@ def test_bitwise_or_inplace_dtype_matrix(op1_dtype, op2_dtype):
         ar3 |= ar4
         assert dpt.all(ar3 == 1)
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             ar1 |= ar2
             dpt.bitwise_or(ar1, ar2, out=ar1)
 
@@ -139,5 +139,5 @@ def test_bitwise_or_inplace_dtype_matrix(op1_dtype, op2_dtype):
         dpt.bitwise_or(ar3, ar4, out=ar4)
         dpt.all(ar4 == 1)
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             dpt.bitwise_or(ar1, ar2, out=ar2)
diff --git a/dpctl/tests/elementwise/test_bitwise_right_shift.py b/dpctl/tests/elementwise/test_bitwise_right_shift.py
@@ -131,7 +131,7 @@ def test_bitwise_right_shift_inplace_dtype_matrix(op1_dtype, op2_dtype):
         ar3 >>= ar4
         assert dpt.all(ar3 == 0)
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             ar1 >>= ar2
             dpt.bitwise_right_shift(ar1, ar2, out=ar1)
 
@@ -147,5 +147,5 @@ def test_bitwise_right_shift_inplace_dtype_matrix(op1_dtype, op2_dtype):
         dpt.bitwise_right_shift(ar3, ar4, out=ar4)
         dpt.all(ar4 == 0)
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             dpt.bitwise_right_shift(ar1, ar2, out=ar2)
diff --git a/dpctl/tests/elementwise/test_bitwise_xor.py b/dpctl/tests/elementwise/test_bitwise_xor.py
@@ -123,7 +123,7 @@ def test_bitwise_xor_inplace_dtype_matrix(op1_dtype, op2_dtype):
         ar3 ^= ar4
         assert dpt.all(ar3 == 0)
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             ar1 ^= ar2
             dpt.bitwise_xor(ar1, ar2, out=ar1)
 
@@ -139,5 +139,5 @@ def test_bitwise_xor_inplace_dtype_matrix(op1_dtype, op2_dtype):
         dpt.bitwise_xor(ar3, ar4, out=ar4)
         dpt.all(ar4 == 0)
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             dpt.bitwise_xor(ar1, ar2, out=ar2)
diff --git a/dpctl/tests/elementwise/test_divide.py b/dpctl/tests/elementwise/test_divide.py
@@ -235,7 +235,7 @@ def test_divide_inplace_dtype_matrix(op1_dtype, op2_dtype):
         ar3 /= ar4
         assert dpt.all(ar3 == 1)
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             ar1 /= ar2
             dpt.divide(ar1, ar2, out=ar1)
 
@@ -254,5 +254,5 @@ def test_divide_inplace_dtype_matrix(op1_dtype, op2_dtype):
         dpt.divide(ar3, ar4, out=ar4)
         dpt.all(ar4 == 1)
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             dpt.divide(ar1, ar2, out=ar2)
diff --git a/dpctl/tests/elementwise/test_floor_ceil_trunc.py b/dpctl/tests/elementwise/test_floor_ceil_trunc.py
@@ -100,7 +100,7 @@ def test_floor_ceil_trunc_error_dtype(dpt_call, dtype):
     x = dpt.zeros(5, dtype=dtype)
     y = dpt.empty_like(x, dtype="b1")
     assert_raises_regex(
-        TypeError, "Output array of type.*is needed", dpt_call, x, y
+        ValueError, "Output array of type.*is needed", dpt_call, x, y
     )
 
 
diff --git a/dpctl/tests/elementwise/test_floor_divide.py b/dpctl/tests/elementwise/test_floor_divide.py
@@ -299,7 +299,7 @@ def test_floor_divide_inplace_dtype_matrix(op1_dtype, op2_dtype):
         ar3 //= ar4
         assert dpt.all(ar3 == 1)
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             ar1 //= ar2
             dpt.floor_divide(ar1, ar2, out=ar1)
 
@@ -315,5 +315,5 @@ def test_floor_divide_inplace_dtype_matrix(op1_dtype, op2_dtype):
         dpt.floor_divide(ar3, ar4, out=ar4)
         dpt.all(ar4 == 1)
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             dpt.floor_divide(ar1, ar2, out=ar2)
diff --git a/dpctl/tests/elementwise/test_hyperbolic.py b/dpctl/tests/elementwise/test_hyperbolic.py
@@ -187,7 +187,7 @@ def test_hyper_error_dtype(callable, dtype):
     x = dpt.ones(5, dtype=dtype)
     y = dpt.empty_like(x, dtype="int16")
     assert_raises_regex(
-        TypeError, "Output array of type.*is needed", callable, x, y
+        ValueError, "Output array of type.*is needed", callable, x, y
     )
 
 
diff --git a/dpctl/tests/elementwise/test_logaddexp.py b/dpctl/tests/elementwise/test_logaddexp.py
@@ -189,5 +189,10 @@ def test_logaddexp_dtype_error(
 
     y = dpt.zeros_like(ar1, dtype="int8")
     assert_raises_regex(
-        TypeError, "Output array of type.*is needed", dpt.logaddexp, ar1, ar2, y
+        ValueError,
+        "Output array of type.*is needed",
+        dpt.logaddexp,
+        ar1,
+        ar2,
+        y,
     )
diff --git a/dpctl/tests/elementwise/test_multiply.py b/dpctl/tests/elementwise/test_multiply.py
@@ -220,7 +220,7 @@ def test_multiply_inplace_dtype_matrix(op1_dtype, op2_dtype):
         ).all()
 
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             ar1 *= ar2
 
 
diff --git a/dpctl/tests/elementwise/test_pow.py b/dpctl/tests/elementwise/test_pow.py
@@ -198,7 +198,7 @@ def test_pow_inplace_dtype_matrix(op1_dtype, op2_dtype):
         ).all()
 
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             ar1 **= ar2
 
 
diff --git a/dpctl/tests/elementwise/test_remainder.py b/dpctl/tests/elementwise/test_remainder.py
@@ -246,7 +246,7 @@ def test_remainder_inplace_dtype_matrix(op1_dtype, op2_dtype):
         assert dpt.all(ar3 == dpt.zeros(ar3.shape, dtype=ar3.dtype))
 
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             ar1 %= ar2
 
 
diff --git a/dpctl/tests/elementwise/test_subtract.py b/dpctl/tests/elementwise/test_subtract.py
@@ -211,7 +211,7 @@ def test_subtract_inplace_dtype_matrix(op1_dtype, op2_dtype):
         assert (dpt.asnumpy(ar3) == np.zeros(ar3.shape, dtype=ar3.dtype)).all()
 
     else:
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError):
             ar1 -= ar2
 
 
diff --git a/dpctl/tests/elementwise/test_trigonometric.py b/dpctl/tests/elementwise/test_trigonometric.py
@@ -194,7 +194,7 @@ def test_trig_error_dtype(callable, dtype):
     x = dpt.zeros(5, dtype=dtype)
     y = dpt.empty_like(x, dtype="int16")
     assert_raises_regex(
-        TypeError, "Output array of type.*is needed", callable, x, y
+        ValueError, "Output array of type.*is needed", callable, x, y
     )
 
 

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ def __call__(self, x, out=None, order="K"):`
`188`	`188`	`acceptance_fn=self.acceptance_fn_,`
`189`	`189`	`)`
`190`	`190`	`if res_dt is None:`
`191`		`- raise TypeError(`
	`191`	`+ raise ValueError(`
`192`	`192`	`f"function '{self.name_}' does not support input type "`
`193`	`193`	`f"({x.dtype}), "`
`194`	`194`	`"and the input could not be safely coerced to any "`
`@@ -209,7 +209,7 @@ def __call__(self, x, out=None, order="K"):`
`209`	`209`	`)`
`210`	`210`
`211`	`211`	`if res_dt != out.dtype:`
`212`		`- raise TypeError(`
	`212`	`+ raise ValueError(`
`213`	`213`	`f"Output array of type {res_dt} is needed,"`
`214`	`214`	`f" got {out.dtype}"`
`215`	`215`	`)`
`@@ -587,7 +587,7 @@ def __call__(self, o1, o2, out=None, order="K"):`
`587`	`587`	`)`
`588`	`588`
`589`	`589`	`if res_dt is None:`
`590`		`- raise TypeError(`
	`590`	`+ raise ValueError(`
`591`	`591`	`f"function '{self.name_}' does not support input types "`
`592`	`592`	`f"({o1_dtype}, {o2_dtype}), "`
`593`	`593`	`"and the inputs could not be safely coerced to any "`
`@@ -608,7 +608,7 @@ def __call__(self, o1, o2, out=None, order="K"):`
`608`	`608`	`)`
`609`	`609`
`610`	`610`	`if res_dt != out.dtype:`
`611`		`- raise TypeError(`
	`611`	`+ raise ValueError(`
`612`	`612`	`f"Output array of type {res_dt} is needed,"`
`613`	`613`	`f"got {out.dtype}"`
`614`	`614`	`)`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ def test_floor_ceil_trunc_error_dtype(dpt_call, dtype):`
`100`	`100`	`x = dpt.zeros(5, dtype=dtype)`
`101`	`101`	`y = dpt.empty_like(x, dtype="b1")`
`102`	`102`	`assert_raises_regex(`
`103`		`- TypeError, "Output array of type.*is needed", dpt_call, x, y`
	`103`	`+ ValueError, "Output array of type.*is needed", dpt_call, x, y`
`104`	`104`	`)`
`105`	`105`
`106`	`106`