Skip to content

Commit 9dcb9e5

Browse files
committed
finish merge
1 parent ea09206 commit 9dcb9e5

File tree

2 files changed

+18
-37
lines changed

2 files changed

+18
-37
lines changed

src/array_api_extra/_lib/_compat.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/array_api_extra/_lib/_utils/_compat.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,35 @@
33
# `array-api-compat` to override the import location
44

55
try:
6-
from ...._array_api_compat_vendor import ( # pyright: ignore[reportMissingImports]
7-
array_namespace, # pyright: ignore[reportUnknownVariableType]
8-
device, # pyright: ignore[reportUnknownVariableType]
9-
is_cupy_namespace, # pyright: ignore[reportUnknownVariableType]
10-
is_jax_namespace, # pyright: ignore[reportUnknownVariableType]
11-
is_numpy_namespace, # pyright: ignore[reportUnknownVariableType]
12-
is_torch_namespace, # pyright: ignore[reportUnknownVariableType]
6+
from ..._array_api_compat_vendor import ( # pyright: ignore[reportMissingImports]
7+
array_namespace,
8+
device,
9+
is_cupy_namespace,
10+
is_jax_array,
11+
is_jax_namespace,
12+
is_numpy_namespace,
13+
is_torch_namespace,
14+
is_writeable_array,
1315
)
1416
except ImportError:
1517
from array_api_compat import ( # pyright: ignore[reportMissingTypeStubs]
16-
array_namespace, # pyright: ignore[reportUnknownVariableType]
18+
array_namespace,
1719
device,
18-
is_cupy_namespace, # pyright: ignore[reportUnknownVariableType]
19-
is_jax_namespace, # pyright: ignore[reportUnknownVariableType]
20-
is_numpy_namespace, # pyright: ignore[reportUnknownVariableType]
21-
is_torch_namespace, # pyright: ignore[reportUnknownVariableType]
20+
is_cupy_namespace,
21+
is_jax_array,
22+
is_jax_namespace,
23+
is_numpy_namespace,
24+
is_torch_namespace,
25+
is_writeable_array,
2226
)
2327

2428
__all__ = [
2529
"array_namespace",
2630
"device",
2731
"is_cupy_namespace",
32+
"is_jax_array",
2833
"is_jax_namespace",
2934
"is_numpy_namespace",
3035
"is_torch_namespace",
36+
"is_writeable_array",
3137
]

0 commit comments

Comments
 (0)