From 12c1cbb611007cffe9c8ad904d48e33ce60cdca5 Mon Sep 17 00:00:00 2001 From: Simon Rit Date: Sun, 26 May 2024 21:56:20 +0200 Subject: [PATCH] BUG: Fix Python wheel name for Windows The CUDA version had been wrongly removed from the wheel name by 29b89fb6ea7cab8fa710ac671baa74a9fa9eb58b. --- .github/workflows/build-test-cxx-cuda.yml | 2 +- .github/workflows/build-test-package-python-cuda.yml | 4 ++-- .github/workflows/build-test-package.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test-cxx-cuda.yml b/.github/workflows/build-test-cxx-cuda.yml index 94c012886..cb88feba4 100644 --- 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 index 83004a306..d1d77f2a5 100644 --- 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: @@ -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 "-DCUDACOMMON_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 index b7b68e00e..c54da4f39 100644 --- 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 }}