try to make python_cmake.yml and python_skbuild_wheels.yml work

flatironinstitute · Jun 16, 2024 · 4ca05d3 · 4ca05d3
1 parent f6c4809
commit 4ca05d3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/generate_matrix.py b/.github/workflows/generate_matrix.py
@@ -13,10 +13,10 @@
     },
     "windows-2022": {
         "compiler": ["msvc", "llvm"],
-        "arch_flags": ["/arch:AVX2", "/arch:AVX512", "/arch:SSE2"]
+        "arch_flags": ["/arch:AVX2", "/arch:SSE2"]
     },
     "macos-13": {
-        "compiler": ["llvm", "gcc"],
+        "compiler": ["llvm", "gcc-14"],
         "arch_flags": ["-march=native", "-march=x86-64"]
     }
 }

diff --git a/.github/workflows/python_cmake.yml b/.github/workflows/python_cmake.yml
@@ -36,15 +36,15 @@ jobs:
           vcpkg: false
           cppcheck: false
           clangtidy: false
-      - name: Set min macOS version and install fftw and libomp
+      - name: Set min macOS version and install fftw
         if: runner.os == 'macOS'
         run: |
-          brew install fftw libomp
-      - name: Install fftw and libomp
+          brew install fftw
+      - name: Install fftw
         if: runner.os == 'linux'
         run: |
           sudo apt update
-          sudo apt install -y libfftw3-dev libomp-dev libomp5
+          sudo apt install -y libfftw3-dev
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
@@ -56,6 +56,7 @@ jobs:
       - name: Set compiler flags
         run: |
           echo CMAKE_ARGS="-DFINUFFT_ARCH_FLAGS=${{ matrix.arch_flags }}" >> $GITHUB_ENV
+        shell: bash
       - name: Build
         run: python3 -m pip install ${{ github.workspace }} --verbose
       - name: Test

diff --git a/.github/workflows/python_skbuild_wheels.yml b/.github/workflows/python_skbuild_wheels.yml
@@ -21,12 +21,12 @@ jobs:
           CIBW_SKIP: "pp* *musllinux*"
           CIBW_ARCHS_LINUX: "x86_64"
           CIBW_BEFORE_ALL_LINUX: yum install -y fftw3-devel
-          CIBW_BEFORE_ALL_MACOS: brew install gcc@13 libomp fftw
+          CIBW_BEFORE_ALL_MACOS: brew install gcc@14 fftw
           CIBW_ENVIRONMENT_MACOS: >
-            FC=gfortran-13
-            CC=gcc-13
-            CXX=g++-13
-            OpenMP_ROOT=/usr/local/opt/libomp
+            FC=gfortran-14
+            CC=gcc-14
+            CXX=g++-14
+            MACOSX_DEPLOYMENT_TARGET=13
 
       - uses: actions/upload-artifact@v4
         with:

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -1,5 +1,9 @@
 if(FINUFFT_USE_CPU)
-    install(TARGETS finufft LIBRARY DESTINATION finufft)
+    if (WIN32)
+        install(TARGETS finufft LIBRARY DESTINATION finufft RUNTIME DESTINATION finufft)
+    else ()
+        install(TARGETS finufft LIBRARY DESTINATION finufft)
+    endif ()
 endif()
 
 if(FINUFFT_USE_GPU)