Skip to content

Commit b554329

Browse files
jorenhamjorenham
authored
✅ fix failing type-tests on numpy==2.2.* (#787)
2 parents 5fb8aa4 + 0090133 commit b554329

File tree

4 files changed

+68
-66
lines changed

4 files changed

+68
-66
lines changed

‎tests/constants/test_constants.pyi

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
from typing import assert_type
22

33
import numpy as np
4-
import numpy.typing as npt
4+
import optype.numpy as onp
55

66
from scipy import constants
77

88
assert_type(constants.convert_temperature(1, "Celsius", "Kelvin"), np.float64)
9-
assert_type(constants.convert_temperature([1], "Celsius", "Kelvin"), npt.NDArray[np.float64])
10-
assert_type(constants.convert_temperature(np.array([1], dtype=np.uint64), "Celsius", "Kelvin"), npt.NDArray[np.float64])
11-
assert_type(constants.convert_temperature(np.array([1], dtype=np.float32), "Celsius", "Kelvin"), npt.NDArray[np.float32])
12-
assert_type(constants.convert_temperature(np.array([1], dtype=np.float64), "Celsius", "Kelvin"), npt.NDArray[np.float64])
13-
assert_type(constants.convert_temperature(np.array([1], dtype=np.complex64), "Celsius", "Kelvin"), npt.NDArray[np.complex64])
9+
assert_type(constants.convert_temperature([1], "Celsius", "Kelvin"), onp.ArrayND[np.float64])
10+
assert_type(constants.convert_temperature(np.array([1], dtype=np.uint64), "Celsius", "Kelvin"), onp.ArrayND[np.float64])
11+
assert_type(constants.convert_temperature(np.array([1], dtype=np.float32), "Celsius", "Kelvin"), onp.ArrayND[np.float32])
12+
assert_type(constants.convert_temperature(np.array([1], dtype=np.float64), "Celsius", "Kelvin"), onp.ArrayND[np.float64])
13+
assert_type(constants.convert_temperature(np.array([1], dtype=np.complex64), "Celsius", "Kelvin"), onp.ArrayND[np.complex64])
1414

1515
assert_type(constants.lambda2nu(1), np.float64)
16-
assert_type(constants.lambda2nu([1]), npt.NDArray[np.float64])
17-
assert_type(constants.lambda2nu(np.array([1], dtype=np.uint64)), npt.NDArray[np.float64])
18-
assert_type(constants.lambda2nu(np.array([1], dtype=np.float32)), npt.NDArray[np.float32])
19-
assert_type(constants.lambda2nu(np.array([1], dtype=np.float64)), npt.NDArray[np.float64])
20-
assert_type(constants.lambda2nu(np.array([1], dtype=np.complex64)), npt.NDArray[np.complex64])
16+
assert_type(constants.lambda2nu([1]), onp.ArrayND[np.float64])
17+
assert_type(constants.lambda2nu(np.array([1], dtype=np.uint64)), onp.ArrayND[np.float64])
18+
assert_type(constants.lambda2nu(np.array([1], dtype=np.float32)), onp.ArrayND[np.float32])
19+
assert_type(constants.lambda2nu(np.array([1], dtype=np.float64)), onp.ArrayND[np.float64])
20+
assert_type(constants.lambda2nu(np.array([1], dtype=np.complex64)), onp.ArrayND[np.complex64])
2121

2222
assert_type(constants.nu2lambda(1), np.float64)
23-
assert_type(constants.nu2lambda([1]), npt.NDArray[np.float64])
24-
assert_type(constants.nu2lambda(np.array([1], dtype=np.uint64)), npt.NDArray[np.float64])
25-
assert_type(constants.nu2lambda(np.array([1], dtype=np.float32)), npt.NDArray[np.float32])
26-
assert_type(constants.nu2lambda(np.array([1], dtype=np.float64)), npt.NDArray[np.float64])
27-
assert_type(constants.nu2lambda(np.array([1], dtype=np.complex64)), npt.NDArray[np.complex64])
23+
assert_type(constants.nu2lambda([1]), onp.ArrayND[np.float64])
24+
assert_type(constants.nu2lambda(np.array([1], dtype=np.uint64)), onp.ArrayND[np.float64])
25+
assert_type(constants.nu2lambda(np.array([1], dtype=np.float32)), onp.ArrayND[np.float32])
26+
assert_type(constants.nu2lambda(np.array([1], dtype=np.float64)), onp.ArrayND[np.float64])
27+
assert_type(constants.nu2lambda(np.array([1], dtype=np.complex64)), onp.ArrayND[np.complex64])
2828

2929
###
3030

‎tests/linalg/test__decomp_svd.pyi

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ from typing import TypeAlias, assert_type
22

33
import numpy as np
44
import numpy.typing as npt
5+
import optype.numpy as onp
56

67
from scipy.linalg import svd
78

8-
ArrayF32: TypeAlias = npt.NDArray[np.float32]
9-
ArrayF64: TypeAlias = npt.NDArray[np.float64]
10-
ArrayC64: TypeAlias = npt.NDArray[np.complex64]
11-
ArrayC128: TypeAlias = npt.NDArray[np.complex128]
9+
ArrayF32: TypeAlias = onp.ArrayND[np.float32]
10+
ArrayF64: TypeAlias = onp.ArrayND[np.float64]
11+
ArrayC64: TypeAlias = onp.ArrayND[np.complex64]
12+
ArrayC128: TypeAlias = onp.ArrayND[np.complex128]
1213

1314
###
1415

‎tests/linalg/test__sketches.pyi

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ from typing import Any, assert_type
22

33
import numpy as np
44
import numpy.typing as npt
5+
import optype.numpy as onp
56

67
from scipy.linalg import clarkson_woodruff_transform
78
from scipy.sparse import csc_matrix, sparray, spmatrix
@@ -27,17 +28,17 @@ sparse_c160: spmatrix[np.complex256] | sparray[np.complex256]
2728

2829
###
2930

30-
assert_type(clarkson_woodruff_transform(like_bool_2d, 2), npt.NDArray[np.int_])
31-
assert_type(clarkson_woodruff_transform(like_i64_2d, 2), npt.NDArray[np.int_])
32-
assert_type(clarkson_woodruff_transform(like_f64_2d, 2), npt.NDArray[np.float64])
33-
assert_type(clarkson_woodruff_transform(like_c128_2d, 2), npt.NDArray[np.complex128])
34-
35-
assert_type(clarkson_woodruff_transform(arr_any, 2), npt.NDArray[Any]) # type: ignore[assert-type]
36-
assert_type(clarkson_woodruff_transform(arr_i8, 2), npt.NDArray[np.int_])
37-
assert_type(clarkson_woodruff_transform(arr_f32, 2), npt.NDArray[np.float64])
38-
assert_type(clarkson_woodruff_transform(arr_c64, 2), npt.NDArray[np.complex128])
39-
assert_type(clarkson_woodruff_transform(arr_f80, 2), npt.NDArray[np.longdouble])
40-
assert_type(clarkson_woodruff_transform(arr_c160, 2), npt.NDArray[np.clongdouble])
31+
assert_type(clarkson_woodruff_transform(like_bool_2d, 2), onp.ArrayND[np.int_])
32+
assert_type(clarkson_woodruff_transform(like_i64_2d, 2), onp.ArrayND[np.int_])
33+
assert_type(clarkson_woodruff_transform(like_f64_2d, 2), onp.ArrayND[np.float64])
34+
assert_type(clarkson_woodruff_transform(like_c128_2d, 2), onp.ArrayND[np.complex128])
35+
36+
assert_type(clarkson_woodruff_transform(arr_any, 2), onp.ArrayND[Any]) # type: ignore[assert-type]
37+
assert_type(clarkson_woodruff_transform(arr_i8, 2), onp.ArrayND[np.int_])
38+
assert_type(clarkson_woodruff_transform(arr_f32, 2), onp.ArrayND[np.float64])
39+
assert_type(clarkson_woodruff_transform(arr_c64, 2), onp.ArrayND[np.complex128])
40+
assert_type(clarkson_woodruff_transform(arr_f80, 2), onp.ArrayND[np.longdouble])
41+
assert_type(clarkson_woodruff_transform(arr_c160, 2), onp.ArrayND[np.clongdouble])
4142

4243
assert_type(clarkson_woodruff_transform(sparse_any, 2), csc_matrix[Any])
4344
assert_type(clarkson_woodruff_transform(sparse_i8, 2), csc_matrix[np.int_])

‎tests/special/test_logsumexp.pyi

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from typing import Any, assert_type
22

33
import numpy as np
4-
import numpy.typing as npt
4+
import optype.numpy as onp
55
import optype.numpy.compat as npc
66

77
from scipy.special import logsumexp, softmax
@@ -28,23 +28,23 @@ assert_type(logsumexp(f16_1d), np.float16)
2828
assert_type(logsumexp(c64_0d), np.complex64)
2929
assert_type(logsumexp(c64_1d), np.complex64)
3030

31-
assert_type(logsumexp(py_f_0d, keepdims=True), npt.NDArray[np.float64])
32-
assert_type(logsumexp(py_f_1d, keepdims=True), npt.NDArray[np.float64])
33-
assert_type(logsumexp(py_c_0d, keepdims=True), npt.NDArray[np.complex128])
34-
assert_type(logsumexp(py_c_1d, keepdims=True), npt.NDArray[np.complex128])
35-
assert_type(logsumexp(f16_0d, keepdims=True), npt.NDArray[np.float16])
36-
assert_type(logsumexp(f16_1d, keepdims=True), npt.NDArray[np.float16])
37-
assert_type(logsumexp(c64_0d, keepdims=True), npt.NDArray[np.complex64])
38-
assert_type(logsumexp(c64_1d, keepdims=True), npt.NDArray[np.complex64])
31+
assert_type(logsumexp(py_f_0d, keepdims=True), onp.ArrayND[np.float64])
32+
assert_type(logsumexp(py_f_1d, keepdims=True), onp.ArrayND[np.float64])
33+
assert_type(logsumexp(py_c_0d, keepdims=True), onp.ArrayND[np.complex128])
34+
assert_type(logsumexp(py_c_1d, keepdims=True), onp.ArrayND[np.complex128])
35+
assert_type(logsumexp(f16_0d, keepdims=True), onp.ArrayND[np.float16])
36+
assert_type(logsumexp(f16_1d, keepdims=True), onp.ArrayND[np.float16])
37+
assert_type(logsumexp(c64_0d, keepdims=True), onp.ArrayND[np.complex64])
38+
assert_type(logsumexp(c64_1d, keepdims=True), onp.ArrayND[np.complex64])
3939

40-
assert_type(logsumexp(py_f_0d, axis=0), npt.NDArray[np.float64] | Any)
41-
assert_type(logsumexp(py_f_1d, axis=0), npt.NDArray[np.float64] | Any)
42-
assert_type(logsumexp(py_c_0d, axis=0), npt.NDArray[np.complex128] | Any)
43-
assert_type(logsumexp(py_c_1d, axis=0), npt.NDArray[np.complex128] | Any)
44-
assert_type(logsumexp(f16_0d, axis=0), npt.NDArray[np.float16] | Any)
45-
assert_type(logsumexp(f16_1d, axis=0), npt.NDArray[np.float16] | Any)
46-
assert_type(logsumexp(c64_0d, axis=0), npt.NDArray[np.complex64] | Any)
47-
assert_type(logsumexp(c64_1d, axis=0), npt.NDArray[np.complex64] | Any)
40+
assert_type(logsumexp(py_f_0d, axis=0), onp.ArrayND[np.float64] | Any)
41+
assert_type(logsumexp(py_f_1d, axis=0), onp.ArrayND[np.float64] | Any)
42+
assert_type(logsumexp(py_c_0d, axis=0), onp.ArrayND[np.complex128] | Any)
43+
assert_type(logsumexp(py_c_1d, axis=0), onp.ArrayND[np.complex128] | Any)
44+
assert_type(logsumexp(f16_0d, axis=0), onp.ArrayND[np.float16] | Any)
45+
assert_type(logsumexp(f16_1d, axis=0), onp.ArrayND[np.float16] | Any)
46+
assert_type(logsumexp(c64_0d, axis=0), onp.ArrayND[np.complex64] | Any)
47+
assert_type(logsumexp(c64_1d, axis=0), onp.ArrayND[np.complex64] | Any)
4848

4949
assert_type(logsumexp(py_f_0d, return_sign=True), tuple[np.float64, np.float64])
5050
assert_type(logsumexp(py_f_1d, return_sign=True), tuple[np.float64, np.float64])
@@ -55,23 +55,23 @@ assert_type(logsumexp(f16_1d, return_sign=True), tuple[np.float16, np.float16])
5555
assert_type(logsumexp(c64_0d, return_sign=True), tuple[npc.floating, np.complex64])
5656
assert_type(logsumexp(c64_1d, return_sign=True), tuple[npc.floating, np.complex64])
5757

58-
assert_type(logsumexp(py_f_0d, keepdims=True, return_sign=True), tuple[npt.NDArray[np.float64], npt.NDArray[np.float64]])
59-
assert_type(logsumexp(py_f_1d, keepdims=True, return_sign=True), tuple[npt.NDArray[np.float64], npt.NDArray[np.float64]])
60-
assert_type(logsumexp(py_c_0d, keepdims=True, return_sign=True), tuple[npt.NDArray[np.float64], npt.NDArray[np.complex128]])
61-
assert_type(logsumexp(py_c_1d, keepdims=True, return_sign=True), tuple[npt.NDArray[np.float64], npt.NDArray[np.complex128]])
62-
assert_type(logsumexp(f16_0d, keepdims=True, return_sign=True), tuple[npt.NDArray[np.float16], npt.NDArray[np.float16]])
63-
assert_type(logsumexp(f16_1d, keepdims=True, return_sign=True), tuple[npt.NDArray[np.float16], npt.NDArray[np.float16]])
64-
assert_type(logsumexp(c64_0d, keepdims=True, return_sign=True), tuple[npt.NDArray[npc.floating], npt.NDArray[np.complex64]])
65-
assert_type(logsumexp(c64_1d, keepdims=True, return_sign=True), tuple[npt.NDArray[npc.floating], npt.NDArray[np.complex64]])
58+
assert_type(logsumexp(py_f_0d, keepdims=True, return_sign=True), tuple[onp.ArrayND[np.float64], onp.ArrayND[np.float64]])
59+
assert_type(logsumexp(py_f_1d, keepdims=True, return_sign=True), tuple[onp.ArrayND[np.float64], onp.ArrayND[np.float64]])
60+
assert_type(logsumexp(py_c_0d, keepdims=True, return_sign=True), tuple[onp.ArrayND[np.float64], onp.ArrayND[np.complex128]])
61+
assert_type(logsumexp(py_c_1d, keepdims=True, return_sign=True), tuple[onp.ArrayND[np.float64], onp.ArrayND[np.complex128]])
62+
assert_type(logsumexp(f16_0d, keepdims=True, return_sign=True), tuple[onp.ArrayND[np.float16], onp.ArrayND[np.float16]])
63+
assert_type(logsumexp(f16_1d, keepdims=True, return_sign=True), tuple[onp.ArrayND[np.float16], onp.ArrayND[np.float16]])
64+
assert_type(logsumexp(c64_0d, keepdims=True, return_sign=True), tuple[onp.ArrayND[npc.floating], onp.ArrayND[np.complex64]])
65+
assert_type(logsumexp(c64_1d, keepdims=True, return_sign=True), tuple[onp.ArrayND[npc.floating], onp.ArrayND[np.complex64]])
6666

67-
assert_type(logsumexp(py_f_0d, axis=0, return_sign=True), tuple[npt.NDArray[np.float64] | Any, npt.NDArray[np.float64] | Any])
68-
assert_type(logsumexp(py_f_1d, axis=0, return_sign=True), tuple[npt.NDArray[np.float64] | Any, npt.NDArray[np.float64] | Any])
69-
assert_type(logsumexp(py_c_0d, axis=0, return_sign=True), tuple[npt.NDArray[np.float64] | Any, npt.NDArray[np.complex128] | Any])
70-
assert_type(logsumexp(py_c_1d, axis=0, return_sign=True), tuple[npt.NDArray[np.float64] | Any, npt.NDArray[np.complex128] | Any])
71-
assert_type(logsumexp(f16_0d, axis=0, return_sign=True), tuple[npt.NDArray[np.float16] | Any, npt.NDArray[np.float16] | Any])
72-
assert_type(logsumexp(f16_1d, axis=0, return_sign=True), tuple[npt.NDArray[np.float16] | Any, npt.NDArray[np.float16] | Any])
73-
assert_type(logsumexp(c64_0d, axis=0, return_sign=True), tuple[npt.NDArray[npc.floating] | Any, npt.NDArray[np.complex64] | Any])
74-
assert_type(logsumexp(c64_1d, axis=0, return_sign=True), tuple[npt.NDArray[npc.floating] | Any, npt.NDArray[np.complex64] | Any])
67+
assert_type(logsumexp(py_f_0d, axis=0, return_sign=True), tuple[onp.ArrayND[np.float64] | Any, onp.ArrayND[np.float64] | Any])
68+
assert_type(logsumexp(py_f_1d, axis=0, return_sign=True), tuple[onp.ArrayND[np.float64] | Any, onp.ArrayND[np.float64] | Any])
69+
assert_type(logsumexp(py_c_0d, axis=0, return_sign=True), tuple[onp.ArrayND[np.float64] | Any, onp.ArrayND[np.complex128] | Any])
70+
assert_type(logsumexp(py_c_1d, axis=0, return_sign=True), tuple[onp.ArrayND[np.float64] | Any, onp.ArrayND[np.complex128] | Any])
71+
assert_type(logsumexp(f16_0d, axis=0, return_sign=True), tuple[onp.ArrayND[np.float16] | Any, onp.ArrayND[np.float16] | Any])
72+
assert_type(logsumexp(f16_1d, axis=0, return_sign=True), tuple[onp.ArrayND[np.float16] | Any, onp.ArrayND[np.float16] | Any])
73+
assert_type(logsumexp(c64_0d, axis=0, return_sign=True), tuple[onp.ArrayND[npc.floating] | Any, onp.ArrayND[np.complex64] | Any])
74+
assert_type(logsumexp(c64_1d, axis=0, return_sign=True), tuple[onp.ArrayND[npc.floating] | Any, onp.ArrayND[np.complex64] | Any])
7575

7676
###
7777
# softmax (equiv log_softmax)
@@ -81,7 +81,7 @@ assert_type(softmax(py_c_0d), np.complex128)
8181
assert_type(softmax(f16_0d), np.float16)
8282
assert_type(softmax(c64_0d), np.complex64)
8383

84-
assert_type(softmax(py_f_1d), npt.NDArray[np.float64])
85-
assert_type(softmax(py_c_1d), npt.NDArray[np.complex128])
84+
assert_type(softmax(py_f_1d), onp.ArrayND[np.float64])
85+
assert_type(softmax(py_c_1d), onp.ArrayND[np.complex128])
8686
assert_type(softmax(f16_1d), np.ndarray[tuple[int], np.dtype[np.float16]])
8787
assert_type(softmax(c64_1d), np.ndarray[tuple[int], np.dtype[np.complex64]])

0 commit comments

Comments
 (0)