Skip to content

Commit ab0589e

Browse files
antonwolfyantonwolfy
authored
Merge b1a97f9 into ad44b0e 
2 parents ad44b0e + b1a97f9 commit ab0589e

File tree

3 files changed

+78
-59
lines changed

3 files changed

+78
-59
lines changed

‎dpnp/tests/test_binary_ufuncs.py

Lines changed: 63 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,15 @@ def test_invalid_shape(self, shape):
128128
with pytest.raises(ValueError):
129129
dpnp.add(a, b, out=out)
130130

131-
@pytest.mark.parametrize("out", [4, (), [], (3, 7), [2, 4]])
132-
def test_invalid_out(self, out):
133-
a = dpnp.arange(10)
134-
135-
assert_raises(TypeError, dpnp.add, a, 2, out)
136-
assert_raises(TypeError, numpy.add, a.asnumpy(), 2, out)
131+
@pytest.mark.parametrize("xp", [dpnp, numpy])
132+
@pytest.mark.parametrize(
133+
"out",
134+
[4, (), [], (3, 7), [2, 4]],
135+
ids=["scalar", "empty_tuple", "empty_list", "tuple", "list"],
136+
)
137+
def test_invalid_out(self, xp, out):
138+
a = xp.arange(10)
139+
assert_raises(TypeError, xp.add, a, 2, out)
137140

138141

139142
class TestBoundFuncs:
@@ -194,13 +197,16 @@ def test_invalid_shape(self, func_params, shape):
194197
with pytest.raises(ValueError):
195198
getattr(dpnp, func_name)(a, b, out=out)
196199

197-
@pytest.mark.parametrize("out", [4, (), [], (3, 7), [2, 4]])
198-
def test_invalid_out(self, func_params, out):
200+
@pytest.mark.parametrize("xp", [dpnp, numpy])
201+
@pytest.mark.parametrize(
202+
"out",
203+
[4, (), [], (3, 7), [2, 4]],
204+
ids=["scalar", "empty_tuple", "empty_list", "tuple", "list"],
205+
)
206+
def test_invalid_out(self, func_params, xp, out):
199207
func_name = func_params["func_name"]
200-
a = dpnp.arange(10)
201-
202-
assert_raises(TypeError, getattr(dpnp, func_name), a, 2, out)
203-
assert_raises(TypeError, getattr(numpy, func_name), a.asnumpy(), 2, out)
208+
a = xp.arange(10)
209+
assert_raises(TypeError, getattr(xp, func_name), a, 2, out)
204210

205211

206212
class TestDivide:
@@ -288,12 +294,15 @@ def test_invalid_shape(self, shape):
288294
with pytest.raises(ValueError):
289295
dpnp.divide(a, b, out=out)
290296

291-
@pytest.mark.parametrize("out", [4, (), [], (3, 7), [2, 4]])
292-
def test_invalid_out(self, out):
293-
a = dpnp.arange(10)
294-
295-
assert_raises(TypeError, dpnp.divide, a, 2, out)
296-
assert_raises(TypeError, numpy.divide, a.asnumpy(), 2, out)
297+
@pytest.mark.parametrize("xp", [dpnp, numpy])
298+
@pytest.mark.parametrize(
299+
"out",
300+
[4, (), [], (3, 7), [2, 4]],
301+
ids=["scalar", "empty_tuple", "empty_list", "tuple", "list"],
302+
)
303+
def test_invalid_out(self, xp, out):
304+
a = xp.arange(10)
305+
assert_raises(TypeError, xp.divide, a, 2, out)
297306

298307

299308
@pytest.mark.parametrize("func", ["floor_divide", "remainder"])
@@ -378,12 +387,15 @@ def test_invalid_shape(self, func, shape):
378387
with pytest.raises(ValueError):
379388
getattr(dpnp, func)(a, b, out=out)
380389

381-
@pytest.mark.parametrize("out", [4, (), [], (3, 7), [2, 4]])
382-
def test_invalid_out(self, func, out):
383-
a = dpnp.arange(10)
384-
385-
assert_raises(TypeError, getattr(dpnp, func), a, 2, out)
386-
assert_raises(TypeError, getattr(numpy, func), a.asnumpy(), 2, out)
390+
@pytest.mark.parametrize("xp", [dpnp, numpy])
391+
@pytest.mark.parametrize(
392+
"out",
393+
[4, (), [], (3, 7), [2, 4]],
394+
ids=["scalar", "empty_tuple", "empty_list", "tuple", "list"],
395+
)
396+
def test_invalid_out(self, func, xp, out):
397+
a = xp.arange(10)
398+
assert_raises(TypeError, getattr(xp, func), a, 2, out)
387399

388400

389401
class TestFmaxFmin:
@@ -659,12 +671,15 @@ def test_invalid_shape(self, shape):
659671
with pytest.raises(ValueError):
660672
dpnp.multiply(a, b, out=out)
661673

662-
@pytest.mark.parametrize("out", [4, (), [], (3, 7), [2, 4]])
663-
def test_invalid_out(self, out):
664-
a = dpnp.arange(10)
665-
666-
assert_raises(TypeError, dpnp.multiply, a, 2, out)
667-
assert_raises(TypeError, numpy.multiply, a.asnumpy(), 2, out)
674+
@pytest.mark.parametrize("xp", [dpnp, numpy])
675+
@pytest.mark.parametrize(
676+
"out",
677+
[4, (), [], (3, 7), [2, 4]],
678+
ids=["scalar", "empty_tuple", "empty_list", "tuple", "list"],
679+
)
680+
def test_invalid_out(self, xp, out):
681+
a = xp.arange(10)
682+
assert_raises(TypeError, xp.multiply, a, 2, out)
668683

669684

670685
class TestNextafter:
@@ -911,12 +926,15 @@ def test_invalid_shape(self, shape):
911926
with pytest.raises(ValueError):
912927
dpnp.power(a, b, out=out)
913928

914-
@pytest.mark.parametrize("out", [4, (), [], (3, 7), [2, 4]])
915-
def test_invalid_out(self, out):
916-
a = dpnp.arange(10)
917-
918-
assert_raises(TypeError, dpnp.power, a, 2, out)
919-
assert_raises(TypeError, numpy.power, a.asnumpy(), 2, out)
929+
@pytest.mark.parametrize("xp", [dpnp, numpy])
930+
@pytest.mark.parametrize(
931+
"out",
932+
[4, (), [], (3, 7), [2, 4]],
933+
ids=["scalar", "empty_tuple", "empty_list", "tuple", "list"],
934+
)
935+
def test_invalid_out(self, xp, out):
936+
a = xp.arange(10)
937+
assert_raises(TypeError, xp.power, a, 2, out)
920938

921939
@pytest.mark.usefixtures("suppress_invalid_numpy_warnings")
922940
def test_complex_values(self):
@@ -1124,9 +1142,12 @@ def test_invalid_shape(self, shape):
11241142
with pytest.raises(ValueError):
11251143
dpnp.subtract(a, b, out=out)
11261144

1127-
@pytest.mark.parametrize("out", [4, (), [], (3, 7), [2, 4]])
1128-
def test_invalid_out(self, out):
1129-
a = dpnp.arange(10)
1130-
1131-
assert_raises(TypeError, dpnp.subtract, a, 2, out)
1132-
assert_raises(TypeError, numpy.subtract, a.asnumpy(), 2, out)
1145+
@pytest.mark.parametrize("xp", [dpnp, numpy])
1146+
@pytest.mark.parametrize(
1147+
"out",
1148+
[4, (), [], (3, 7), [2, 4]],
1149+
ids=["scalar", "empty_tuple", "empty_list", "tuple", "list"],
1150+
)
1151+
def test_invalid_out(self, xp, out):
1152+
a = xp.arange(10)
1153+
assert_raises(TypeError, xp.subtract, a, 2, out)

‎dpnp/tests/test_mathematical.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2518,16 +2518,15 @@ def test_invalid_shape(self, shape):
25182518
with pytest.raises(ValueError):
25192519
dpnp.hypot(dp_array1, dp_array2, out=dp_out)
25202520

2521+
@pytest.mark.parametrize("xp", [dpnp, numpy])
25212522
@pytest.mark.parametrize(
25222523
"out",
25232524
[4, (), [], (3, 7), [2, 4]],
2524-
ids=["4", "()", "[]", "(3, 7)", "[2, 4]"],
2525+
ids=["scalar", "empty_tuple", "empty_list", "tuple", "list"],
25252526
)
2526-
def test_invalid_out(self, out):
2527-
a = dpnp.arange(10)
2528-
2529-
assert_raises(TypeError, dpnp.hypot, a, 2, out)
2530-
assert_raises(TypeError, numpy.hypot, a.asnumpy(), 2, out)
2527+
def test_invalid_out(self, xp, out):
2528+
a = xp.arange(10)
2529+
assert_raises(TypeError, xp.hypot, a, 2, out)
25312530

25322531

25332532
class TestLogSumExp:

‎dpnp/tests/test_umath.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -659,16 +659,15 @@ def test_invalid_shape(self, shape):
659659
with pytest.raises(ValueError):
660660
dpnp.square(dp_array, out=dp_out)
661661

662+
@pytest.mark.parametrize("xp", [dpnp, numpy])
662663
@pytest.mark.parametrize(
663664
"out",
664665
[4, (), [], (3, 7), [2, 4]],
665-
ids=["4", "()", "[]", "(3, 7)", "[2, 4]"],
666+
ids=["scalar", "empty_tuple", "empty_list", "tuple", "list"],
666667
)
667-
def test_invalid_out(self, out):
668-
a = dpnp.arange(10)
669-
670-
assert_raises(TypeError, dpnp.square, a, out)
671-
assert_raises(TypeError, numpy.square, a.asnumpy(), out)
668+
def test_invalid_out(self, xp, out):
669+
a = xp.arange(10)
670+
assert_raises(TypeError, xp.square, a, out)
672671

673672

674673
class TestUmath:
@@ -759,16 +758,16 @@ def test_invalid_shape(self, func_params, shape):
759758
with pytest.raises(ValueError):
760759
getattr(dpnp, func_name)(dp_array, out=dp_out)
761760

761+
@pytest.mark.parametrize("xp", [dpnp, numpy])
762762
@pytest.mark.parametrize(
763763
"out",
764764
[4, (), [], (3, 7), [2, 4]],
765-
ids=["4", "()", "[]", "(3, 7)", "[2, 4]"],
765+
ids=["scalar", "empty_tuple", "empty_list", "tuple", "list"],
766766
)
767-
def test_invalid_out(self, func_params, out):
767+
def test_invalid_out(self, func_params, xp, out):
768768
func_name = func_params["func_name"]
769-
a = dpnp.arange(10)
770-
assert_raises(TypeError, getattr(dpnp, func_name), a, out)
771-
assert_raises(TypeError, getattr(numpy, func_name), a.asnumpy(), out)
769+
a = xp.arange(10)
770+
assert_raises(TypeError, getattr(xp, func_name), a, out)
772771

773772

774773
def test_trigonometric_hyperbolic_aliases():

0 commit comments

Comments
 (0)