[pypi] wheel path fixed

diyabc · Jun 11, 2024 · d1996d5 · d1996d5
1 parent 2de2c9f
commit d1996d5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -55,8 +55,11 @@ jobs:
             shortos: linux
             cmakeargs: "-DTEST:BOOL=FALSE -DUSE_MKL:BOOL=TRUE -DMAKE_STATIC_EXE:BOOL=TRUE -DLAPACK_ROOT:STRING=/opt/intel/oneapi/mkl/latest/lib '-DLAPACK_LIBRARIES:STRING=-Wl,--start-group /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_intel_lp64.a /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_tbb_thread.a /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_core.a -Wl,--end-group;pthread;m;dl' '-DBLAS_LIBRARIES:STRING=-Wl,--start-group /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_intel_lp64.a /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_tbb_thread.a /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_core.a -Wl,--end-group;pthread;m;dl' -DCMAKE_BUILD_TYPE:STRING=Release -G Ninja"
           - os: macos-latest
-            shortos: macos
-            cmakeargs: -DTEST:BOOL=FALSE -DCMAKE_OSX_ARCHITECTURES:STRING=arm64 -DUSE_MKL:BOOL=FALSE -DCMAKE_BUILD_TYPE:STRING=Release -G Ninja
+            shortos: macos-x64
+            cmakeargs: -DTEST:BOOL=FALSE -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64 -DVCPKG_TARGET_TRIPLET:STRING=x64-osx -DUSE_MKL:BOOL=FALSE -DCMAKE_BUILD_TYPE:STRING=Release -G Ninja
+          - os: macos-latest
+            shortos: macos-arm64
+            cmakeargs: -DTEST:BOOL=FALSE -DCMAKE_OSX_ARCHITECTURES:STRING=arm64 -DVCPKG_TARGET_TRIPLET:STRING=arm64-osx -DUSE_MKL:BOOL=FALSE -DCMAKE_BUILD_TYPE:STRING=Release -G Ninja
     steps:
       - uses: actions/checkout@v4
         with:
@@ -79,7 +82,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: /Users/runner/.local/share/pmm
-          key: macos-vcpkg5-${{ env.PMM_VERSION }}-${{ env.VCPKG_REVISION }}
+          key: macos-vcpkg5-${{ matrix.shortos }}-${{ env.PMM_VERSION }}-${{ env.VCPKG_REVISION }}
         if: matrix.os == 'macos-latest'
       - name: restore/cache vcpkg/windows
         uses: actions/cache@v2
@@ -187,7 +190,7 @@ jobs:
           asset_content_type: application/octet-stream
         if: matrix.os == 'windows-latest'
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.18.1
+        uses: pypa/cibuildwheel@v2.19.0
       - uses: actions/upload-artifact@v2
         with:
           path: ./wheelhouse/*.whl

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -60,11 +60,6 @@ if(MSVC AND MAKE_STATIC_EXE)
   set(VCPKG_TARGET_TRIPLET "x64-windows-static")
 endif()
 
-if(APPLE)
-  set(VCPKG_TARGET_TRIPLET "arm64-osx")
-  set(VCPKG_OSX_ARCHITECTURES "arm64")
-endif()
-
 if(USE_MKL)
   set(TBBPKG tbb)
 endif()

diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,7 @@ build-verbosity = 3
 
 [tool.cibuildwheel.linux]
 before-all = "bash presetup.sh"
-environment-pass = [ "VCPKG_REVISION" ]
+environment-pass = ["VCPKG_REVISION"]
 before-build = "rm -f {project}/build/CMakeCache.txt"
 
 [tool.cibuildwheel.macos]

diff --git a/setup.py b/setup.py
@@ -1,5 +1,6 @@
 from cmaketools import setup
 import sys
+import platform
 from os import path
 
 this_directory = path.abspath(path.dirname(__file__))
@@ -14,7 +15,10 @@
 elif sys.platform == "linux":
     configure_opts = ["-DPython_EXECUTABLE="+sys.executable,"-DPYABCRANGER=TRUE","-DUSE_MKL:BOOL=TRUE","-DMAKE_STATIC_EXE:BOOL=TRUE","-DLAPACK_ROOT:STRING=/opt/intel/oneapi/mkl/latest/lib","-DLAPACK_LIBRARIES:STRING=-Wl,--start-group /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_intel_lp64.a /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_tbb_thread.a /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_core.a -Wl,--end-group;pthread;m;dl","-DBLAS_LIBRARIES:STRING=-Wl,--start-group /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_intel_lp64.a /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_tbb_thread.a /opt/intel/oneapi/mkl/latest/lib/intel64/libmkl_core.a -Wl,--end-group;pthread;m;dl"]
 elif sys.platform == "darwin":
-    configure_opts = ["-DPython_EXECUTABLE="+sys.executable,"-DCMAKE_OSX_ARCHITECTURES:STRING=arm64","-DPYABCRANGER=TRUE","-DUSE_MKL:BOOL=FALSE","-DCMAKE_BUILD_TYPE:STRING=Release"]
+    if platform.processor == "arm":
+        configure_opts = ["-DPython_EXECUTABLE="+sys.executable,"-DVCPKG_TRIPLET:STRING=arm64-osx","-DCMAKE_OSX_ARCHITECTURES:STRING=arm64","-DPYABCRANGER=TRUE","-DUSE_MKL:BOOL=FALSE","-DCMAKE_BUILD_TYPE:STRING=Release"]
+    else:
+        configure_opts = ["-DPython_EXECUTABLE="+sys.executable,"-DVCPKG_TRIPLET:STRING=x64-osx","-DCMAKE_OSX_ARCHITECTURES:STRING=x64","-DPYABCRANGER=TRUE","-DUSE_MKL:BOOL=FALSE","-DCMAKE_BUILD_TYPE:STRING=Release"]
 elif sys.platform == "win32":
     configure_opts = ["-DPython_FIND_REGISTRY=NEVER","-DPYABCRANGER=TRUE","-DUSE_MKL:BOOL=FALSE","-DMAKE_STATIC_EXE:BOOL=TRUE","-DVCPKG_TARGET_TRIPLET:STRING=x64-windows-static"]
 else: