Promote arm64 macOS to tier 1

.github/workflows/tests.yml

@@ -0,0 +1,44 @@
+---
+name: Tests
+on:
+  push:
+    branches: [ main, 'stable/*' ]
+  pull_request:
+    branches: [ main, 'stable/*' ]
+
+concurrency:
+  group: ${{ github.repository }}-${{ github.ref }}-${{ github.head_ref }}
+  cancel-in-progress: true
+jobs:
+  tests:
+    if: github.repository_owner == 'Qiskit'
+    name: macOS-arm64-tests-Python-${{ matrix.python-version }}
+    runs-on: macOS-14
+    strategy:
+      fail-fast: false
+      matrix:
+        # Normally we test min and max version but we can't run python 3.8 or
+        # 3.9 on arm64 until actions/setup-python#808 is resolved
+        python-version: ["3.10", "3.12"]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Rust toolchain
+        uses: dtolnay/[email protected]
+        if: matrix.python-version == '3.10'
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: arm64
+      - name: 'Install dependencies'
+        run: |
+          python -m pip install -U -r requirements.txt -c constraints.txt
+          python -m pip install -U -r requirements-dev.txt -c constraints.txt
+          python -m pip install -c constraints.txt -e .
+      - name: 'Install optionals'
+        run: |
+          python -m pip install -r requirements-optional.txt -c constraints.txt
+          python tools/report_numpy_state.py
+        if: matrix.python-version == '3.10'
+      - name: 'Run tests'
+        run: stestr run

.github/workflows/wheels.yml

@@ -12,13 +12,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-11, windows-latest]
+        os: [ubuntu-latest, macos-11, windows-latest, macos-14]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         name: Install Python
         with:
           python-version: '3.10'
+        if: matrix.os != 'macos-14'
+      - uses: actions/setup-python@v5
+        name: Install Python
+        with:
+          python-version: '3.10'
+          architecture: arm64
+        if: matrix.os == 'macos-14'
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: llvm-tools-preview
@@ -34,13 +41,13 @@ jobs:
         with:
           path: ./wheelhouse/*.whl
           name: wheels-${{ matrix.os }}
-  build_wheels_32bit:
-    name: Build wheels 32bit
+  build_wheels_macos_arm_py38:
+    name: Build wheels on macOS arm
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [macos-11]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -53,45 +60,47 @@ jobs:
       - name: Build wheels
         uses: pypa/[email protected]
         env:
-          CIBW_SKIP: 'pp* cp36-* cp37-* *musllinux* *amd64 *x86_64'
+          CIBW_BEFORE_ALL: rustup target add aarch64-apple-darwin
+          CIBW_BUILD: cp38-macosx_universal2 cp38-macosx_arm64
+          CIBW_ARCHS_MACOS: arm64 universal2
+          CIBW_ENVIRONMENT: >-
+            CARGO_BUILD_TARGET="aarch64-apple-darwin"
+            PYO3_CROSS_LIB_DIR="/Library/Frameworks/Python.framework/Versions/$(python -c 'import sys; print(str(sys.version_info[0])+"."+str(sys.version_info[1]))')/lib/python$(python -c 'import sys; print(str(sys.version_info[0])+"."+str(sys.version_info[1]))')"
       - uses: actions/upload-artifact@v4
         with:
           path: ./wheelhouse/*.whl
-          name: wheels-${{ matrix.os }}-32
-  build_wheels_macos_arm:
-    name: Build wheels on macOS arm
+          name: wheels-${{ matrix.os }}-arm
+  build_wheels_32bit:
+    name: Build wheels 32bit
     runs-on: ${{ matrix.os }}
-    environment: release
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11]
+        os: [ubuntu-latest, windows-latest]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         name: Install Python
         with:
           python-version: '3.10'
       - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: llvm-tools-preview
       - name: Build wheels
         uses: pypa/[email protected]
         env:
-          CIBW_BEFORE_ALL: rustup target add aarch64-apple-darwin
-          CIBW_ARCHS_MACOS: arm64 universal2
-          CIBW_ENVIRONMENT: >-
-            CARGO_BUILD_TARGET="aarch64-apple-darwin"
-            PYO3_CROSS_LIB_DIR="/Library/Frameworks/Python.framework/Versions/$(python -c 'import sys; print(str(sys.version_info[0])+"."+str(sys.version_info[1]))')/lib/python$(python -c 'import sys; print(str(sys.version_info[0])+"."+str(sys.version_info[1]))')"
+          CIBW_SKIP: 'pp* cp36-* cp37-* *musllinux* *amd64 *x86_64'
       - uses: actions/upload-artifact@v4
         with:
           path: ./wheelhouse/*.whl
-          name: wheels-${{ matrix.os }}-arm
+          name: wheels-${{ matrix.os }}-32
   upload_shared_wheels:
     name: Upload shared build wheels
     runs-on: ubuntu-latest
     environment: release
     permissions:
       id-token: write
-    needs: ["build_wheels", "build_wheels_macos_arm", "build_wheels_32bit"]
+    needs: ["build_wheels", "build_wheels_32bit", "build_wheels_macos_arm_py38"]
     steps:
       - uses: actions/download-artifact@v4
         with:

pyproject.toml

@@ -136,7 +136,7 @@ target-version = ['py38', 'py39', 'py310', 'py311']
 [tool.cibuildwheel]
 manylinux-x86_64-image = "manylinux2014"
 manylinux-i686-image = "manylinux2014"
-skip = "pp* cp36-* cp37-* *musllinux* *win32 *i686"
+skip = "pp* cp36-* cp37-* *musllinux* *win32 *i686 cp38-macosx_arm64"
 test-skip = "*win32 *linux_i686"
 test-command = "python {project}/examples/python/stochastic_swap.py"
 # We need to use pre-built versions of Numpy and Scipy in the tests; they have a

releasenotes/notes/macos-arm64-tier-1-c5030f009be6adcb.yaml

@@ -0,0 +1,11 @@
+---
+other:
+  - |
+    Support for the arm64 macOS platform has been promoted from Tier 3
+    to Tier 1. Previously the platform was at Tier 3 because there was
+    no available CI environment for testing Qiskit on the platform. Now
+    that Github has made an arm64 macOS environment available to open source
+    projects [#]_ we're testing the platform along with the other Tier 1
+    supported platforms.
+
+    .. [#] https://github.blog/changelog/2024-01-30-github-actions-introducing-the-new-m1-macos-runner-available-to-open-source/

tools/build_pgo.sh

@@ -17,6 +17,12 @@ else
     source build_pgo/bin/activate
 fi
 
+arch=`uname -m`
+# Handle macOS calling the architecture arm64 and rust calling it aarch64
+if [[ $arch == "arm64" ]]; then
+    arch="aarch64"
+fi
+
 # Build with instrumentation
 pip install -U -c constraints.txt setuptools-rust wheel setuptools
 RUSTFLAGS="-Cprofile-generate=/tmp/pgo-data" pip install --prefer-binary -c constraints.txt -r requirements-dev.txt -e .
@@ -29,4 +35,4 @@ python tools/pgo_scripts/test_utility_scale.py
 
 deactivate
 
-${HOME}/.rustup/toolchains/*x86_64*/lib/rustlib/x86_64*/bin/llvm-profdata merge -o $merged_path /tmp/pgo-data
+${HOME}/.rustup/toolchains/*$arch*/lib/rustlib/$arch*/bin/llvm-profdata merge -o $merged_path /tmp/pgo-data