Skip to content

BLD: try to build most macOS wheels on GHA #25945

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.

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 2 commits into from
Mar 6, 2024
Merged

BLD: try to build most macOS wheels on GHA #25945

merged 2 commits into from
Mar 6, 2024

Conversation

andyfaff
Copy link
Member

@andyfaff andyfaff commented Mar 6, 2024

With this PR:

  • macosx_x86_64 using OpenBLAS is built on GHA (for use on macos < 14)
  • macosx_x86_64 using Accelerate is built on GHA (for use on macOS >=14)
  • macosx_arm64 using Accelerate is built on GHA (for use on macOS >=14). This is transferred from CirrusCI
  • macosx_arm64 using OpenBLAS is still built on CirrusCI

@rgommers @mattip

@github-actions github-actions bot added the 36 - Build Build related PR label Mar 6, 2024
# Note that this step is *after* specific pythons have been used to
# build and test the wheel
auto-update-conda: true
python-version: "3.10"
# for installation of anaconda-client, for upload to anaconda.org
Copy link
Member Author

Choose a reason for hiding this comment

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

changes here are incorporated from @rgommers work. The conda-incubator doesn't seem to work on some images.

@@ -81,18 +83,10 @@ macosx_arm64_task:

ver=$(sw_vers -productVersion)
macos_target=$(python -c "print('14.0') if '$ver' >= '14.0' else print('11.0')")
if [ $macos_target == '14.0' ]; then
Copy link
Member Author

Choose a reason for hiding this comment

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

this is moved to GHA

# Not clear why the DYLD_LIBRARY_PATH is not passed through from the environment
repair-wheel-command = [
"export DYLD_LIBRARY_PATH=$PWD/.openblas/lib",
"echo DYLD_LIBRARY_PATH $DYLD_LIBRARY_PATH",
"delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}",
]

[tool.cibuildwheel.macos.environment]
Copy link
Member Author

Choose a reason for hiding this comment

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

these variables are specified in the individual CI configurations. Can restore if necessary.

Copy link
Member

Choose a reason for hiding this comment

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

That looks fine to me in principle; better to have them defined where they are used. The one oddity is that RUNNER_OS is now defined in this file for Linux and not for Windows/macOS - but that was already looking a bit odd, so if it works like this, no problem.

@andyfaff
Copy link
Member Author

andyfaff commented Mar 6, 2024

I'm not sure if the failing test is real, or a flake

@rgommers
Copy link
Member

rgommers commented Mar 6, 2024

The one failure is due to gh-25464 so can be ignored here:

FAILED _core/tests/test_multiarray.py::test_sort_int[h-N508]

@rgommers
Copy link
Member

rgommers commented Mar 6, 2024

I'll take a closer look at the logs, but I'm inclined to merge this straight away if it all looks good.

Copy link
Member

@rgommers rgommers left a comment

Choose a reason for hiding this comment

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

This looks great to me. Just one small comment - I'll go ahead and merge this now, to surface any potential issues (like the one I mention below), and will deal with the non-blocking comment in a follow-up. Thanks Andrew!

One other important benefit of merging this PR now is that we'll get more clarity about whether gh-25464 was specific to Cirrus CI or not. If it doesn't reproduce on GitHub Actions, then it somehow has to do with the Cirrus virtualization (or at least it makes it much more likely that the underlying bug gets turned into a crash).

path: ./wheelhouse/*.whl

- uses: conda-incubator/setup-miniconda@030178870c779d9e5e1b4e563269f3aa69b04081 # v3.0.3
- uses: mamba-org/setup-micromamba@v1
Copy link
Member

Choose a reason for hiding this comment

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

This change in my branch was not 100% finished; we have to add back the hash for security reasons. The v1 is a moving tag, which we don't want.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants