Skip to content

MAINT: _lib: co-vendor array-api-extra and array-api-compat #22062

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

Jump to bottom
Merged
merged 9 commits into from
Dec 12, 2024
Merged

MAINT: _lib: co-vendor array-api-extra and array-api-compat #22062

merged 9 commits into from
Dec 12, 2024

Conversation

crusaderky
Copy link
Contributor

@crusaderky crusaderky commented Dec 12, 2024 •
edited
Loading

array-api-extra has introduced a dependency to array-api-compat (data-apis/array-api-extra#47).

@github-actions github-actions bot added scipy._lib CI Items related to the CI tools such as CircleCI, GitHub Actions or Azure Meson Items related to the introduction of Meson as the new build system for SciPy labels Dec 12, 2024
@crusaderky crusaderky marked this pull request as draft December 12, 2024 12:30
@crusaderky crusaderky force-pushed the array_api_extra_compat branch from c79f6d2 to 0846c22 Compare December 12, 2024 12:33
@crusaderky crusaderky changed the title DNM array_api_extra depends on array_api_compat DNM array-api-extra depends on array-api-compat Dec 12, 2024
@crusaderky crusaderky force-pushed the array_api_extra_compat branch from 0846c22 to aa8468a Compare December 12, 2024 12:36
@lucascolley
Copy link
Member

perhaps the hook file needs to be added as a Python source in _lib/meson.build?

@crusaderky crusaderky force-pushed the array_api_extra_compat branch 3 times, most recently from ead88f9 to f31e0d8 Compare December 12, 2024 14:33
@lucascolley lucascolley marked this pull request as ready for review December 12, 2024 14:34
@crusaderky crusaderky force-pushed the array_api_extra_compat branch from f31e0d8 to 5f18499 Compare December 12, 2024 14:35
lucascolley
lucascolley approved these changes Dec 12, 2024
View reviewed changes
Copy link
Member

@lucascolley lucascolley left a comment

Choose a reason for hiding this comment

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

LGTM if CI is happy!

@lucascolley lucascolley changed the title DNM array-api-extra depends on array-api-compat [DNM] MAINT: _lib: co-vendor array-api-extra and array-api-compat Dec 12, 2024
@lucascolley lucascolley added maintenance Items related to regular maintenance tasks array types Items related to array API support and input array validation (see gh-18286) and removed Meson Items related to the introduction of Meson as the new build system for SciPy CI Items related to the CI tools such as CircleCI, GitHub Actions or Azure labels Dec 12, 2024
@lucascolley lucascolley added this to the 1.16.0 milestone Dec 12, 2024
@lucascolley
Copy link
Member

lucascolley commented Dec 12, 2024 •
edited
Loading

feel free to just silence any mypy warnings. The other failures are due to a bug in xpx for np<2, I'll fix it up

@crusaderky
Copy link
Contributor Author

FAILED scipy/differentiate/tests/test_differentiate.py::TestHessian::test_example[shape0-numpy] - AttributeError: 'numpy.ndarray' object has no attribute 'device'

I'm baffled by this. How can it be green in main (numpy 1+array-api-compat 1.9.1)?!?

@lucascolley
Copy link
Member

I'm baffled by this. How can it be green in main (numpy 1+array-api-compat 1.9.1)?!?

I was also baffled 😅 unfortunately there isn't any magic going on - this diff is part of your bump in array-api-extra

-    diag = xp.zeros(n**2, dtype=x.dtype)
+    diag = xp.zeros(n**2, dtype=x.dtype, device=x.device)

Fix at https://github.com/data-apis/array-api-extra/pull/63/files

@lucascolley lucascolley removed the request for review from rgommers December 12, 2024 16:05
@lucascolley lucascolley changed the title [DNM] MAINT: _lib: co-vendor array-api-extra and array-api-compat MAINT: _lib: co-vendor array-api-extra and array-api-compat Dec 12, 2024
@lucascolley
Copy link
Member

DNM: the two submodules need to be repointed to the next tagged releases of array-api-compat and array-api-extra

I think this isn't so important - we can merge and then bump again when the releases are out

@lucascolley
Copy link
Member

smoke-docs failure looks real

@lucascolley
Copy link
Member

if you want to submit that __init__ patch I can cut a release

@crusaderky crusaderky mentioned this pull request Dec 12, 2024
Merged
@lucascolley
Copy link
Member

let's put this in to unblock gh-21783 - we can bump array-api-compat again when it cuts a release.

Thanks @crusaderky !

@lucascolley lucascolley merged commit a56b885 into scipy:main Dec 12, 2024
36 of 37 checks passed
@crusaderky crusaderky deleted the array_api_extra_compat branch December 12, 2024 22:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lucascolley lucascolley lucascolley approved these changes

Assignees
No one assigned
Labels
array types Items related to array API support and input array validation (see gh-18286) maintenance Items related to regular maintenance tasks scipy._lib
Projects
None yet
Milestone
1.16.0
Development

Successfully merging this pull request may close these issues.
2 participants
@crusaderky @lucascolley