8000 BUG: Don't import helpers in namespaces by crusaderky · Pull Request #302 · data-apis/array-api-compat · GitHub
[go: up one dir, main page]
Skip to content

BUG: Don't import helpers in namespaces #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2025
Merged

BUG: Don't import helpers in namespaces #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions array_api_compat/common/_linalg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,5 @@ def trace(
'svd', 'cholesky', 'matrix_rank', 'pinv', 'matrix_norm',
'matrix_transpose', 'svdvals', 'vecdot', 'vector_norm', 'diagonal',
'trace']

_all_ignore = ['math', 'normalize_axis_tuple', 'get_xp', 'np', 'isdtype']
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No idea why test_all wasn't failing before.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, test_all is a bit brittle. At a guess, its iterating over sys.modules is meant to be robust against renames/new private submodules in array_api_compat/*. But then it's not easy to know if something was or was not imported.

3 changes: 0 additions & 3 deletions array_api_compat/cupy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@

# See the comment in the numpy __init__.py
__import__(__package__ + '.linalg')

__import__(__package__ + '.fft')

from ..common._helpers import * # noqa: F401,F403

__array_api_version__ = '2024.12'
1 change: 1 addition & 0 deletions array_api_compat/dask/array/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@

__array_api_version__ = '2024.12'

# See the comment in the numpy __init__.py
__import__(__package__ + '.linalg')
__import__(__package__ + '.fft')
9 changes: 0 additions & 9 deletions array_api_compat/numpy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,8 @@
# It doesn't overwrite np.linalg from above. The import is generated
# dynamically so that the library can be vendored.
__import__(__package__ + '.linalg')

__import__(__package__ + '.fft')

from .linalg import matrix_transpose, vecdot # noqa: F401

from ..common._helpers import * # noqa: F403

try:
# Used in asarray(). Not present in older versions.
from numpy import _CopyMode # noqa: F401
except ImportError:
pass

__array_api_version__ = '2024.12'
2 changes: 1 addition & 1 deletion array_api_compat/numpy/_aliases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def asarray(
*,
dtype: Optional[DType] = None,
device: Optional[Device] = None,
copy: "Optional[Union[bool, np._CopyMode]]" = None,
copy: Optional[Union[bool, np._CopyMode]] = None,
**kwargs,
) -> Array:
"""
Expand Down
6 changes: 2 additions & 4 deletions array_api_compat/torch/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,14 @@
or 'cpu' in n
or 'backward' in n):
continue
exec(n + ' = torch.' + n)
exec(f"{n} = torch.{n}")
del n

# These imports may overwrite names from the import * above.
from ._aliases import * # noqa: F403

# See the comment in the numpy __init__.py
__import__(__package__ + '.linalg')

__import__(__package__ + '.fft')

from ..common._helpers import * # noqa: F403

__array_api_version__ = '2024.12'
2 changes: 1 addition & 1 deletion tests/test_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ def test_asarray_copy(library):
is_lib_func = globals()[is_array_functions[library]]
all = xp.all if library != 'dask.array' else lambda x: xp.all(x).compute()

if library == 'numpy' and xp.__version__[0] < '2' and not hasattr(xp, '_CopyMode') :
if library == 'numpy' and xp.__version__[0] < '2' and not hasattr(np, "_CopyMode"):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI this is for numpy 1.21

supports_copy_false_other_ns = False
supports_copy_false_same_ns = False
elif library == 'cupy':
Expand Down
Loading
0