Update Github work flow

Author: thomasantony

.github/workflows/wheels.yml

@@ -16,34 +16,59 @@ on:
 
 jobs:
   build_wheels:
-    name: ${{ matrix.type }} ${{ matrix.arch }} on ${{ matrix.os }}
+    name: Build wheels on ${{ matrix.os }} for ${{ matrix.arch }} - ${{ matrix.p_ver }}
     runs-on: ${{ matrix.os }}
+    env:
+      CIBW_BUILD: ${{ matrix.cibw_build }}
+      CIBW_ARCHS_LINUX: ${{ matrix.arch }}
+      CIBW_ARCHS_MACOS: ${{ matrix.arch }}
     strategy:
-      fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
         arch: [auto64]
+        cibw_build: ["cp3{9,10,11}-*"]
+        p_ver: ["3.9-3.11"]
+        exclude:
+          - arch: arm64
+            os: macos-latest
+        include:
+          - arch: aarch64
+            os: ubuntu-latest
+            cibw_build: "cp37*"
+            p_ver: "3.7"
+          - arch: aarch64
+            os: ubuntu-latest
+            cibw_build: "cp38*"
+            p_ver: "3.8"
+          - arch: aarch64
+            os: ubuntu-latest
+            cibw_build: "cp39*"
+            p_ver: "3.9"
+          - arch: aarch64
+            os: ubuntu-latest
+            cibw_build: "cp310*"
+            p_ver: "3.10"
+          - arch: aarch64
+            os: ubuntu-latest
+            cibw_build: "cp311*"
+            p_ver: "3.11"
 
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
           submodules: true
 
-      # Used to host cibuildwheel
-      - uses: actions/setup-python@v3
-      # Installs poetry
-      - uses: Gr1N/setup-poetry@v8
+      - name: Set up QEMU
+        if: matrix.os == 'ubuntu-latest' && matrix.arch == 'aarch64'
+        uses: docker/setup-qemu-action@v1
         with:
-          poetry-version: "1.4.0"
-      - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.12.1
+          platforms: arm64
 
       - name: Build wheels
-        run: python -m cibuildwheel --output-dir wheelhouse
+        uses: pypa/cibuildwheel@v2.12.1
         env:
-          CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
-          CIBW_TEST_SKIP: '*_arm64 *_universal2:arm64'
+          CIBW_ARCHS_MACOS: "x86_64"
 
       - uses: actions/upload-artifact@v3
         with:

build.py

@@ -1,3 +1,4 @@
+import os
 from setuptools_cpp import CMakeExtension, ExtensionBuilder
 from typing import Any, Dict
 
@@ -12,5 +13,13 @@ def build(setup_kwargs: Dict[str, Any]) -> None:
             "ext_modules": ext_modules,
             "cmdclass": dict(build_ext=ExtensionBuilder),
             "zip_safe": False,
+            "options": {
+                'bdist_wheel': {
+                    'plat_name': os.getenv('PP_PYTHON_TARGET', 'any')
+                },
+                'egg_info': {
+                    'egg_base': './build/'
+                }
+            }
         }
     )

pyproject.toml

@@ -33,9 +33,11 @@ llamacpp-cli = 'llamacpp.cli:run'
 llamacpp-chat = 'llamacpp.chat:run'
 
 [tool.cibuildwheel]
+# Install pybind and poetry
+before-build = "pip install -U \"pybind11[global]\" poetry"
 
-# Install something required for the build
-# (you might want to use build-system.requires instead)
-before-build = "pip install -U \"pybind11[global]\""
 # Skip PyPy and 32-bit builds
 skip = ["pp*", "*-win32", "*-manylinux_i686", "*-musllinux_i686"]
+
+build-verbosity = 3
+test-skip = "*macosx*arm64*"