macos wheels

Author: TLCFEM

.github/workflows/wheels.yml

@@ -28,15 +28,26 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-24.04 ]
+        os: [ ubuntu-24.04, macos-13, macos-14 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup
         run: |
           git submodule update --init --recursive
           cd eigen && git apply ../patch_size.patch && cd ..
-      - name: CI Build Wheel
+      - name: CI Build Wheel macos-14
+        if: matrix.os == 'macos-14'
+        uses: pypa/[email protected]
+        env:
+          MACOSX_DEPLOYMENT_TARGET: 14.0
+      - name: CI Build Wheel macos-13
+        if: matrix.os == 'macos-13'
+        uses: pypa/[email protected]
+        env:
+          MACOSX_DEPLOYMENT_TARGET: 13.0
+      - name: CI Build Wheel linux
+        if: matrix.os == 'ubuntu-24.04'
         uses: pypa/[email protected]
       - name: Upload
         uses: actions/upload-artifact@v4

pyproject.toml

@@ -42,9 +42,7 @@ dependencies = [
 
 [tool.cibuildwheel]
 archs = ["auto64"]
-skip = [
-    "*pp*",
-]
+skip = ["*pp*"]
 
 [[tool.cibuildwheel.overrides]]
 select = "*macosx*"
@@ -56,4 +54,4 @@ before-all = "yum install -y gcc-c++ tbb-devel mpfr-devel gmp-devel"
 
 [[tool.cibuildwheel.overrides]]
 select = "*musllinux*"
-before-all = "apk add gcc-c++ onetbb-dev mpfr-dev gmp-dev"
+before-all = "apk add g++ onetbb-dev mpfr-dev gmp-dev"

setup.py

@@ -1,10 +1,55 @@
+import os
 import platform
 from datetime import datetime
 from pathlib import Path
 
 from pybind11.setup_helpers import Pybind11Extension, build_ext
 from setuptools import setup
 
+if "Darwin" == platform.system():
+    os.environ["CC"] = "gcc-13"
+    os.environ["CXX"] = "g++-13"
+
+include_dirs = [
+    "eigen",
+    "eigen/unsupported",
+    "mpreal",
+    "exprtk",
+    "exprtk-custom-types",
+]
+
+library_dirs = []
+
+
+def add_to_include(target: str):
+    if not os.path.exists(target):
+        return
+
+    for root, dirs, _ in os.walk(target):
+        if "include" in dirs:
+            include_dirs.append(root + "/include")
+            break
+
+
+def add_to_library(target: str, header: str):
+    if not os.path.exists(target):
+        return
+
+    for root, _, files in os.walk(target):
+        if any(header in file for file in files):
+            library_dirs.append(root)
+            break
+
+
+for root in ["/opt/homebrew/Cellar", "/usr/local/Cellar"]:
+    add_to_include(f"{root}/mpfr")
+    add_to_include(f"{root}/gmp")
+    add_to_include(f"{root}/tbb")
+
+    add_to_library(f"{root}/mpfr", "libmpfr")
+    add_to_library(f"{root}/gmp", "libgmp")
+    add_to_library(f"{root}/tbb", "libtbb")
+
 # noinspection PyTypeChecker
 setup(
     version=datetime.now().strftime("%y%m%d"),
@@ -18,18 +63,10 @@
         Pybind11Extension(
             "_pyvpmr",
             ["src/VPMR.cpp"],
-            include_dirs=[
-                "eigen",
-                "eigen/unsupported",
-                "mpreal",
-                "exprtk",
-                "exprtk-custom-types",
-            ],
+            include_dirs=include_dirs,
+            library_dirs=library_dirs,
             libraries=["mpfr", "gmp", "tbb"],
             define_macros=[("PYVPMR", 1)],
-            extra_compile_args=["-fno-aligned-allocation"]
-            if "Darwin" == platform.system()
-            else [],
         ),
     ],
     cmdclass={"build_ext": build_ext},