using yaml for cmake_cuda_architectures

flatironinstitute · Feb 24, 2025 · d346b38 · d346b38
1 parent 1f94e9f
commit d346b38
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/build_cufinufft_wheels.yml b/.github/workflows/build_cufinufft_wheels.yml
@@ -23,6 +23,10 @@ jobs:
         with:
           package-dir: 'python/cufinufft'
         env:
+          CIBW_ENVIRONMENT: CMAKE_CUDA_ARCHITECTURES=50;60;70;80
+          CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
+          CIBW_TEST_COMMAND: "echo 'Wheel installed'"
+          CIBW_BUILD_FRONTEND: "pip; args: --no-deps"
           CIBW_BEFORE_ALL_LINUX: |
             if command -v yum &> /dev/null; then
               yum install -y epel-release
@@ -36,17 +40,8 @@ jobs:
           CIBW_BEFORE_ALL_WINDOWS: |
             Invoke-WebRequest https://developer.download.nvidia.com/compute/cuda/11.4.0/network_installers/cuda_11.4.0_win10_network.exe -OutFile cuda_toolkit_windows.exe
             Start-Process -Wait -FilePath .\cuda_toolkit_windows.exe -ArgumentList "-s cufft_11.4 thrust_11.4 nvcc_11.4 cudart_11.4"
-            Remove-Item .\cuda_toolkit_windows.exe
-#            $CUDA_PATH = "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v11.4"
-#            echo "CUDA_PATH=$CUDA_PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-#            echo "CUDA_PATH_V12_5=$CUDA_PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-#            echo "$CUDA_PATH/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-          CIBW_ENVIRONMENT_WINDOWS: CUDA_PATH=C:\Program Files\NVIDIA GPU Computing Tosolkit\CUDA\v11.4
+          CIBW_ENVIRONMENT_WINDOWS: CUDA_PATH='C:\PROGRA~1\NVIDIA~1\CUDA\v11.4'
           CIBW_ARCHS_LINUX: x86_64
-          CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
-          CIBW_TEST_COMMAND: "echo 'Wheel installed'"
-          CIBW_BUILD_FRONTEND: "pip; args: --no-deps"
-
       - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.python }}-${{ matrix.buildplat[1] }}

diff --git a/python/cufinufft/pyproject.toml b/python/cufinufft/pyproject.toml
@@ -78,12 +78,10 @@ input = "cufinufft/__init__.py"
 # Necessary to see build output from the actual compilation
 build-verbosity = 1
 skip = "cp36-* cp37-* cp-38* pp37-* *-manylinux_i686 *_ppc64le *_s390x *_universal2"
-config-settings = {"cmake.define.CMAKE_CUDA_ARCHITECTURES" = "50;60;70;80", "cmake.define.CMAKE_VERBOSE_MAKEFILE" = "ON"}
+
 [tool.cibuildwheel.linux]
 manylinux-x86_64-image = "manylinux2014"
 manylinux-aarch64-image = "manylinux2014"
-musllinux-x86_64-image = "musllinux_1_2"
-
 
 [tool.cibuildwheel.windows]
 before-build = "pip install delvewheel"