Skip to content

Commit 15664be

Browse files
committed
use () instead of tuple() in tests
1 parent f2b5e9e commit 15664be

1 file changed

Lines changed: 21 additions & 21 deletions

File tree

dpnp/tests/tensor/test_usm_ndarray_ctor.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ def test_pyx_capi_make_from_memory():
384384
c_tuple = (ctypes.c_ssize_t * 2)(n0, n1)
385385
mem = dpm.MemoryUSMShared(n0 * n1 * 4, queue=q)
386386
typenum = dpt.dtype("single").num
387-
any_usm_ndarray = dpt.empty(tuple(), dtype="i4", sycl_queue=q)
387+
any_usm_ndarray = dpt.empty((), dtype="i4", sycl_queue=q)
388388
make_from_memory_fn = _pyx_capi_fnptr_to_callable(
389389
any_usm_ndarray,
390390
"UsmNDArray_MakeSimpleFromMemory",
@@ -455,7 +455,7 @@ def test_pyx_capi_set_writable_flag():
455455

456456
def test_pyx_capi_make_from_ptr():
457457
q = get_queue_or_skip()
458-
usm_ndarray = dpt.empty(tuple(), dtype="i4", sycl_queue=q)
458+
usm_ndarray = dpt.empty((), dtype="i4", sycl_queue=q)
459459
make_from_ptr = _pyx_capi_fnptr_to_callable(
460460
usm_ndarray,
461461
"UsmNDArray_MakeSimpleFromPtr",
@@ -491,7 +491,7 @@ def test_pyx_capi_make_from_ptr():
491491

492492
def test_pyx_capi_make_general():
493493
q = get_queue_or_skip()
494-
usm_ndarray = dpt.empty(tuple(), dtype="i4", sycl_queue=q)
494+
usm_ndarray = dpt.empty((), dtype="i4", sycl_queue=q)
495495
make_from_ptr = _pyx_capi_fnptr_to_callable(
496496
usm_ndarray,
497497
"UsmNDArray_MakeFromPtr",
@@ -561,7 +561,7 @@ def test_pyx_capi_make_general():
561561
mat,
562562
)
563563
assert isinstance(sc, dpt.usm_ndarray)
564-
assert sc.shape == tuple()
564+
assert sc.shape == ()
565565
assert sc.dtype == mat.dtype
566566
assert sc.sycl_queue == q
567567
assert sc._pointer == mat._pointer
@@ -593,7 +593,7 @@ def test_pyx_capi_make_general():
593593

594594
def test_pyx_capi_make_fns_invalid_typenum():
595595
q = get_queue_or_skip()
596-
usm_ndarray = dpt.empty(tuple(), dtype="i4", sycl_queue=q)
596+
usm_ndarray = dpt.empty((), dtype="i4", sycl_queue=q)
597597

598598
make_simple_from_ptr = _pyx_capi_fnptr_to_callable(
599599
usm_ndarray,
@@ -846,7 +846,7 @@ def test_properties(dt):
846846
V.mT
847847

848848

849-
@pytest.mark.parametrize("shape", [tuple(), (1,), (1, 1), (1, 1, 1)])
849+
@pytest.mark.parametrize("shape", [(), (1,), (1, 1), (1, 1, 1)])
850850
@pytest.mark.parametrize("dtype", ["|b1", "|u2", "|f4", "|i8"])
851851
class TestCopyScalar:
852852
@pytest.mark.parametrize("func", [bool, float, int, complex])
@@ -909,7 +909,7 @@ def test_index_noninteger():
909909
@pytest.mark.parametrize(
910910
"ind",
911911
[
912-
tuple(),
912+
(),
913913
(None,),
914914
(
915915
None,
@@ -1219,7 +1219,7 @@ def test_pyx_capi_check_constants():
12191219

12201220

12211221
@pytest.mark.parametrize(
1222-
"shape", [tuple(), (1,), (5,), (2, 3), (2, 3, 4), (2, 2, 2, 2, 2)]
1222+
"shape", [(), (1,), (5,), (2, 3), (2, 3, 4), (2, 2, 2, 2, 2)]
12231223
)
12241224
@pytest.mark.parametrize(
12251225
"dtype",
@@ -1339,7 +1339,7 @@ def test_setitem_broadcasting_empty_dst_edge_case():
13391339
broadasting rule, hence no exception"""
13401340
get_queue_or_skip()
13411341
dst = dpt.ones(1, dtype="i8")[0:0]
1342-
src = dpt.ones(tuple(), dtype="i8")
1342+
src = dpt.ones((), dtype="i8")
13431343
dst[...] = src
13441344

13451345

@@ -1511,7 +1511,7 @@ def test_len():
15111511
assert len(X) == 1
15121512
X = dpt.usm_ndarray((2, 1), "i4")
15131513
assert len(X) == 2
1514-
X = dpt.usm_ndarray(tuple(), "i4")
1514+
X = dpt.usm_ndarray((), "i4")
15151515
with pytest.raises(TypeError):
15161516
len(X)
15171517

@@ -1901,19 +1901,19 @@ def test_full_cmplx128():
19011901
dtype = "c16"
19021902
skip_if_dtype_not_supported(dtype, q)
19031903
fill_v = 1 + 1j
1904-
X = dpt.full(tuple(), fill_value=fill_v, dtype=dtype, sycl_queue=q)
1904+
X = dpt.full((), fill_value=fill_v, dtype=dtype, sycl_queue=q)
19051905
assert np.array_equal(
1906-
dpt.asnumpy(X), np.full(tuple(), fill_value=fill_v, dtype=dtype)
1906+
dpt.asnumpy(X), np.full((), fill_value=fill_v, dtype=dtype)
19071907
)
19081908
fill_v = 0 + 1j
1909-
X = dpt.full(tuple(), fill_value=fill_v, dtype=dtype, sycl_queue=q)
1909+
X = dpt.full((), fill_value=fill_v, dtype=dtype, sycl_queue=q)
19101910
assert np.array_equal(
1911-
dpt.asnumpy(X), np.full(tuple(), fill_value=fill_v, dtype=dtype)
1911+
dpt.asnumpy(X), np.full((), fill_value=fill_v, dtype=dtype)
19121912
)
19131913
fill_v = 0 + 0j
1914-
X = dpt.full(tuple(), fill_value=fill_v, dtype=dtype, sycl_queue=q)
1914+
X = dpt.full((), fill_value=fill_v, dtype=dtype, sycl_queue=q)
19151915
assert np.array_equal(
1916-
dpt.asnumpy(X), np.full(tuple(), fill_value=fill_v, dtype=dtype)
1916+
dpt.asnumpy(X), np.full((), fill_value=fill_v, dtype=dtype)
19171917
)
19181918

19191919

@@ -2188,7 +2188,7 @@ def test_empty_like(dt, usm_kind):
21882188
assert X.usm_type == Y.usm_type
21892189
assert X.sycl_queue == Y.sycl_queue
21902190

2191-
X = dpt.empty(tuple(), dtype=dt, usm_type=usm_kind, sycl_queue=q)
2191+
X = dpt.empty((), dtype=dt, usm_type=usm_kind, sycl_queue=q)
21922192
Y = dpt.empty_like(X)
21932193
assert X.shape == Y.shape
21942194
assert X.dtype == Y.dtype
@@ -2228,7 +2228,7 @@ def test_zeros_like(dt, usm_kind):
22282228
assert X.sycl_queue == Y.sycl_queue
22292229
assert np.allclose(dpt.asnumpy(Y), np.zeros(X.shape, dtype=X.dtype))
22302230

2231-
X = dpt.empty(tuple(), dtype=dt, usm_type=usm_kind, sycl_queue=q)
2231+
X = dpt.empty((), dtype=dt, usm_type=usm_kind, sycl_queue=q)
22322232
Y = dpt.zeros_like(X)
22332233
assert X.shape == Y.shape
22342234
assert X.dtype == Y.dtype
@@ -2261,7 +2261,7 @@ def test_ones_like(dt, usm_kind):
22612261
assert X.sycl_queue == Y.sycl_queue
22622262
assert np.allclose(dpt.asnumpy(Y), np.ones(X.shape, dtype=X.dtype))
22632263

2264-
X = dpt.empty(tuple(), dtype=dt, usm_type=usm_kind, sycl_queue=q)
2264+
X = dpt.empty((), dtype=dt, usm_type=usm_kind, sycl_queue=q)
22652265
Y = dpt.ones_like(X)
22662266
assert X.shape == Y.shape
22672267
assert X.dtype == Y.dtype
@@ -2295,7 +2295,7 @@ def test_full_like(dt, usm_kind):
22952295
assert X.sycl_queue == Y.sycl_queue
22962296
assert np.allclose(dpt.asnumpy(Y), np.ones(X.shape, dtype=X.dtype))
22972297

2298-
X = dpt.empty(tuple(), dtype=dt, usm_type=usm_kind, sycl_queue=q)
2298+
X = dpt.empty((), dtype=dt, usm_type=usm_kind, sycl_queue=q)
22992299
Y = dpt.full_like(X, fill_v)
23002300
assert X.shape == Y.shape
23012301
assert X.dtype == Y.dtype
@@ -2551,7 +2551,7 @@ def test_common_arg_validation():
25512551

25522552
def test_flags():
25532553
try:
2554-
x = dpt.empty(tuple(), dtype="i4")
2554+
x = dpt.empty((), dtype="i4")
25552555
except dpctl.SyclDeviceCreationError:
25562556
pytest.skip("No SYCL devices available")
25572557
f = x.flags

0 commit comments

Comments
 (0)