ENH: Remove ITKCudaCommon from the source tree

Now builds with the remote module CudaCommon of ITK. Builds both as a
remote module of ITK and as a standalone library.

.github/workflows/build-test-cxx-cuda.yml

@@ -4,6 +4,7 @@ on: [push,pull_request]
 
 env:
   itk-git-tag: "v5.3.0"
+  itk-module-deps: "CudaCommon@7f9a395c4c61e1757d0cdee82da7248b2117f3f2"
 
 jobs:
   build-test-cxx:

.github/workflows/build-test-package-python-cuda.yml

@@ -5,8 +5,9 @@ on: [push,pull_request]
 env:
   cmake-options: '-DRTK_BUILD_APPLICATIONS:BOOL=OFF -DRTK_CUDA_VERSION=11.6'
   itk-wheel-tag: 'v5.3.0'
-  itk-python-package-tag: 'ee05fd4fa5feedc32afbed32b84b9c9eb0518036'
-  itk-python-package-org: 'InsightSoftwareConsortium'
+  itk-python-package-tag: 'e41b75c7d7c5f1d74860e0765760e11b8ee5033c'
+  itk-python-package-org: 'SimonRit'
+  itk-module-deps: "RTKConsortium/ITKCudaCommon@7f9a395c4c61e1757d0cdee82da7248b2117f3f2"
 
 jobs:
   build-linux-cuda-python-packages:
@@ -37,7 +38,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 }}
-        CMAKE_OPTIONS="--cmake_options ${{ env.cmake-options }} -DCUDAToolkit_ROOT=/usr/lib64/cuda116 -DCMAKE_CUDA_COMPILER=/usr/lib64/cuda116/bin/nvcc"
+        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 .
@@ -48,7 +49,7 @@ jobs:
         export MANYLINUX_VERSION=`(echo ${MANYLINUX_PLATFORM} | cut -d '-' -f 1)`
         export TARGET_ARCH=`(echo ${MANYLINUX_PLATFORM} | cut -d '-' -f 2)`
         echo "Building for manylinux specialization ${MANYLINUX_VERSION} and target architecture ${TARGET_ARCH}"
-        ./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 }}
+        ./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

CMakeLists.txt

@@ -159,16 +159,6 @@ list(APPEND RTK_INCLUDE_DIRS
   "${LPSOLVE_INCLUDE_DIRS}")
 
 #=========================================================
-# ITKCudaCommon
-#=========================================================
-if(RTK_USE_CUDA)
-  if(NOT TARGET ITKCudaCommon)
-    add_subdirectory(utilities/ITKCudaCommon)
-  endif()
-endif()
-list(APPEND RTK_INCLUDE_DIRS
-  ${ITKCudaCommon_INCLUDE_DIRS})
-#=========================================================
 # Include directories
 #=========================================================
 list(APPEND RTK_INCLUDE_DIRS
@@ -223,9 +213,6 @@ if(NOT ITK_SOURCE_DIR)
   # This must be done after RTK has been loaded by ITK to make sure
   # ${itk-module} variables are defined for RTK.
   itk_module_target_export(lpsolve55)
-  if(RTK_USE_CUDA)
-      itk_module_target_export(ITKCudaCommon)
-  endif()
 
   if(${ITK_VERSION} VERSION_LESS 5.3)
     ## Set the default target properties for RTK

itk-module.cmake

@@ -37,10 +37,8 @@ set(RTK_TEST_DEPENDS
 
 # # -----------------------------------------
 # # CUDA optional dependencies
-if(ITK_SOURCE_DIR)
-  if(${RTK_USE_CUDA})
-    list(APPEND RTK_DEPENDS ITKCudaCommon)
-  endif()
+if(${RTK_USE_CUDA})
+  list(APPEND RTK_DEPENDS CudaCommon)
 endif()
 
 #=========================================================

src/CMakeLists.txt

@@ -128,11 +128,9 @@ endif()
 #=========================================================
 
 itk_module_add_library(RTK ${RTK_SRCS})
-target_link_libraries(RTK LINK_PUBLIC lpsolve55)
+target_link_libraries(RTK PUBLIC lpsolve55)
 
 if (RTK_USE_CUDA)
-  target_link_libraries(RTK LINK_PUBLIC ITKCudaCommon)
-  target_link_libraries(RTK LINK_PUBLIC CUDA::cufft)
-  target_link_libraries(RTK LINK_PUBLIC CUDA::cublas)
+  target_link_libraries(RTK PUBLIC CUDA::cufft CUDA::cublas)
   set_property(TARGET RTK PROPERTY CUDA_STANDARD ${CMAKE_CXX_STANDARD})
 endif ()