Skip to content

Commit 6b5ca27

Browse files
committed
Consider a change of default integer type on Windows since numpy 2.0 in test_default_dtypes
1 parent beebaf0 commit 6b5ca27

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

dpnp/tests/test_array_api_info.py

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
from dpctl.tensor._tensor_impl import default_device_complex_type
55

66
import dpnp
7+
from dpnp.tests.helper import (
8+
has_support_aspect64,
9+
is_win_platform,
10+
numpy_version,
11+
)
712

813
info = dpnp.__array_namespace_info__()
914
default_device = select_default_device()
@@ -33,8 +38,12 @@ def test_default_dtypes():
3338
== default_device_complex_type(default_device)
3439
== dpnp.asarray(0.0j).dtype
3540
)
36-
assert dtypes["integral"] == dpnp.intp == dpnp.asarray(0).dtype
37-
assert dtypes["indexing"] == dpnp.intp == dpnp.argmax(dpnp.zeros(10)).dtype
41+
if not is_win_platform() or numpy_version() >= "2.0.0":
42+
# numpy changed default integer on Windows since 2.0
43+
assert dtypes["integral"] == dpnp.intp == dpnp.asarray(0).dtype
44+
assert (
45+
dtypes["indexing"] == dpnp.intp == dpnp.argmax(dpnp.zeros(10)).dtype
46+
)
3847

3948
with pytest.raises(TypeError, match="Expected type"):
4049
info.default_dtypes(device="gpu")
@@ -55,12 +64,12 @@ def test_dtypes_all():
5564
"uint64": numpy.uint64, # TODO: replace with dpnp.uint64
5665
"float32": dpnp.float32,
5766
}
58-
| ({"float64": dpnp.float64} if default_device.has_aspect_fp64 else {})
67+
| ({"float64": dpnp.float64} if has_support_aspect64() else {})
5968
| {"complex64": dpnp.complex64}
6069
|
6170
# TODO: update once dpctl-1977 is resolved
6271
{"complex128": dpnp.complex128}
63-
# ({"complex128": dpnp.complex128} if default_device.has_aspect_fp64 else {})
72+
# ({"complex128": dpnp.complex128} if has_support_aspect64() else {})
6473
)
6574

6675

@@ -80,11 +89,11 @@ def test_dtypes_all():
8089
},
8190
"integral": ("signed integer", "unsigned integer"),
8291
"real floating": {"float32": dpnp.float32}
83-
| ({"float64": dpnp.float64} if default_device.has_aspect_fp64 else {}),
92+
| ({"float64": dpnp.float64} if has_support_aspect64() else {}),
8493
"complex floating": {"complex64": dpnp.complex64} |
8594
# TODO: update once dpctl-1977 is resolved
8695
{"complex128": dpnp.complex128},
87-
# ({"complex128": dpnp.complex128} if default_device.has_aspect_fp64 else {}),
96+
# ({"complex128": dpnp.complex128} if has_support_aspect64() else {}),
8897
"numeric": ("integral", "real floating", "complex floating"),
8998
}
9099

0 commit comments

Comments
 (0)