Skip to content
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

BLD/CI: re-enable ILP64 usage and PyPy job in Azure #24238

Merged
merged 3 commits into from Jul 24, 2023
Merged

BLD/CI: re-enable ILP64 usage and PyPy job in Azure #24238

merged 3 commits into from Jul 24, 2023

Conversation

rgommers
Copy link
Member

Also improve the show_config output (fixes one of the issues discussed in gh-24200), and improve handling of BLAS related logic in numpy/meson.build.

The OPENBLAS64_ environment variable is only used in numpy.distutils.system_info, so remove it from the places where we no longer use numpy.distutils.

@rgommers
BLD/CI: re-enable ILP64 usage and PyPy job in Azure
d550fb4 
Also improve the `show_config` output (fixes one of the issues
discussed in numpygh-24200), and improve handling of BLAS related logic
in `numpy/meson.build`.

The `OPENBLAS64_` environment variable is only used in
`numpy.distutils.system_info`, so remove it from the places where we
no longer use `numpy.distutils`.
@rgommers rgommers added component: build component: CI 36 - Build Build related PR Meson Items related to the introduction of Meson as the new build system for NumPy labels Jul 23, 2023
@rgommers rgommers marked this pull request as draft July 23, 2023 12:03
@rgommers rgommers mentioned this pull request Jul 23, 2023
Closed
@rgommers
Copy link
Member Author

rgommers commented Jul 23, 2023 •
edited

Not a bad start, the only failure is the re-enabled PyPy job, with:

Installing collected packages: threadpoolctl
Successfully installed threadpoolctl-3.2.0
Traceback (most recent call last):
  File "D:\a\1\s\tools\openblas_support.py", line 348, in <module>
    test_version(args.check_version)
  File "D:\a\1\s\tools\openblas_support.py", line 326, in test_version
    raise ValueError(f"expected single threadpool_info result, got {data}")
ValueError: expected single threadpool_info result, got []

EDIT: the numpy build seems to be fine, result is numpy-2.0.0.dev0-pp39-pypy39_pp73-win_amd64.whl

@rgommers rgommers force-pushed the pypy-ilp64-meson branch 2 times, most recently from 4aa5c85 to 9654944 Compare July 23, 2023 21:16
@rgommers
TST: fix running the test suite in builds without BLAS/LAPACK
b59da2d 
This was broken with `undefined symbol: dlapy3_` because the test
suite imports `linalg.lapack_lite` directly. See numpygh-24200 for more
details.
@rgommers
CI: bypass check for openblas version on PyPy
f10e6b7 
`threadpoolctl.threadpool_info()` returns an empty list for some
reason, even though all tests on PyPy pass. This works locally
just fine too with PyPy 7.3.11
@rgommers rgommers marked this pull request as ready for review July 24, 2023 05:03
@rgommers rgommers requested a review from mattip July 24, 2023 05:03
@rgommers
Copy link
Member Author

This should be good to go now.

@charris I think the TST commit and the changes to numpy/meson.build would be useful to backport to 1.25.x; the rest does not apply.

mattip
mattip approved these changes Jul 24, 2023
View reviewed changes
Copy link
Member

@mattip mattip left a comment

Choose a reason for hiding this comment

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

Just one small niggle, overall a nice cleanup. It is fine to merge as-is.

azure-pipelines.yml Show resolved Hide resolved
azure-steps-windows.yml Show resolved Hide resolved
numpy/testing/_private/utils.py Show resolved Hide resolved
pyproject.toml Show resolved Hide resolved
tools/openblas_support.py
@@ -323,6 +323,9 @@ def test_version(expected_version=None):

data = threadpoolctl.threadpool_info()
if len(data) != 1:
if platform.python_implementation() == 'PyPy':
print(f"Check broken in CI on PyPy, data is: {data}")
return
Copy link
Member

Choose a reason for hiding this comment

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

Maybe not worth the effort to explore, but this is strange.

Copy link
Member Author

Choose a reason for hiding this comment

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

It failed in CI, then I did go through the effort of setting up a PyPy dev env locally, but there it worked fine. So I'd like to punt on this at least for now.

@mattip mattip merged commit b1c0fbf into numpy:main Jul 24, 2023
74 checks passed
@mattip
Copy link
Member

mattip commented Jul 24, 2023

Thanks @rgommers

@rgommers rgommers deleted the pypy-ilp64-meson branch July 24, 2023 09:23
@rgommers rgommers added this to the 2.0.0 release milestone Jul 24, 2023
@rgommers rgommers added the 09 - Backport-Candidate PRs tagged should be backported label Jul 24, 2023
@rgommers rgommers mentioned this pull request Jul 24, 2023
Closed
20 tasks
@charris charris modified the milestones: 2.0.0 release, 1.26.0 release Jul 25, 2023
@charris charris mentioned this pull request Aug 4, 2023
Merged
@charris charris removed the 09 - Backport-Candidate PRs tagged should be backported label Aug 4, 2023
@charris charris removed this from the 1.26.0 release milestone Aug 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattip mattip mattip approved these changes

Assignees
No one assigned
Labels
36 - Build Build related PR component: build component: CI Meson Items related to the introduction of Meson as the new build system for NumPy
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@rgommers @mattip @charris