BUG: Fix Python wheel name of Cuda versions

The CUDA version had been wrongly removed from the wheel name by 29b89fb.
RTKConsortium · May 27, 2024 · 2146a95 · 2146a95
1 parent aafa38c
commit 2146a95
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build-test-cxx-cuda.yml b/.github/workflows/build-test-cxx-cuda.yml
@@ -4,7 +4,7 @@ on: [push,pull_request]
 
 env:
   itk-git-tag: "v5.4.0"
-  itk-module-deps: "CudaCommon@c7c766a6b944124da21131c6eb689ee75e61bd6e"
+  itk-module-deps: "CudaCommon@v1.1.0"
 
 jobs:
   build-test-cxx:

diff --git a/.github/workflows/build-test-package-python-cuda.yml b/.github/workflows/build-test-package-python-cuda.yml
@@ -6,7 +6,7 @@ env:
   itk-wheel-tag: 'v5.4.0'
   itk-python-package-tag: 'v5.4.0'
   itk-python-package-org: 'InsightSoftwareConsortium'
-  itk-module-deps: "RTKConsortium/ITKCudaCommon@c7c766a6b944124da21131c6eb689ee75e61bd6e"
+  itk-module-deps: "RTKConsortium/ITKCudaCommon@v1.1.0"
 
 jobs:
   build-linux-cuda-python-packages:
@@ -39,7 +39,7 @@ jobs:
         export CUDA_VERSION=${{ matrix.cuda-version }}
         export CUDA_VERSION_MAJOR=`(echo ${CUDA_VERSION} | cut -b1-2)`
         export CUDA_VERSION_MINOR=`(echo ${CUDA_VERSION} | cut -b3-)`
-        CMAKE_OPTIONS="-DCUDACOMMON_CUDA_VERSION=${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}"
+        CMAKE_OPTIONS="-DRTK_CUDA_VERSION=${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}"
         CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCUDAToolkit_ROOT=/usr/lib64/cuda${CUDA_VERSION}"
         CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CUDA_COMPILER=/usr/lib64/cuda${CUDA_VERSION}/bin/nvcc"
 
@@ -152,7 +152,7 @@ jobs:
         $LIBCUBLAS= (Get-Item "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}\bin\cublas64*dll" ).Name
         $LIBCUBLASLT= (Get-Item "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}\bin\cublasLt64*dll" ).Name
         $LIBCUFFT= (Get-Item "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}\bin\cufft64*dll" ).Name
-        ./windows-download-cache-and-build-module-wheels.ps1 "${{ matrix.python3-minor-version }}" -setup_options "--lib-paths ""C:/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/v${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}/bin"" --exclude-libs ""nvcuda.dll;concrt140.dll;${LIBCUDART};${LIBCUBLAS};${LIBCUBLASLT};${LIBCUFFT}""" -cmake_options "${{ env.cmake-options }}"
+        ./windows-download-cache-and-build-module-wheels.ps1 "${{ matrix.python3-minor-version }}" -setup_options "--lib-paths ""C:/Program\ Files/NVIDIA\ GPU\ Computing\ Toolkit/CUDA/v${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}/bin"" --exclude-libs ""nvcuda.dll;concrt140.dll;${LIBCUDART};${LIBCUBLAS};${LIBCUBLASLT};${LIBCUFFT}""" -cmake_options "-DRTK_CUDA_VERSION=${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}"
 
         mkdir -p '${{ github.workspace }}\dist'
         cp 'dist\*.whl' '${{ github.workspace }}\dist'

diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml
@@ -12,6 +12,6 @@ jobs:
       cmake-options: '-DRTK_BUILD_APPLICATIONS:BOOL=OFF'
       itk-wheel-tag: 'v5.4.0'
       itk-python-package-tag: 'v5.4.0'
-      itk-module-deps: "RTKConsortium/ITKCudaCommon@c7c766a6b944124da21131c6eb689ee75e61bd6e"
+      itk-module-deps: "RTKConsortium/ITKCudaCommon@v1.1.0"
     secrets:
       pypi_password: ${{ secrets.pypi_password }}