From 5892382d208843a5a988432aa361f1db21a6d570 Mon Sep 17 00:00:00 2001 From: Simon Rit Date: Tue, 23 Sep 2025 12:13:00 +0100 Subject: [PATCH 1/2] COMP: Rename cudaCommonConfiguration.h to itkCudaCommonConfiguration.h --- rtkConfiguration.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rtkConfiguration.h.in b/rtkConfiguration.h.in index 66900ea77..11973aae7 100644 --- a/rtkConfiguration.h.in +++ b/rtkConfiguration.h.in @@ -35,11 +35,11 @@ using ThreadIdType = itk::ThreadIdType; # define SLAB_SIZE @RTK_CUDA_PROJECTIONS_SLAB_SIZE@ #endif -// CudaCommon_VERSION_* and cudaCommonConfiguration.h were introduced in CudaCommon 2.0 +// CudaCommon_VERSION_* and itkCudaCommonConfiguration.h were introduced in CudaCommon 2.0 #cmakedefine CudaCommon_VERSION_MAJOR #ifdef CudaCommon_VERSION_MAJOR # undef CudaCommon_VERSION_MAJOR -# include +# include #endif #define RTK_BINARY_DIR "@RTK_BINARY_DIR@" From 192a24e649ae41acfc07ee830dbb89b064054279 Mon Sep 17 00:00:00 2001 From: Simon Rit Date: Tue, 16 Sep 2025 15:56:52 +0100 Subject: [PATCH 2/2] ENH: Upgrade CI CUDA Python packages to CudaCommon v2 --- .github/workflows/build-test-package-python-cuda.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test-package-python-cuda.yml b/.github/workflows/build-test-package-python-cuda.yml index 77700cfd1..7cc362807 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.4' itk-python-package-tag: 'release-5.4' itk-python-package-org: 'InsightSoftwareConsortium' - itk-module-deps: "RTKConsortium/ITKCudaCommon@8baef219d19d8f320898c3c649539bbb5ba3f509" + itk-module-deps: "RTKConsortium/ITKCudaCommon@main" concurrency: group: '${{ github.workflow }}@${{ github.head_ref || github.run_id }}' @@ -74,7 +74,7 @@ jobs: LIBCUBLAS=`basename /home/srit/Downloads/cuda${CUDA_VERSION}/targets/x86_64-linux/lib/libcublas.so.${CUDA_VERSION_MAJOR}*` LIBCUBLASLT=`basename /home/srit/Downloads/cuda${CUDA_VERSION}/targets/x86_64-linux/lib/libcublasLt.so.${CUDA_VERSION_MAJOR}*` LIBCUFFT=`basename /home/srit/Downloads/cuda${CUDA_VERSION}/targets/x86_64-linux/lib/libcufft.so.$((${CUDA_VERSION_MAJOR}-1))*` - sed -i "s/dependencies = \[/dependencies = [ \"itk-cudacommon-cuda${CUDA_VERSION} == 1.1.*\",/g" pyproject.toml + sed -i "s/dependencies = \[/dependencies = [ \"itk-cudacommon-cuda${CUDA_VERSION} == 2.0.*\",/g" pyproject.toml sed -i "s/itk-rtk/itk-rtk-cuda${CUDA_VERSION}/g" pyproject.toml ./dockcross-manylinux-download-cache-and-build-module-wheels.sh "${CMAKE_OPTIONS[@]}" -x "libcuda.so.1;${LIBCUDART};${LIBCUBLAS};${LIBCUBLASLT};${LIBCUFFT}" cp3${{ matrix.python3-minor-version }} @@ -162,7 +162,7 @@ jobs: $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 ((Get-Content -Path pyproject.toml) -replace "itk-rtk","itk-rtk-cuda${CUDA_VERSION}") | Set-Content -Path pyproject.toml - ((Get-Content -Path pyproject.toml) -replace "dependencies = \[","dependencies = [""itk-cudacommon-cuda${CUDA_VERSION} == 1.1.*"",") | Set-Content -Path pyproject.toml + ((Get-Content -Path pyproject.toml) -replace "dependencies = \[","dependencies = [""itk-cudacommon-cuda${CUDA_VERSION} == 2.0.*"",") | Set-Content -Path pyproject.toml ./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}"" ""-DCMAKE_CUDA_COMPILER=$env:CUDACXX"" ""-DRTK_BUILD_APPLICATIONS:BOOL=OFF""" mkdir -p '${{ github.workspace }}\dist'