Skip to content

BLD: Update to macos-11 for x86_64 wheels. #22534

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

Closed
charris wants to merge 6 commits into from
Closed

BLD: Update to macos-11 for x86_64 wheels. #22534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
84fd9cd
BLD: Update to macos-11 for x86_64 wheels.
charris Nov 4, 2022
8aa8bb6
WIP: Use gfortran-8.2
charris Nov 6, 2022
a56396f
wip
charris Nov 7, 2022
6f65565
wip
charris Nov 7, 2022
ada0e0e
wip
charris Nov 7, 2022
586aad6
wip
charris Nov 7, 2022
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: 1 addition & 1 deletion .github/workflows/wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
# https://github.com/github/feedback/discussions/7835#discussioncomment-1769026
buildplat:
- [ubuntu-20.04, manylinux_x86_64]
- [macos-10.15, macosx_*]
- [macos-11, macosx_*]
Copy link
Member

@mattip mattip Nov 17, 2022

Choose a reason for hiding this comment

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

This still needs to be done in #22525. Should I add it there?

Copy link
Member Author

@charris charris Nov 17, 2022

Choose a reason for hiding this comment

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

Heh, too late. I'll just make a PR for that.

- [windows-2019, win_amd64]
- [windows-2019, win32]
# TODO: uncomment PyPy 3.9 builds once PyPy
Expand Down
6 changes: 3 additions & 3 deletions tools/openblas_support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
from urllib.request import urlopen, Request
from urllib.error import HTTPError

OPENBLAS_V = '0.3.20'
OPENBLAS_LONG = 'v0.3.20'
OPENBLAS_V = '0.3.21'
OPENBLAS_LONG = 'v0.3.21'
BASE_LOC = 'https://anaconda.org/multibuild-wheels-staging/openblas-libs'
BASEURL = f'{BASE_LOC}/{OPENBLAS_LONG}/download'
SUPPORTED_PLATFORMS = [
Expand Down Expand Up @@ -77,7 +77,7 @@ def download_openblas(target, plat, ilp64):
suffix = f'manylinux{ml_ver}_{arch}.tar.gz'
typ = 'tar.gz'
elif plat == 'macosx-x86_64':
suffix = 'macosx_10_9_x86_64-gf_1becaaa.tar.gz'
suffix = 'macosx_10_11_x86_64-gf_dd3e148.tar.gz'
Copy link
Member

@andyfaff andyfaff Nov 8, 2022

Choose a reason for hiding this comment

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

I think this OpenBLAS change means that you have to set MACOSX_DEPLOYMENT_TARGET=10.11. One needs to be making numpy-1.24.0.dev0-cp39-cp39-macosx_10_11_x86_64.whl instead of numpy-1.24.0.dev0-cp39-cp39-macosx_10_9_x86_64.whl.
Using https://github.com/MacPython/gfortran-install/pull/11/files may still allow macosx_10_9_x86_64-gf_1becaaa.tar.gz to be used, but that would require experimentation.

typ = 'tar.gz'
elif plat == 'macosx-arm64':
suffix = 'macosx_11_0_arm64-gf_f26990f.tar.gz'
Expand Down
14 changes: 10 additions & 4 deletions tools/wheels/cibw_before_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,23 @@ fi
# Install GFortran
if [[ $RUNNER_OS == "macOS" ]]; then
# same version of gfortran as the openblas-libs and numpy-wheel builds
curl -L https://github.com/MacPython/gfortran-install/raw/master/archives/gfortran-4.9.0-Mavericks.dmg -o gfortran.dmg
curl -L https://github.com/fxcoudert/gfortran-for-macOS/releases/download/8.2/gfortran-8.2-Mojave.dmg -o gfortran.dmg
GFORTRAN_SHA256=$(shasum -a 256 gfortran.dmg)
KNOWN_SHA256="d2d5ca5ba8332d63bbe23a07201c4a0a5d7e09ee56f0298a96775f928c3c4b30 gfortran.dmg"
KNOWN_SHA256="81d379231ba5671a5ef1b7832531f53be5a1c651701a61d87e1d877c4f06d369 gfortran.dmg"
#curl -L https://github.com/MacPython/gfortran-install/raw/master/archives/gfortran-4.9.0-Mavericks.dmg -o gfortran.dmg
#GFORTRAN_SHA256=$(shasum -a 256 gfortran.dmg)
#KNOWN_SHA256="d2d5ca5ba8332d63bbe23a07201c4a0a5d7e09ee56f0298a96775f928c3c4b30 gfortran.dmg"
if [ "$GFORTRAN_SHA256" != "$KNOWN_SHA256" ]; then
echo sha256 mismatch
exit 1
fi

hdiutil attach -mountpoint /Volumes/gfortran gfortran.dmg
sudo installer -pkg /Volumes/gfortran/gfortran.pkg -target /
otool -L /usr/local/gfortran/lib/libgfortran.3.dylib
ls /Volumes/gfortran/
sudo installer -pkg /Volumes/gfortran/gfortran-8.2-Mojave/gfortran.pkg -target /
otool -L /usr/local/gfortran/lib/libgfortran.5.dylib
#sudo installer -pkg /Volumes/gfortran/gfortran.pkg -target /
#otool -L /usr/local/gfortran/lib/libgfortran.3.dylib

# arm64 stuff from gfortran_utils
if [[ $PLATFORM == "macosx-arm64" ]]; then
Expand Down