ENH: Use cmake-options variable in GitHub action for Python packaging

RTKConsortium · Mar 16, 2023 · 7763f2c · 7763f2c
1 parent e5dba4a
commit 7763f2c
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/.github/workflows/build-test-package-python-cuda.yml b/.github/workflows/build-test-package-python-cuda.yml
@@ -1,11 +1,12 @@
-name: 'Build, Test, Package ITKCudaCommon with CUDA'
+name: 'Package ITKCudaCommon with CUDA'
 
 on: [push,pull_request]
 
 env:
+  cmake-options: '-DCUDACOMMON_CUDA_VERSION=11.6'
   itk-wheel-tag: 'v5.3.0'
-  itk-python-package-tag: "6a7296422d15a7196f0711faa4ce562d21ba1bf3"
-  itk-python-package-org: "InsightSoftwareConsortium"
+  itk-python-package-tag: 'dc6a18600233ac69a8f42b7489e4edf6a5d8883a'
+  itk-python-package-org: 'InsightSoftwareConsortium'
 
 jobs:
   build-linux-cuda-python-packages:
@@ -24,7 +25,6 @@ jobs:
         IPP_DOWNLOAD_GIT_TAG=${{ env.itk-python-package-tag }}
         IPP_DOWNLOAD_ORG=${{ env.itk-python-package-org }}
         curl -L https://raw.githubusercontent.com/${IPP_DOWNLOAD_ORG:=InsightSoftwareConsortium}/ITKPythonPackage/${IPP_DOWNLOAD_GIT_TAG:=master}/scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh -O
-        export ITK_MODULE_NO_CLEANUP=TRUE
         chmod u+x dockcross-manylinux-download-cache-and-build-module-wheels.sh
 
     - name: 'Build 🐍 Python 📦 package'
@@ -36,11 +36,7 @@ jobs:
         export ITKPYTHONPACKAGE_TAG=${{ env.itk-python-package-tag }}
         export ITKPYTHONPACKAGE_ORG=${{ env.itk-python-package-org }}
         export ITK_MODULE_PREQ=${{ env.itk-module-deps }}
-        if [ -z ${{ env.cmake-options }}]; then
-          CMAKE_OPTIONS=""
-        else
-          CMAKE_OPTIONS="--cmake_options ${{ env.cmake-options }}"
-        fi
+        CMAKE_OPTIONS=(--cmake_options "${{ env.cmake-options }} -DCUDAToolkit_ROOT=/usr/lib64/cuda116 -DCMAKE_CUDA_COMPILER=/usr/lib64/cuda116/bin/nvcc")
         export LD_LIBRARY_PATH="/home/srit/Downloads/cuda116:/home/srit/Downloads/cuda116/targets/x86_64-linux/lib:/home/srit/Downloads/cuda116/lib64/stubs"
         if test -e ../../ITKPythonBuilds-linux-manylinux2014.tar.zst ; then
            mv ../../*zst .
@@ -50,8 +46,9 @@ jobs:
         rm -rf ITKPythonPackage
         export MANYLINUX_VERSION=`(echo ${MANYLINUX_PLATFORM} | cut -d '-' -f 1)`
         export TARGET_ARCH=`(echo ${MANYLINUX_PLATFORM} | cut -d '-' -f 2)`
+        export ITK_MODULE_NO_CLEANUP=TRUE
         echo "Building for manylinux specialization ${MANYLINUX_VERSION} and target architecture ${TARGET_ARCH}"
-        ./dockcross-manylinux-download-cache-and-build-module-wheels.sh $CMAKE_OPTIONS -c "-DCUDAToolkit_ROOT=/usr/lib64/cuda116 -DCMAKE_CUDA_COMPILER=/usr/lib64/cuda116/bin/nvcc -DCUDACOMMON_CUDA_VERSION=11.6" -x "libcuda.so;libcuda.so.1;libcudart.so;libcudart.so.11.0;libcublas.so;libcublas.so.11;libcublasLt.so;libcublasLt.so.11;libcufft.so;libcufft.so.10" cp${{ matrix.python-version }}
+        ./dockcross-manylinux-download-cache-and-build-module-wheels.sh "${CMAKE_OPTIONS[@]}" -x "libcuda.so;libcuda.so.1;libcudart.so;libcudart.so.11.0;libcublas.so;libcublas.so.11;libcublasLt.so;libcublasLt.so.11;libcufft.so;libcufft.so.10" cp${{ matrix.python-version }}
         mv *zst ../..
 
     - name: Publish Python package as GitHub Artifact
@@ -107,7 +104,7 @@ jobs:
         $env:ITKPYTHONPACKAGE_TAG = "${{ env.itk-python-package-tag }}"
         $env:ITKPYTHONPACKAGE_ORG = "${{ env.itk-python-package-org }}"
         $env:ITK_MODULE_PREQ = "${{ env.itk-module-deps }}"
-        ./windows-download-cache-and-build-module-wheels.ps1 "${{ matrix.python-version-minor }}" --lib-paths "C:/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/v11.6/bin" --exclude-libs "nvcuda.dll;concrt140.dll;cublas64_11.dll;cublasLt64_11.dll;cudart64_110.dll;cufft64_10.dll" "--" "-DCUDACOMMON_CUDA_VERSION=11.6"
+        ./windows-download-cache-and-build-module-wheels.ps1 "${{ matrix.python-version-minor }}" -setup-options "--lib-paths ""C:/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/v11.6/bin"" --exclude-libs ""nvcuda.dll;concrt140.dll;cublas64_11.dll;cublasLt64_11.dll;cudart64_110.dll;cufft64_10.dll""" -cmake_options "${{ env.cmake-options }}"
 
         mkdir -p '${{ github.workspace }}\dist'
         cp 'dist\*.whl' '${{ github.workspace }}\dist'