From e0a628f76ea9fb316a773c650fccba14eae6f0e3 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Sun, 22 Oct 2023 00:52:56 +0200
Subject: [PATCH 01/16] ENH: build wheels with Accelerate on macOS >=14 on
 Cirrus CI

Addresses the arm64 part of gh-24905.
---
 pyproject.toml                    |  3 ++-
 tools/ci/cirrus_wheels.yml        | 21 +++++----------------
 tools/wheels/cibw_before_build.sh | 18 +++++++++++++++++-
 tools/wheels/gfortran_utils.sh    |  5 ++++-
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 03cdfe34aaa8..ae0297067cad 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -143,7 +143,8 @@ tracker = "https://github.com/numpy/numpy/issues"
 skip = "cp36-* cp37-* cp-38* pp37-* *-manylinux_i686 *_ppc64le *_s390x"
 build-verbosity = "3"
 before-build = "bash {project}/tools/wheels/cibw_before_build.sh {project}"
-config-settings = "setup-args=-Duse-ilp64=true setup-args=-Dblas=openblas setup-args=-Dlapack=openblas setup-args=-Dblas-symbol-suffix=64_ setup-args=-Dallow-noblas=false"
+# The build will use openblas64 everywhere, except on arm64 macOS >=14.0 (uses Accelerate)
+config-settings = "setup-args=-Duse-ilp64=true setup-args=-Dallow-noblas=false"
 # meson has a hard dependency on ninja, and we need meson to build
 # c-extensions in tests. There is a ninja PyPI package used in
 # build_requirements.txt for macOS, windows, linux but it cannot be in
diff --git a/tools/ci/cirrus_wheels.yml b/tools/ci/cirrus_wheels.yml
index 2fc7b204cacb..3d180b74ec26 100644
--- a/tools/ci/cirrus_wheels.yml
+++ b/tools/ci/cirrus_wheels.yml
@@ -55,30 +55,19 @@ linux_aarch64_task:
 macosx_arm64_task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   macos_instance:
-    image: ghcr.io/cirruslabs/macos-monterey-xcode:14
+    matrix:
+      - image: ghcr.io/cirruslabs/macos-monterey-xcode:14
+      - image: ghcr.io/cirruslabs/macos-sonoma-xcode:15
   matrix:
     - env:
         CIRRUS_CLONE_SUBMODULES: true
-        CIBW_BUILD: cp39-*
-    - env:
-        CIRRUS_CLONE_SUBMODULES: true
-        CIBW_BUILD: cp310-* cp311-*
+        CIBW_BUILD: cp39-* cp310-*
     - env:
         CIRRUS_CLONE_SUBMODULES: true
-        CIBW_PRERELEASE_PYTHONS: True
-        CIBW_BUILD: cp312-*
+        CIBW_BUILD: cp311-* cp312-*
   env:
     PATH: /opt/homebrew/opt/python@3.10/bin:/usr/local/lib:/usr/local/include:$PATH
     CIBW_ARCHS: arm64
-    # Specifying CIBW_ENVIRONMENT_MACOS overrides pyproject.toml, so include
-    # all the settings from there, otherwise they're lost.
-    # SDKROOT needs to be set for repackaged conda-forge gfortran compilers
-    # supplied by isuruf.
-    # Find out SDKROOT via `xcrun --sdk macosx --show-sdk-path`
-    CIBW_ENVIRONMENT_MACOS: >
-      RUNNER_OS=macOS
-      SDKROOT=/Applications/Xcode-14.0.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk
-      LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 
   build_script:
     - brew install python@3.10
diff --git a/tools/wheels/cibw_before_build.sh b/tools/wheels/cibw_before_build.sh
index 7ce1edc68654..3a9ede9ee1f0 100644
--- a/tools/wheels/cibw_before_build.sh
+++ b/tools/wheels/cibw_before_build.sh
@@ -16,8 +16,20 @@ elif [[ $RUNNER_OS == "Windows" ]]; then
     cat $PROJECT_DIR/tools/wheels/LICENSE_win32.txt >> $PROJECT_DIR/LICENSE.txt
 fi
 
+install_openblas=true
+if [[ $RUNNER_OS == "macOS" ]]; then
+    if [[ $(sw_vers --productVersion) == 14.* ]]; then
+        # This is the wheel build with Accelerate
+        export MACOSX_DEPLOYMENT_TARGET=14.0
+        install_openblas=false
+    else
+        # Done in gfortran_utils.sh
+        echo "deployment target determined from Python interpreter"
+    fi
+fi
+
 # Install Openblas
-if [[ $RUNNER_OS == "Linux" || $RUNNER_OS == "macOS" ]] ; then
+if [[ $RUNNER_OS == "Linux" || $RUNNER_OS == "macOS" && install_openblas ]] ; then
     basedir=$(python tools/openblas_support.py --use-ilp64)
     if [[ $RUNNER_OS == "macOS" && $PLATFORM == "macosx-arm64" ]]; then
         # /usr/local/lib doesn't exist on cirrus-ci runners
@@ -52,6 +64,10 @@ if [[ $RUNNER_OS == "macOS" ]]; then
     if [[ $PLATFORM == "macosx-arm64" ]]; then
         PLAT="arm64"
     fi
+
+    # Needed for OpenBLAS and gfortran
+    export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+
     source $PROJECT_DIR/tools/wheels/gfortran_utils.sh
     install_gfortran
     pip install "delocate==0.10.4"
diff --git a/tools/wheels/gfortran_utils.sh b/tools/wheels/gfortran_utils.sh
index 9102ba1277ac..2b613b82f553 100644
--- a/tools/wheels/gfortran_utils.sh
+++ b/tools/wheels/gfortran_utils.sh
@@ -109,12 +109,15 @@ function get_gf_lib_for_suf {
 }
 
 if [ "$(uname)" == "Darwin" ]; then
+    # Set deployment target to match the one Python was built for, if the env
+    # var wasn't explicitly set already.
     mac_target=${MACOSX_DEPLOYMENT_TARGET:-$(get_macosx_target)}
     export MACOSX_DEPLOYMENT_TARGET=$mac_target
     # Keep this for now as some builds might depend on this being
     # available before install_gfortran is called
     export GFORTRAN_SHA=c469a420d2d003112749dcdcbe3c684eef42127e
-    # Set SDKROOT env variable if not set
+    # SDKROOT needs to be set for repackaged conda-forge gfortran compilers
+    # supplied by isuruf. So set it if it's not already set.
     export SDKROOT=${SDKROOT:-$(xcrun --show-sdk-path)}
 
     function download_and_unpack_gfortran {

From c20b7218eb84d03e2f7ab16bfc326d3cdac33a43 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Thu, 26 Oct 2023 11:24:05 +0200
Subject: [PATCH 02/16] BLD: remove `-fno-strict-aliasing`, `--strip-debug`
 from cibuildwheel config

It's already included in the top-level `meson.build` file, which
is more correct. See gh-25004 for where `-fno-strict-aliasing` came
from.

Also clean up the `-Wl,--strip-debug` flag, it's unused since the
buildtype is release and there is no debug info in the binaries.
---
 pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index ae0297067cad..801c86c5b750 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -157,7 +157,7 @@ test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
 manylinux-x86_64-image = "manylinux2014"
 manylinux-aarch64-image = "manylinux2014"
 musllinux-x86_64-image = "musllinux_1_1"
-environment = {CFLAGS="-fno-strict-aliasing", LDFLAGS="-Wl,--strip-debug", RUNNER_OS="Linux"}
+environment = {RUNNER_OS="Linux"}
 
 [tool.cibuildwheel.macos]
 # For universal2 wheels, we will need to fuse them manually
@@ -168,7 +168,7 @@ environment = {CFLAGS="-fno-strict-aliasing", LDFLAGS="-Wl,--strip-debug", RUNNE
 archs = "x86_64 arm64"
 test-skip = "*_universal2:arm64"
 # MACOS linker doesn't support stripping symbols.
-environment = {CFLAGS="-fno-strict-aliasing", RUNNER_OS="macOS"}
+environment = {RUNNER_OS="macOS"}
 
 [tool.cibuildwheel.windows]
 environment = {PKG_CONFIG_PATH="C:/opt/64/lib/pkgconfig"}

From d02c927988cebcc09bf3ac8163b18c238abc90db Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Thu, 26 Oct 2023 12:04:59 +0200
Subject: [PATCH 03/16] DEV: add `ninja` to `test_requirements.txt` and clean
 up related comment

---
 .github/workflows/emscripten.yml | 2 ++
 .github/workflows/linux.yml      | 1 -
 .github/workflows/wheels.yml     | 1 -
 pyproject.toml                   | 7 +------
 test_requirements.txt            | 1 +
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml
index 7fad1948fb7f..e3ec479a6ec9 100644
--- a/.github/workflows/emscripten.yml
+++ b/.github/workflows/emscripten.yml
@@ -73,6 +73,8 @@ jobs:
           source .venv-pyodide/bin/activate
           pip install dist/*.whl
           python -c "import sys; print(sys.platform)"
+          # TODO: when re-enabled this workflow, install test deps differently
+          # since ninja isn't installable with pyodide
           pip install -r test_requirements.txt
       - name: Test
         run: |
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 7e3f7a52b4da..707526896802 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -202,7 +202,6 @@ jobs:
     - name: Install test dependencies
       run: |
         pip install -r test_requirements.txt
-        pip install ninja
     - name: Run test suite
       run: |
         cd tools
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 63d3e0decd6c..1437ebe63ddd 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -196,7 +196,6 @@ jobs:
           # TODO: Don't run test suite, and instead build wheels from sdist
           # Depends on pypa/cibuildwheel#1020
           python -m pip install dist/*.gz -Csetup-args=-Dallow-noblas=true
-          pip install ninja
           pip install -r test_requirements.txt
           cd .. # Can't import numpy within numpy src directory
           python -c "import numpy, sys; print(numpy.__version__); sys.exit(numpy.test() is False)"
diff --git a/pyproject.toml b/pyproject.toml
index 801c86c5b750..458182002217 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -145,12 +145,7 @@ build-verbosity = "3"
 before-build = "bash {project}/tools/wheels/cibw_before_build.sh {project}"
 # The build will use openblas64 everywhere, except on arm64 macOS >=14.0 (uses Accelerate)
 config-settings = "setup-args=-Duse-ilp64=true setup-args=-Dallow-noblas=false"
-# meson has a hard dependency on ninja, and we need meson to build
-# c-extensions in tests. There is a ninja PyPI package used in
-# build_requirements.txt for macOS, windows, linux but it cannot be in
-# test_requirements.txt since pyodide, which uses test_requirements.txt, does
-# not have it.
-before-test = "pip install ninja && pip install -r {project}/test_requirements.txt"
+before-test = "pip install -r {project}/test_requirements.txt"
 test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
 
 [tool.cibuildwheel.linux]
diff --git a/test_requirements.txt b/test_requirements.txt
index ff1ed284e37d..ecf4bd5c924b 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -7,6 +7,7 @@ pytest==7.4.0
 pytz==2023.3
 pytest-cov==4.1.0
 meson
+ninja
 pytest-xdist
 # for numpy.random.test.test_extending
 cffi; python_version < '3.10'

From d4201a125fb30d8b70c3b36f472eb8994bd7236d Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Thu, 26 Oct 2023 11:31:18 +0200
Subject: [PATCH 04/16] DOC: update comment on `RUNNER_OS` and universal2 in
 pyproject.toml [wheel build]

---
 pyproject.toml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 458182002217..db4a09c7a6a9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -152,14 +152,11 @@ test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
 manylinux-x86_64-image = "manylinux2014"
 manylinux-aarch64-image = "manylinux2014"
 musllinux-x86_64-image = "musllinux_1_1"
+# RUNNER_OS is a GitHub Actions specific env var; define it here so it works on Cirrus CI too
 environment = {RUNNER_OS="Linux"}
 
 [tool.cibuildwheel.macos]
-# For universal2 wheels, we will need to fuse them manually
-# instead of going through cibuildwheel
-# This is because cibuildwheel tries to make a fat wheel
-# https://github.com/multi-build/multibuild/blame/devel/README.rst#L541-L565
-# for more info
+# universal2 wheels are not supported (see gh-21233), use `delocate-fuse` if you need them
 archs = "x86_64 arm64"
 test-skip = "*_universal2:arm64"
 # MACOS linker doesn't support stripping symbols.

From 48dd929fb08df564ce7a01970b5695a794b69f3d Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Wed, 22 Nov 2023 17:58:07 +0100
Subject: [PATCH 05/16] DEBUG: only build macOS arm64 for 1 Python version per
 macOS version [wheel build]

[skip actions] [skip circle] [skip azp]
---
 .cirrus.star               |   2 +-
 tools/ci/cirrus_wheels.yml | 118 +------------------------------------
 2 files changed, 2 insertions(+), 118 deletions(-)

diff --git a/.cirrus.star b/.cirrus.star
index c503f25720a7..e1188b461332 100644
--- a/.cirrus.star
+++ b/.cirrus.star
@@ -51,4 +51,4 @@ def main(ctx):
     if int(pr_number) < 0:
         return []
 
-    return fs.read("tools/ci/cirrus_arm.yml")
+    # DISABLED: return fs.read("tools/ci/cirrus_arm.yml")
diff --git a/tools/ci/cirrus_wheels.yml b/tools/ci/cirrus_wheels.yml
index 3d180b74ec26..f6e7078ee871 100644
--- a/tools/ci/cirrus_wheels.yml
+++ b/tools/ci/cirrus_wheels.yml
@@ -6,48 +6,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS
   wheels_artifacts:
     path: "wheelhouse/*"
 
-######################################################################
-# Build linux_aarch64 natively
-######################################################################
-
-linux_aarch64_task:
-  use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
-  compute_engine_instance:
-    image_project: cirrus-images
-    image: family/docker-builder-arm64
-    architecture: arm64
-    platform: linux
-    cpu: 1
-    memory: 8G
-  matrix:
-    # build in a matrix because building and testing all four wheels in a
-    # single task takes longer than 60 mins (the default time limit for a
-    # cirrus-ci task).
-    - env:
-        CIRRUS_CLONE_SUBMODULES: true
-        CIBW_BUILD: cp39-*
-        EXPECT_CPU_FEATURES: NEON NEON_FP16 NEON_VFPV4 ASIMD ASIMDHP ASIMDDP ASIMDFHM
-    - env:
-        CIRRUS_CLONE_SUBMODULES: true
-        CIBW_BUILD: cp310-*
-    - env:
-        CIRRUS_CLONE_SUBMODULES: true
-        CIBW_BUILD: cp311-*
-    - env:
-        CIRRUS_CLONE_SUBMODULES: true
-        CIBW_PRERELEASE_PYTHONS: True
-        CIBW_BUILD: cp312-*
-
-  build_script: |
-    apt update
-    apt install -y python3-venv python-is-python3 gfortran libatlas-base-dev libgfortran5 eatmydata
-    git fetch origin
-    bash ./tools/wheels/cibw_before_build.sh ${PWD}
-    which python
-    echo $CIRRUS_CHANGE_MESSAGE
-  <<: *BUILD_AND_STORE_WHEELS
-
-
 ######################################################################
 # Build macosx_arm64 natively
 ######################################################################
@@ -61,10 +19,7 @@ macosx_arm64_task:
   matrix:
     - env:
         CIRRUS_CLONE_SUBMODULES: true
-        CIBW_BUILD: cp39-* cp310-*
-    - env:
-        CIRRUS_CLONE_SUBMODULES: true
-        CIBW_BUILD: cp311-* cp312-*
+        CIBW_BUILD: cp310-*
   env:
     PATH: /opt/homebrew/opt/python@3.10/bin:/usr/local/lib:/usr/local/include:$PATH
     CIBW_ARCHS: arm64
@@ -82,74 +37,3 @@ macosx_arm64_task:
     - clang --version
   <<: *BUILD_AND_STORE_WHEELS
 
-
-######################################################################
-# Upload all wheels
-######################################################################
-
-wheels_upload_task:
-  use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
-  # Artifacts don't seem to be persistent from task to task.
-  # Rather than upload wheels at the end of each cibuildwheel run we do a
-  # final upload here. This is because a run may be on different OS for
-  # which bash, etc, may not be present.
-  depends_on:
-    - linux_aarch64
-    - macosx_arm64
-  compute_engine_instance:
-    image_project: cirrus-images
-    image: family/docker-builder
-    platform: linux
-    cpu: 1
-
-  env:
-    NUMPY_STAGING_UPLOAD_TOKEN: ENCRYPTED[!5a69522ae0c2af9edb2bc1cdfeaca6292fb3666d9ecd82dca0615921834a6ce3b702352835d8bde4ea2a9ed5ef8424ac!]
-    NUMPY_NIGHTLY_UPLOAD_TOKEN: ENCRYPTED[ef04347663cfcb58d121385707e55951dc8e03b009edeed988aa4a33ba8205c54ca9980ac4da88e1adfdebff8b9d7ed4]
-
-  upload_script: |
-    apt-get update
-    apt-get install -y curl wget
-    export IS_SCHEDULE_DISPATCH="false"
-    export IS_PUSH="false"
-
-    # cron job
-    if [[ "$CIRRUS_CRON" == "nightly" ]]; then
-      export IS_SCHEDULE_DISPATCH="true"
-    fi
-
-    # a manual build was started
-    if [[ "$CIRRUS_BUILD_SOURCE" == "api" && "$CIRRUS_COMMIT_MESSAGE" == "API build for null" ]]; then
-      export IS_SCHEDULE_DISPATCH="true"
-    fi
-
-    # only upload wheels to staging if it's a tag beginning with 'v' and you're
-    # on a maintenance branch
-    if [[ "$CIRRUS_TAG" == v* ]] && [[ $CIRRUS_TAG != *"dev0"* ]]; then
-      export IS_PUSH="true"
-    fi
-
-    if [[ $IS_PUSH == "true" ]] || [[ $IS_SCHEDULE_DISPATCH == "true" ]]; then
-        # install miniconda in the home directory. For some reason HOME isn't set by Cirrus
-        export HOME=$PWD
-
-        # install miniconda for uploading to anaconda
-        wget -q https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
-        bash miniconda.sh -b -p $HOME/miniconda3
-        $HOME/miniconda3/bin/conda init bash
-        source $HOME/miniconda3/bin/activate
-        conda install -y anaconda-client
-
-        # The name of the zip file is derived from the `wheels_artifact` line.
-        # If you change the artifact line to `myfile_artifact` then it would be
-        # called myfile.zip
-
-        curl https://api.cirrus-ci.com/v1/artifact/build/$CIRRUS_BUILD_ID/wheels.zip --output wheels.zip
-        unzip wheels.zip
-
-        source ./tools/wheels/upload_wheels.sh
-        # IS_PUSH takes precedence over IS_SCHEDULE_DISPATCH
-        set_upload_vars
-
-        # Will be skipped if not a push/tag/scheduled build
-        upload_wheels
-    fi

From 0d15490500f3ceb87f120bc733b36c4fc9b990aa Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Wed, 22 Nov 2023 18:18:07 +0100
Subject: [PATCH 06/16] BLD: use xcode:latest images on Cirrus [wheel build]

[skip actions] [skip azp] [skip circle]
---
 tools/ci/cirrus_wheels.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/ci/cirrus_wheels.yml b/tools/ci/cirrus_wheels.yml
index f6e7078ee871..95bbd8986d8a 100644
--- a/tools/ci/cirrus_wheels.yml
+++ b/tools/ci/cirrus_wheels.yml
@@ -14,8 +14,8 @@ macosx_arm64_task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   macos_instance:
     matrix:
-      - image: ghcr.io/cirruslabs/macos-monterey-xcode:14
-      - image: ghcr.io/cirruslabs/macos-sonoma-xcode:15
+      - image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
+      - image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
   matrix:
     - env:
         CIRRUS_CLONE_SUBMODULES: true

From 062bc43b90c472bb1146701c797e27fca09605fb Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Wed, 22 Nov 2023 18:32:49 +0100
Subject: [PATCH 07/16] BLD: use python3 executable to fix build on Sonoma

---
 tools/ci/cirrus_wheels.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/ci/cirrus_wheels.yml b/tools/ci/cirrus_wheels.yml
index 95bbd8986d8a..ab0aff4d640c 100644
--- a/tools/ci/cirrus_wheels.yml
+++ b/tools/ci/cirrus_wheels.yml
@@ -1,6 +1,6 @@
 build_and_store_wheels: &BUILD_AND_STORE_WHEELS
   install_cibuildwheel_script:
-    - python -m pip install cibuildwheel
+    - python3 -m pip install cibuildwheel
   cibuildwheel_script:
     - cibuildwheel
   wheels_artifacts:
@@ -27,13 +27,13 @@ macosx_arm64_task:
   build_script:
     - brew install python@3.10
     - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python
-    - which python
+    - which python3
     # needed for submodules
     - git submodule update --init
     # need to obtain all the tags so setup.py can determine FULLVERSION
     - git fetch origin
     - uname -m
-    - python -c "import platform;print(platform.python_version());print(platform.system());print(platform.machine())"
+    - python3 -c "import platform; print(platform.python_version()); print(platform.system()); print(platform.machine())"
     - clang --version
   <<: *BUILD_AND_STORE_WHEELS
 

From 30bf4e5e7f82aee90bcab02f30bab1c51e90c364 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Wed, 22 Nov 2023 18:48:29 +0100
Subject: [PATCH 08/16] DEBUG: run only on Sonoma [wheel build]

[skip actions] [skip azp] [skip circle]
---
 tools/ci/cirrus_wheels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci/cirrus_wheels.yml b/tools/ci/cirrus_wheels.yml
index ab0aff4d640c..910e89e22b17 100644
--- a/tools/ci/cirrus_wheels.yml
+++ b/tools/ci/cirrus_wheels.yml
@@ -14,7 +14,7 @@ macosx_arm64_task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   macos_instance:
     matrix:
-      - image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
+      # - image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
       - image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
   matrix:
     - env:

From 2efbdf98b23a0cdccf0f52505cbdeecfb35b8842 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Wed, 22 Nov 2023 18:51:48 +0100
Subject: [PATCH 09/16] BLD: show meson-log.txt in Cirrus CI wheel builds

---
 pyproject.toml                    | 3 ++-
 tools/ci/cirrus_wheels.yml        | 4 +++-
 tools/wheels/cibw_before_build.sh | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index db4a09c7a6a9..dee74a5d5eee 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -140,11 +140,12 @@ tracker = "https://github.com/numpy/numpy/issues"
 # Note: the below skip command doesn't do much currently, the platforms to
 # build wheels for in CI are controlled in `.github/workflows/wheels.yml` and
 # `tools/ci/cirrus_wheels.yml`.
+build-frontend = "build"
 skip = "cp36-* cp37-* cp-38* pp37-* *-manylinux_i686 *_ppc64le *_s390x"
 build-verbosity = "3"
 before-build = "bash {project}/tools/wheels/cibw_before_build.sh {project}"
 # The build will use openblas64 everywhere, except on arm64 macOS >=14.0 (uses Accelerate)
-config-settings = "setup-args=-Duse-ilp64=true setup-args=-Dallow-noblas=false"
+config-settings = "setup-args=-Duse-ilp64=true setup-args=-Dallow-noblas=false build-dir=build"
 before-test = "pip install -r {project}/test_requirements.txt"
 test-command = "bash {project}/tools/wheels/cibw_test_command.sh {project}"
 
diff --git a/tools/ci/cirrus_wheels.yml b/tools/ci/cirrus_wheels.yml
index 910e89e22b17..9d878c7bae0a 100644
--- a/tools/ci/cirrus_wheels.yml
+++ b/tools/ci/cirrus_wheels.yml
@@ -3,9 +3,12 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS
     - python3 -m pip install cibuildwheel
   cibuildwheel_script:
     - cibuildwheel
+  always:
+    show_meson_log_script: cat build/meson-logs/meson-log.txt
   wheels_artifacts:
     path: "wheelhouse/*"
 
+
 ######################################################################
 # Build macosx_arm64 natively
 ######################################################################
@@ -36,4 +39,3 @@ macosx_arm64_task:
     - python3 -c "import platform; print(platform.python_version()); print(platform.system()); print(platform.machine())"
     - clang --version
   <<: *BUILD_AND_STORE_WHEELS
-
diff --git a/tools/wheels/cibw_before_build.sh b/tools/wheels/cibw_before_build.sh
index 3a9ede9ee1f0..a7a5a8641773 100644
--- a/tools/wheels/cibw_before_build.sh
+++ b/tools/wheels/cibw_before_build.sh
@@ -29,7 +29,7 @@ if [[ $RUNNER_OS == "macOS" ]]; then
 fi
 
 # Install Openblas
-if [[ $RUNNER_OS == "Linux" || $RUNNER_OS == "macOS" && install_openblas ]] ; then
+if [[ $RUNNER_OS == "Linux" || ($RUNNER_OS == "macOS" && $install_openblas) ]] ; then
     basedir=$(python tools/openblas_support.py --use-ilp64)
     if [[ $RUNNER_OS == "macOS" && $PLATFORM == "macosx-arm64" ]]; then
         # /usr/local/lib doesn't exist on cirrus-ci runners

From d0156b86395884d7df8342612c839d4f77287387 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Wed, 22 Nov 2023 23:30:12 +0100
Subject: [PATCH 10/16] BLD: fix macosx deployment target [wheel build]

It needs to be set before cibuildwheel is invoked.

[skip actions] [skip azp] [skip circle]
---
 tools/ci/cirrus_wheels.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/ci/cirrus_wheels.yml b/tools/ci/cirrus_wheels.yml
index 9d878c7bae0a..4356a866f7db 100644
--- a/tools/ci/cirrus_wheels.yml
+++ b/tools/ci/cirrus_wheels.yml
@@ -23,6 +23,11 @@ macosx_arm64_task:
     - env:
         CIRRUS_CLONE_SUBMODULES: true
         CIBW_BUILD: cp310-*
+        # Specifying CIBW_ENVIRONMENT_MACOS overrides pyproject.toml, so include
+        # all the settings from there, otherwise they're lost.
+        CIBW_ENVIRONMENT_MACOS: >
+          RUNNER_OS=macOS
+          MACOSX_DEPLOYMENT_TARGET=14.0
   env:
     PATH: /opt/homebrew/opt/python@3.10/bin:/usr/local/lib:/usr/local/include:$PATH
     CIBW_ARCHS: arm64

From b0b76eeec8c857df1b4d7bf5de1fc76acfa888c4 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Thu, 23 Nov 2023 11:56:27 +0100
Subject: [PATCH 11/16] MAINT: filter deprecation warnings in f2py tests [wheel
 build]

[skip actions] [skip azp] [skip circle]
---
 numpy/f2py/tests/util.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/numpy/f2py/tests/util.py b/numpy/f2py/tests/util.py
index 75b257cdb825..d8c15135fe79 100644
--- a/numpy/f2py/tests/util.py
+++ b/numpy/f2py/tests/util.py
@@ -21,7 +21,8 @@
 
 from pathlib import Path
 from numpy._utils import asunicode
-from numpy.testing import temppath, IS_WASM
+from numpy.exceptions import VisibleDeprecationWarning
+from numpy.testing import temppath, IS_WASM, suppress_warnings
 from importlib import import_module
 
 #
@@ -409,13 +410,16 @@ def setup_method(self):
             )
 
         if self.sources is not None:
-            self.module = build_module(
-                self.sources,
-                options=self.options,
-                skip=self.skip,
-                only=self.only,
-                module_name=self.module_name,
-            )
+            with suppress_warnings() as sup:
+                sup.filter(VisibleDeprecationWarning,
+                           "distutils has been deprecated since")
+                self.module = build_module(
+                    self.sources,
+                    options=self.options,
+                    skip=self.skip,
+                    only=self.only,
+                    module_name=self.module_name,
+                )
 
 
 #

From 8339a5daebb733adadd6ba4d4723972c6569867f Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Thu, 23 Nov 2023 12:38:25 +0100
Subject: [PATCH 12/16] BLD: add back SDKROOT env var [wheel build]

[skip actions] [skip azp] [skip circle]
---
 tools/ci/cirrus_wheels.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/ci/cirrus_wheels.yml b/tools/ci/cirrus_wheels.yml
index 4356a866f7db..536c14808111 100644
--- a/tools/ci/cirrus_wheels.yml
+++ b/tools/ci/cirrus_wheels.yml
@@ -28,6 +28,8 @@ macosx_arm64_task:
         CIBW_ENVIRONMENT_MACOS: >
           RUNNER_OS=macOS
           MACOSX_DEPLOYMENT_TARGET=14.0
+          # SDKROOT needs to be set also here (see gfortran_utils.sh)
+          SDKROOT=/Applications/Xcode-15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
   env:
     PATH: /opt/homebrew/opt/python@3.10/bin:/usr/local/lib:/usr/local/include:$PATH
     CIBW_ARCHS: arm64

From 03352cebb625bebd913dc32af0b39c7a3d8c89cf Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Thu, 23 Nov 2023 14:02:13 +0100
Subject: [PATCH 13/16] DEBUG: hunt for bundle1.o [wheel build]

[skip actions] [skip azp] [skip circle]
---
 tools/ci/cirrus_wheels.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/ci/cirrus_wheels.yml b/tools/ci/cirrus_wheels.yml
index 536c14808111..a010748c329a 100644
--- a/tools/ci/cirrus_wheels.yml
+++ b/tools/ci/cirrus_wheels.yml
@@ -29,7 +29,8 @@ macosx_arm64_task:
           RUNNER_OS=macOS
           MACOSX_DEPLOYMENT_TARGET=14.0
           # SDKROOT needs to be set also here (see gfortran_utils.sh)
-          SDKROOT=/Applications/Xcode-15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
+          #SDKROOT=/Applications/Xcode-15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
+          SDKROOT=/Applications/Xcode-15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk
   env:
     PATH: /opt/homebrew/opt/python@3.10/bin:/usr/local/lib:/usr/local/include:$PATH
     CIBW_ARCHS: arm64

From 2b7c1cf459f2789bfe89463cfa4d2a3e81ceb709 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Thu, 23 Nov 2023 14:29:17 +0100
Subject: [PATCH 14/16] DEBUG: back to macOS Monterey [wheel build]

[skip actions] [skip azp] [skip circle]
---
 tools/ci/cirrus_wheels.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/ci/cirrus_wheels.yml b/tools/ci/cirrus_wheels.yml
index a010748c329a..730fe1410fd4 100644
--- a/tools/ci/cirrus_wheels.yml
+++ b/tools/ci/cirrus_wheels.yml
@@ -17,8 +17,8 @@ macosx_arm64_task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   macos_instance:
     matrix:
-      # - image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
-      - image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
+      - image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
+      #- image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
   matrix:
     - env:
         CIRRUS_CLONE_SUBMODULES: true
@@ -27,10 +27,11 @@ macosx_arm64_task:
         # all the settings from there, otherwise they're lost.
         CIBW_ENVIRONMENT_MACOS: >
           RUNNER_OS=macOS
-          MACOSX_DEPLOYMENT_TARGET=14.0
+          MACOSX_DEPLOYMENT_TARGET=11.0  # 14.0
           # SDKROOT needs to be set also here (see gfortran_utils.sh)
           #SDKROOT=/Applications/Xcode-15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
           SDKROOT=/Applications/Xcode-15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk
+          LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
   env:
     PATH: /opt/homebrew/opt/python@3.10/bin:/usr/local/lib:/usr/local/include:$PATH
     CIBW_ARCHS: arm64

From 3e899f63968404bb4f9efa17b20f65292229cfd3 Mon Sep 17 00:00:00 2001
From: Ralf Gommers <ralf.gommers@gmail.com>
Date: Thu, 23 Nov 2023 16:50:29 +0100
Subject: [PATCH 15/16] DEBUG: restore 11.0 deployment target config [wheel
 build]

[skip actions] [skip azp] [skip circle]
---
 tools/ci/cirrus_wheels.yml        | 15 +++++++--------
 tools/wheels/cibw_before_build.sh |  6 +-----
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/tools/ci/cirrus_wheels.yml b/tools/ci/cirrus_wheels.yml
index 730fe1410fd4..9e09aaed18d9 100644
--- a/tools/ci/cirrus_wheels.yml
+++ b/tools/ci/cirrus_wheels.yml
@@ -17,7 +17,7 @@ macosx_arm64_task:
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   macos_instance:
     matrix:
-      - image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
+      - image: ghcr.io/cirruslabs/macos-monterey-xcode:14
       #- image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
   matrix:
     - env:
@@ -25,16 +25,15 @@ macosx_arm64_task:
         CIBW_BUILD: cp310-*
         # Specifying CIBW_ENVIRONMENT_MACOS overrides pyproject.toml, so include
         # all the settings from there, otherwise they're lost.
-        CIBW_ENVIRONMENT_MACOS: >
-          RUNNER_OS=macOS
-          MACOSX_DEPLOYMENT_TARGET=11.0  # 14.0
-          # SDKROOT needs to be set also here (see gfortran_utils.sh)
-          #SDKROOT=/Applications/Xcode-15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
-          SDKROOT=/Applications/Xcode-15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk
-          LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
   env:
     PATH: /opt/homebrew/opt/python@3.10/bin:/usr/local/lib:/usr/local/include:$PATH
     CIBW_ARCHS: arm64
+    CIBW_ENVIRONMENT_MACOS: >
+      RUNNER_OS=macOS
+      MACOSX_DEPLOYMENT_TARGET=11.0  # 14.0
+      # SDKROOT needs to be set also here (see gfortran_utils.sh)
+      SDKROOT=/Applications/Xcode-14.0.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk
+      LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 
   build_script:
     - brew install python@3.10
diff --git a/tools/wheels/cibw_before_build.sh b/tools/wheels/cibw_before_build.sh
index a7a5a8641773..85f6554ad9a5 100644
--- a/tools/wheels/cibw_before_build.sh
+++ b/tools/wheels/cibw_before_build.sh
@@ -18,9 +18,8 @@ fi
 
 install_openblas=true
 if [[ $RUNNER_OS == "macOS" ]]; then
-    if [[ $(sw_vers --productVersion) == 14.* ]]; then
+    if [[ $MACOSX_DEPLOYMENT_VERSION == "14.0" ]]; then
         # This is the wheel build with Accelerate
-        export MACOSX_DEPLOYMENT_TARGET=14.0
         install_openblas=false
     else
         # Done in gfortran_utils.sh
@@ -65,9 +64,6 @@ if [[ $RUNNER_OS == "macOS" ]]; then
         PLAT="arm64"
     fi
 
-    # Needed for OpenBLAS and gfortran
-    export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-
     source $PROJECT_DIR/tools/wheels/gfortran_utils.sh
     install_gfortran
     pip install "delocate==0.10.4"

From a526cd623ca3ac6256c82de57706df01484fc0fe Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Fri, 24 Nov 2023 08:22:58 -0600
Subject: [PATCH 16/16] hardcode SDKROOT in gcc spec files

---
 tools/ci/cirrus_arm.yml        | 1 -
 tools/ci/cirrus_wheels.yml     | 2 --
 tools/wheels/gfortran_utils.sh | 1 +
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/ci/cirrus_arm.yml b/tools/ci/cirrus_arm.yml
index 7e394f55442b..cf85ca607c38 100644
--- a/tools/ci/cirrus_arm.yml
+++ b/tools/ci/cirrus_arm.yml
@@ -95,7 +95,6 @@ macos_arm64_test_task:
     python --version
 
     RUNNER_OS="macOS"
-    SDKROOT=/Applications/Xcode-14.0.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk
 
     # NOTE: OpenBLAS is not used in this job; if that's done in the future, ensure
     # PKG_CONFIG_PATH points to the directory containing the openblas.pc file
diff --git a/tools/ci/cirrus_wheels.yml b/tools/ci/cirrus_wheels.yml
index 9e09aaed18d9..c7e5dbc8cd79 100644
--- a/tools/ci/cirrus_wheels.yml
+++ b/tools/ci/cirrus_wheels.yml
@@ -31,8 +31,6 @@ macosx_arm64_task:
     CIBW_ENVIRONMENT_MACOS: >
       RUNNER_OS=macOS
       MACOSX_DEPLOYMENT_TARGET=11.0  # 14.0
-      # SDKROOT needs to be set also here (see gfortran_utils.sh)
-      SDKROOT=/Applications/Xcode-14.0.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk
       LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 
   build_script:
diff --git a/tools/wheels/gfortran_utils.sh b/tools/wheels/gfortran_utils.sh
index 2b613b82f553..66f9b5736417 100644
--- a/tools/wheels/gfortran_utils.sh
+++ b/tools/wheels/gfortran_utils.sh
@@ -147,6 +147,7 @@ if [ "$(uname)" == "Darwin" ]; then
         pushd /opt
             sudo tar -xvf gfortran-darwin-${arch}-${type}.tar.gz
             sudo rm gfortran-darwin-${arch}-${type}.tar.gz
+            find gfortran-darwin-${arch}-${type} -name "libgfortran.spec" -exec sed -i.bak "s@\-lm@-lm -isysroot ${SDKROOT}@g" {} +
         popd
 	if [[ "${type}" == "native" ]]; then
 	    # Link these into /usr/local so that there's no need to add rpath or -L