Update build-wheels-metal.yaml

Author: Smartappli

.github/workflows/build-wheels-metal.yaml

@@ -6,79 +6,63 @@ permissions:
   contents: write
 
 jobs:
-  define_matrix:
-    name: Define Build Matrix
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    defaults:
-      run:
-        shell: pwsh
-
-    steps:
-      - name: Define Job Output
-        id: set-matrix
-        run: |
-          $matrix = @{
-              'os' = @('macos-12', 'macos-13', 'macos-14')
-              'pyver' = @('3.9', '3.10', '3.11', '3.12')
-          }
-
-          $matrixOut = ConvertTo-Json $matrix -Compress
-          Write-Output ('matrix=' + $matrixOut) >> $env:GITHUB_OUTPUT
-
   build_wheels:
-    name: ${{ matrix.os }} Python ${{ matrix.pyver }}
-    needs: define_matrix
+    name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
-      matrix: ${{ fromJSON(needs.define_matrix.outputs.matrix) }}
-    env:
-      OSVER: ${{ matrix.os }}
+      matrix:
+        os: [macos-12, macos-13, macos-14]
 
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: "recursive"
 
+      # Used to host cibuildwheel
       - uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.pyver }}
+          python-version: "3.12"
           cache: 'pip'
 
-      - name: Install Dependencies
+      - name: Install dependencies
         run: |
-          python -m pip install build wheel cmake
+          python -m pip install --upgrade pip
+          python -m pip install -e .[all]
 
-      - name: Build Wheel
-        run: |
-          XCODE15PATH="/Applications/Xcode_15.0.app/Contents/Developer"
-          XCODE15BINPATH="${XCODE15PATH}/Toolchains/XcodeDefault.xctoolchain/usr/bin"
-          export CMAKE_ARGS="-DLLAMA_NATIVE=off -DLLAMA_METAL=on"
-          [[ "$OSVER" == "macos-13" ]] && export CC="${XCODE15BINPATH}/cc" && export CXX="${XCODE15BINPATH}/c++" && export MACOSX_DEPLOYMENT_TARGET="13.0"
-          [[ "$OSVER" == "macos-12" ]] && export MACOSX_DEPLOYMENT_TARGET="12.0"
-          # [[ "$OSVER" == "macos-11" ]] && export MACOSX_DEPLOYMENT_TARGET="11.0"
-          
-          export CMAKE_OSX_ARCHITECTURES="arm64" && export ARCHFLAGS="-arch arm64"
-          VERBOSE=1 python -m build --wheel
-
-          if [[ "$OSVER" == "macos-13" ]]; then
-            export SDKROOT="${XCODE15PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.0.sdk"
-            export MACOSX_DEPLOYMENT_TARGET="14.0"
-            VERBOSE=1 python -m build --wheel
-          fi
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v2.17.0
+        env:
+          # disable repair
+          CIBW_REPAIR_WHEEL_COMMAND: ""
+          CIBW_ARCHS: "arm64"
+          CIBW_ENVIRONMENT: CMAKE_ARGS="-DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_APPLE_SILICON_PROCESSOR=arm64 -DLLAMA_METAL=on"
+          CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* pp39-* pp310-*"
+        with:
+          package-dir: .
+          output-dir: wheelhouse
 
-          for file in ./dist/*.whl; do cp "$file" "${file/arm64.whl/aarch64.whl}"; done
+      - uses: actions/upload-artifact@v4
+        with:
+          name: wheels-mac_${{ matrix.os }}
+          path: ./wheelhouse/*.whl
 
-          # export CMAKE_OSX_ARCHITECTURES="x86_64" && export CMAKE_ARGS="-DLLAMA_NATIVE=off -DLLAMA_AVX=off -DLLAMA_AVX2=off -DLLAMA_FMA=off -DLLAMA_F16C=off -DLLAMA_METAL=on" && export ARCHFLAGS="-arch x86_64"
-          # VERBOSE=1 python -m build --wheel
+  release:
+    name: Release
+    needs: [build_wheels]
+    runs-on: ubuntu-latest
 
-          # if [[ "$OSVER" == "macos-13" ]]; then
-          #  export SDKROOT="${XCODE15PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.0.sdk"
-          #  export MACOSX_DEPLOYMENT_TARGET="14.0"
-          #  VERBOSE=1 python -m build --wheel
-          # fi
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          merge-multiple: true
+          path: dist
 
+      - uses: softprops/action-gh-release@v2
+        with:
+          files: dist/*
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          
       - uses: softprops/action-gh-release@v2
         with:
           files: dist/*