From 0babff4d7aa1cbbfb04062f8177cca6aae878e98 Mon Sep 17 00:00:00 2001 From: Simon Rit Date: Sun, 10 May 2020 10:54:14 +0200 Subject: [PATCH] COMP: remove wrapping of Cuda double images, incompatible with Cuda code Fixes #350 --- wrapping/itkCudaImageDataManager.wrap | 16 ++++------------ wrapping/itkCudaImageToImageFilter.wrap | 8 +++----- wrapping/itkCudaInPlaceImageFilter.wrap | 8 +++----- wrapping/itkImageSourceRTK.wrap | 19 +++++++------------ wrapping/itkImageToImageFilterRTK.wrap | 8 +++----- wrapping/itkInPlaceImageFilterRTK.wrap | 10 ++++------ wrapping/rtkBackProjectionImageFilter.wrap | 18 ++++++------------ .../rtkCudaBackProjectionImageFilter.wrap | 4 +--- .../rtkCudaForwardProjectionImageFilter.wrap | 16 +++++----------- wrapping/rtkForwardProjectionImageFilter.wrap | 9 +++------ ...IterativeConeBeamReconstructionFilter.wrap | 7 +++---- ...emOneStepSpectralReconstructionFilter.wrap | 8 ++++---- 12 files changed, 46 insertions(+), 85 deletions(-) diff --git a/wrapping/itkCudaImageDataManager.wrap b/wrapping/itkCudaImageDataManager.wrap index 1c17f4aed..490349ccb 100644 --- a/wrapping/itkCudaImageDataManager.wrap +++ b/wrapping/itkCudaImageDataManager.wrap @@ -18,22 +18,14 @@ if(RTK_USE_CUDA) foreach(component ${vectorComponents}) foreach(d ${ITK_WRAP_IMAGE_DIMS}) - foreach(vt ${WRAP_ITK_VECTOR_REAL}) - itk_wrap_template("CI${ITKM_${vt}${component}}${d}" "itk::CudaImage<${ITKT_${vt}${component}}, ${d}>") - endforeach() - foreach(cvt ${WRAP_ITK_COV_VECTOR_REAL}) - itk_wrap_template("CI${ITKM_${cvt}${component}}${d}" "itk::CudaImage<${ITKT_${cvt}${component}}, ${d}>") - endforeach() + itk_wrap_template("CI${ITKM_VF${component}}${d}" "itk::CudaImage<${ITKT_VF${component}}, ${d}>") + itk_wrap_template("CI${ITKM_CVF${component}}${d}" "itk::CudaImage<${ITKT_CVF${component}}, ${d}>") endforeach() list(FIND ITK_WRAP_IMAGE_DIMS "4" _index) if(${_index} EQUAL -1) - foreach(vt ${WRAP_ITK_VECTOR_REAL}) - itk_wrap_template("CI${ITKM_${vt}${component}}4" "itk::CudaImage<${ITKT_${vt}${component}}, 4>") - endforeach() - foreach(cvt ${WRAP_ITK_COV_VECTOR_REAL}) - itk_wrap_template("CI${ITKM_${cvt}${component}}4" "itk::CudaImage<${ITKT_${cvt}${component}}, 4>") - endforeach() + itk_wrap_template("CI${ITKM_VF${component}}4" "itk::CudaImage<${ITKT_VF${component}}, 4>") + itk_wrap_template("CI${ITKM_CVF${component}}4" "itk::CudaImage<${ITKT_CVF${component}}, 4>") endif() endforeach() diff --git a/wrapping/itkCudaImageToImageFilter.wrap b/wrapping/itkCudaImageToImageFilter.wrap index ba345fdc8..ece678b43 100644 --- a/wrapping/itkCudaImageToImageFilter.wrap +++ b/wrapping/itkCudaImageToImageFilter.wrap @@ -11,11 +11,9 @@ if(RTK_USE_CUDA) UNIQUE(imageDimensions "${ITK_WRAP_IMAGE_DIMS};2;3;4") UNIQUE(vectorComponents "${ITK_WRAP_VECTOR_COMPONENTS};2;3;4;5") foreach(component ${vectorComponents}) - foreach(vt ${WRAP_ITK_VECTOR_REAL}) - foreach(d ${imageDimensions}) - itk_wrap_template("CI${ITKM_${vt}${component}}${d}CI${ITKM_${vt}${component}}${d}" - "itk::CudaImage<${ITKT_${vt}${component}}, ${d}>, itk::CudaImage<${ITKT_${vt}${component}}, ${d}>") - endforeach() + foreach(d ${imageDimensions}) + itk_wrap_template("CI${ITKM_VF${component}}${d}CI${ITKM_VF${component}}${d}" + "itk::CudaImage<${ITKT_VF${component}}, ${d}>, itk::CudaImage<${ITKT_VF${component}}, ${d}>") endforeach() endforeach() diff --git a/wrapping/itkCudaInPlaceImageFilter.wrap b/wrapping/itkCudaInPlaceImageFilter.wrap index 4c464411f..783b25747 100644 --- a/wrapping/itkCudaInPlaceImageFilter.wrap +++ b/wrapping/itkCudaInPlaceImageFilter.wrap @@ -29,11 +29,9 @@ if(RTK_USE_CUDA) UNIQUE(imageDimensions "${ITK_WRAP_IMAGE_DIMS};2;3;4") UNIQUE(vectorComponents "${ITK_WRAP_VECTOR_COMPONENTS};2;3;4;5") foreach(component ${vectorComponents}) - foreach(vt ${WRAP_ITK_VECTOR_REAL}) - foreach(d ${imageDimensions}) - itk_wrap_template("CI${ITKM_${vt}${component}}${d}CI${ITKM_${vt}${component}}${d}IPIFCI${ITKM_${vt}${component}}${d}" - "itk::CudaImage<${ITKT_${vt}${component}}, ${d}>, itk::CudaImage<${ITKT_${vt}${component}}, ${d}>, itk::InPlaceImageFilter< itk::CudaImage<${ITKT_${vt}${component}}, ${d}> >") - endforeach() + foreach(d ${imageDimensions}) + itk_wrap_template("CI${ITKM_VF${component}}${d}CI${ITKM_VF${component}}${d}IPIFCI${ITKM_VF${component}}${d}" + "itk::CudaImage<${ITKT_VF${component}}, ${d}>, itk::CudaImage<${ITKT_VF${component}}, ${d}>, itk::InPlaceImageFilter< itk::CudaImage<${ITKT_VF${component}}, ${d}> >") endforeach() endforeach() diff --git a/wrapping/itkImageSourceRTK.wrap b/wrapping/itkImageSourceRTK.wrap index 47629c557..16c8f7223 100644 --- a/wrapping/itkImageSourceRTK.wrap +++ b/wrapping/itkImageSourceRTK.wrap @@ -86,20 +86,15 @@ itk_wrap_class("itk::ImageSource" POINTER) UNIQUE(vectorComponents "${ITK_WRAP_VECTOR_COMPONENTS};2;3;4;5") foreach(component ${vectorComponents}) - foreach(vt ${WRAP_ITK_VECTOR_REAL}) - - foreach(d ${ITK_WRAP_IMAGE_DIMS}) - itk_wrap_template("CI${ITKM_${vt}${component}}${d}" "itk::CudaImage<${ITKT_${vt}${component}}, ${d}>") - endforeach() - - list(FIND ITK_WRAP_IMAGE_DIMS "4" _index) - if(${_index} EQUAL -1) - itk_wrap_template("CI${ITKM_${vt}${component}}4" "itk::CudaImage<${ITKT_${vt}${component}}, 4>") - endif() - + foreach(d ${ITK_WRAP_IMAGE_DIMS}) + itk_wrap_template("CI${ITKM_VF${component}}${d}" "itk::CudaImage<${ITKT_VF${component}}, ${d}>") endforeach() - endforeach() + list(FIND ITK_WRAP_IMAGE_DIMS "4" _index) + if(${_index} EQUAL -1) + itk_wrap_template("CI${ITKM_VF${component}}4" "itk::CudaImage<${ITKT_VF${component}}, 4>") + endif() + endforeach() endif() # Wrap ITK CovariantVector missing types diff --git a/wrapping/itkImageToImageFilterRTK.wrap b/wrapping/itkImageToImageFilterRTK.wrap index 6bfa5ab84..b7cd806dd 100644 --- a/wrapping/itkImageToImageFilterRTK.wrap +++ b/wrapping/itkImageToImageFilterRTK.wrap @@ -75,11 +75,9 @@ itk_wrap_class("itk::ImageToImageFilter" POINTER) UNIQUE(imageDimensions "${ITK_WRAP_IMAGE_DIMS};2;3;4") UNIQUE(vectorComponents "${ITK_WRAP_VECTOR_COMPONENTS};2;3;4;5") foreach(component ${vectorComponents}) - foreach(vt ${WRAP_ITK_VECTOR_REAL}) - foreach(d ${imageDimensions}) - itk_wrap_template("CI${ITKM_${vt}${component}}${d}CI${ITKM_${vt}${component}}${d}" - "itk::CudaImage<${ITKT_${vt}${component}}, ${d}>, itk::CudaImage<${ITKT_${vt}${component}}, ${d}>") - endforeach() + foreach(d ${imageDimensions}) + itk_wrap_template("CI${ITKM_VF${component}}${d}CI${ITKM_VF${component}}${d}" + "itk::CudaImage<${ITKT_VF${component}}, ${d}>, itk::CudaImage<${ITKT_VF${component}}, ${d}>") endforeach() endforeach() diff --git a/wrapping/itkInPlaceImageFilterRTK.wrap b/wrapping/itkInPlaceImageFilterRTK.wrap index 58c1b6189..ff891c9e2 100644 --- a/wrapping/itkInPlaceImageFilterRTK.wrap +++ b/wrapping/itkInPlaceImageFilterRTK.wrap @@ -65,12 +65,10 @@ itk_wrap_class("itk::InPlaceImageFilter" POINTER) UNIQUE(imageDimensions "${ITK_WRAP_IMAGE_DIMS};2;3;4") UNIQUE(vectorComponents "${ITK_WRAP_VECTOR_COMPONENTS};2;3;4;5") foreach(component ${vectorComponents}) - foreach(vt ${WRAP_ITK_VECTOR_REAL}) - foreach(d ${imageDimensions}) - itk_wrap_template("CI${ITKM_${vt}${component}}${d}" "itk::CudaImage<${ITKT_${vt}${component}}, ${d}>") - itk_wrap_template("CI${ITKM_${vt}${component}}${d}CI${ITKM_${vt}${component}}${d}" - "itk::CudaImage<${ITKT_${vt}${component}}, ${d}>, itk::CudaImage<${ITKT_${vt}${component}}, ${d}>") - endforeach() + foreach(d ${imageDimensions}) + itk_wrap_template("CI${ITKM_VF${component}}${d}" "itk::CudaImage<${ITKT_VF${component}}, ${d}>") + itk_wrap_template("CI${ITKM_VF${component}}${d}CI${ITKM_VF${component}}${d}" + "itk::CudaImage<${ITKT_VF${component}}, ${d}>, itk::CudaImage<${ITKT_VF${component}}, ${d}>") endforeach() endforeach() diff --git a/wrapping/rtkBackProjectionImageFilter.wrap b/wrapping/rtkBackProjectionImageFilter.wrap index 321256d52..44d947673 100644 --- a/wrapping/rtkBackProjectionImageFilter.wrap +++ b/wrapping/rtkBackProjectionImageFilter.wrap @@ -13,10 +13,8 @@ itk_wrap_class("rtk::BackProjectionImageFilter" POINTER) # Force VECTOR_COMPONENTS to "2;3;4;5" set(vectorComponents 2 3 4 5) foreach(component ${vectorComponents}) - foreach(vt ${WRAP_ITK_VECTOR_REAL}) - itk_wrap_template("CI${ITKM_${vt}${component}}3CI${ITKM_${vt}${component}}3" - "itk::CudaImage<${ITKT_${vt}${component}}, 3>, itk::CudaImage<${ITKT_${vt}${component}}, 3>") - endforeach() + itk_wrap_template("CI${ITKM_VF${component}}3CI${ITKM_VF${component}}3" + "itk::CudaImage<${ITKT_VF${component}}, 3>, itk::CudaImage<${ITKT_VF${component}}, 3>") endforeach() endif() @@ -33,10 +31,8 @@ if(RTK_USE_CUDA) # Force VECTOR_COMPONENTS to "2;3;4;5" set(vectorComponents 2 3 4 5) foreach(component ${vectorComponents}) - foreach(vt ${WRAP_ITK_VECTOR_REAL}) - itk_wrap_template("CI${ITKM_${vt}${component}}3CI${ITKM_${vt}${component}}3BPCI${ITKM_${vt}${component}}3CI${ITKM_${vt}${component}}3" - "itk::CudaImage<${ITKT_${vt}${component}}, 3>, itk::CudaImage<${ITKT_${vt}${component}}, 3>, rtk::BackProjectionImageFilter< itk::CudaImage<${ITKT_${vt}${component}}, 3>, itk::CudaImage<${ITKT_${vt}${component}}, 3> >") - endforeach() + itk_wrap_template("CI${ITKM_VF${component}}3CI${ITKM_VF${component}}3BPCI${ITKM_VF${component}}3CI${ITKM_VF${component}}3" + "itk::CudaImage<${ITKT_VF${component}}, 3>, itk::CudaImage<${ITKT_VF${component}}, 3>, rtk::BackProjectionImageFilter< itk::CudaImage<${ITKT_VF${component}}, 3>, itk::CudaImage<${ITKT_VF${component}}, 3> >") endforeach() itk_end_wrap_class() @@ -49,10 +45,8 @@ if(RTK_USE_CUDA) # Force VECTOR_COMPONENTS to "2;3;4;5" set(vectorComponents 2 3 4 5) foreach(component ${vectorComponents}) - foreach(vt ${WRAP_ITK_VECTOR_REAL}) - itk_wrap_template("CI${ITKM_${vt}${component}}3CI${ITKM_${vt}${component}}3BPCI${ITKM_${vt}${component}}3CI${ITKM_${vt}${component}}3" - "itk::CudaImage<${ITKT_${vt}${component}}, 3>, itk::CudaImage<${ITKT_${vt}${component}}, 3>, rtk::BackProjectionImageFilter< itk::CudaImage<${ITKT_${vt}${component}}, 3>, itk::CudaImage<${ITKT_${vt}${component}}, 3> >") - endforeach() + itk_wrap_template("CI${ITKM_VF${component}}3CI${ITKM_VF${component}}3BPCI${ITKM_VF${component}}3CI${ITKM_VF${component}}3" + "itk::CudaImage<${ITKT_VF${component}}, 3>, itk::CudaImage<${ITKT_VF${component}}, 3>, rtk::BackProjectionImageFilter< itk::CudaImage<${ITKT_VF${component}}, 3>, itk::CudaImage<${ITKT_VF${component}}, 3> >") endforeach() itk_end_wrap_class() diff --git a/wrapping/rtkCudaBackProjectionImageFilter.wrap b/wrapping/rtkCudaBackProjectionImageFilter.wrap index d831c1894..58c503bd7 100644 --- a/wrapping/rtkCudaBackProjectionImageFilter.wrap +++ b/wrapping/rtkCudaBackProjectionImageFilter.wrap @@ -7,9 +7,7 @@ if(RTK_USE_CUDA) # Force VECTOR_COMPONENTS to "2;3;4;5" set(vectorComponents 2 3 4 5) foreach(component ${vectorComponents}) - foreach(vt ${WRAP_ITK_VECTOR_REAL}) - itk_wrap_template("CI${ITKM_${vt}${component}}3" "itk::CudaImage<${ITKT_${vt}${component}}, 3>") - endforeach() + itk_wrap_template("CI${ITKM_VF${component}}3" "itk::CudaImage<${ITKT_VF${component}}, 3>") endforeach() itk_end_wrap_class() diff --git a/wrapping/rtkCudaForwardProjectionImageFilter.wrap b/wrapping/rtkCudaForwardProjectionImageFilter.wrap index 0ae4b47f0..534dcc8dc 100644 --- a/wrapping/rtkCudaForwardProjectionImageFilter.wrap +++ b/wrapping/rtkCudaForwardProjectionImageFilter.wrap @@ -8,10 +8,8 @@ if(RTK_USE_CUDA) # Force VECTOR_COMPONENTS to "2;3;4;5" set(vectorComponents 2 3 4 5) foreach(component ${vectorComponents}) - foreach(vt ${WRAP_ITK_VECTOR_REAL}) - itk_wrap_template("CI${ITKM_${vt}${component}}3CI${ITKM_${vt}${component}}3FPCI${ITKM_${vt}${component}}3CI${ITKM_${vt}${component}}3" - "itk::CudaImage<${ITKT_${vt}${component}}, 3>, itk::CudaImage<${ITKT_${vt}${component}}, 3>, rtk::ForwardProjectionImageFilter< itk::CudaImage<${ITKT_${vt}${component}}, 3>, itk::CudaImage<${ITKT_${vt}${component}}, 3> >") - endforeach() + itk_wrap_template("CI${ITKM_VF${component}}3CI${ITKM_VF${component}}3FPCI${ITKM_VF${component}}3CI${ITKM_VF${component}}3" + "itk::CudaImage<${ITKT_VF${component}}, 3>, itk::CudaImage<${ITKT_VF${component}}, 3>, rtk::ForwardProjectionImageFilter< itk::CudaImage<${ITKT_VF${component}}, 3>, itk::CudaImage<${ITKT_VF${component}}, 3> >") endforeach() itk_end_wrap_class() @@ -24,10 +22,8 @@ if(RTK_USE_CUDA) # Force VECTOR_COMPONENTS to "2;3;4;5" set(vectorComponents 2 3 4 5) foreach(component ${vectorComponents}) - foreach(vt ${WRAP_ITK_VECTOR_REAL}) - itk_wrap_template("CI${ITKM_${vt}${component}}3CI${ITKM_${vt}${component}}3FPCI${ITKM_${vt}${component}}3CI${ITKM_${vt}${component}}3" - "itk::CudaImage<${ITKT_${vt}${component}}, 3>, itk::CudaImage<${ITKT_${vt}${component}}, 3>, rtk::ForwardProjectionImageFilter< itk::CudaImage<${ITKT_${vt}${component}}, 3>, itk::CudaImage<${ITKT_${vt}${component}}, 3> >") - endforeach() + itk_wrap_template("CI${ITKM_VF${component}}3CI${ITKM_VF${component}}3FPCI${ITKM_VF${component}}3CI${ITKM_VF${component}}3" + "itk::CudaImage<${ITKT_VF${component}}, 3>, itk::CudaImage<${ITKT_VF${component}}, 3>, rtk::ForwardProjectionImageFilter< itk::CudaImage<${ITKT_VF${component}}, 3>, itk::CudaImage<${ITKT_VF${component}}, 3> >") endforeach() itk_end_wrap_class() @@ -39,9 +35,7 @@ if(RTK_USE_CUDA) # Force VECTOR_COMPONENTS to "2;3;4;5" set(vectorComponents 2 3 4 5) foreach(component ${vectorComponents}) - foreach(vt ${WRAP_ITK_VECTOR_REAL}) - itk_wrap_template("CI${ITKM_${vt}${component}}3" "itk::CudaImage<${ITKT_${vt}${component}}, 3>") - endforeach() + itk_wrap_template("CI${ITKM_VF${component}}3" "itk::CudaImage<${ITKT_VF${component}}, 3>") endforeach() itk_end_wrap_class() diff --git a/wrapping/rtkForwardProjectionImageFilter.wrap b/wrapping/rtkForwardProjectionImageFilter.wrap index f794fda86..cf01b38a8 100644 --- a/wrapping/rtkForwardProjectionImageFilter.wrap +++ b/wrapping/rtkForwardProjectionImageFilter.wrap @@ -14,14 +14,11 @@ itk_wrap_class("rtk::ForwardProjectionImageFilter" POINTER) set(vectorComponents 2 3 4 5) foreach(component ${vectorComponents}) foreach(vt ${WRAP_ITK_VECTOR_REAL}) - itk_wrap_template("I${ITKM_${vt}${component}}3I${ITKM_${vt}${component}}3" "itk::Image<${ITKT_${vt}${component}},3>, itk::Image<${ITKT_${vt}${component}},3>") - - if(RTK_USE_CUDA) - itk_wrap_template("CI${ITKM_${vt}${component}}3CI${ITKM_${vt}${component}}3" "itk::CudaImage<${ITKT_${vt}${component}}, 3>, itk::CudaImage<${ITKT_${vt}${component}}, 3>") - endif() - endforeach() + if(RTK_USE_CUDA) + itk_wrap_template("CI${ITKM_VF${component}}3CI${ITKM_VF${component}}3" "itk::CudaImage<${ITKT_VF${component}}, 3>, itk::CudaImage<${ITKT_VF${component}}, 3>") + endif() endforeach() itk_end_wrap_class() diff --git a/wrapping/rtkIterativeConeBeamReconstructionFilter.wrap b/wrapping/rtkIterativeConeBeamReconstructionFilter.wrap index 36b4c0247..5eccad6cf 100644 --- a/wrapping/rtkIterativeConeBeamReconstructionFilter.wrap +++ b/wrapping/rtkIterativeConeBeamReconstructionFilter.wrap @@ -20,11 +20,10 @@ itk_wrap_class("rtk::IterativeConeBeamReconstructionFilter" POINTER) foreach(v ${vectorComponents}) foreach(vt ${WRAP_ITK_VECTOR_REAL}) itk_wrap_template("I${ITKM_${vt}${v}}3I${ITKM_${vt}${v}}3" "itk::Image<${ITKT_${vt}${v}}, 3>, itk::Image<${ITKT_${vt}${v}}, 3>") - - if(RTK_USE_CUDA) - itk_wrap_template("CI${ITKM_${vt}${v}}3CI${ITKM_${vt}${v}}3" "itk::CudaImage<${ITKT_${vt}${v}}, 3>, itk::CudaImage<${ITKT_${vt}${v}}, 3>") - endif() endforeach() + if(RTK_USE_CUDA) + itk_wrap_template("CI${ITKM_VF${v}}3CI${ITKM_VF${v}}3" "itk::CudaImage<${ITKT_VF${v}}, 3>, itk::CudaImage<${ITKT_VF${v}}, 3>") + endif() endforeach() itk_end_wrap_class() diff --git a/wrapping/rtkMechlemOneStepSpectralReconstructionFilter.wrap b/wrapping/rtkMechlemOneStepSpectralReconstructionFilter.wrap index fcb66ce5c..93cd14a54 100644 --- a/wrapping/rtkMechlemOneStepSpectralReconstructionFilter.wrap +++ b/wrapping/rtkMechlemOneStepSpectralReconstructionFilter.wrap @@ -9,11 +9,11 @@ itk_wrap_class("rtk::MechlemOneStepSpectralReconstructionFilter" POINTER) itk_wrap_template("I${ITKM_${vt}${nmat}}3I${ITKM_${vt}${nbin}}3I${ITKM_F}3" "itk::Image<${ITKT_${vt}${nmat}},3>, itk::Image<${ITKT_${vt}${nbin}},3>, itk::Image<${ITKT_F},3>") - if(RTK_USE_CUDA) - itk_wrap_template("CI${ITKM_${vt}${nmat}}3CI${ITKM_${vt}${nbin}}3CI${ITKM_F}3" "itk::CudaImage<${ITKT_${vt}${nmat}},3>, itk::CudaImage<${ITKT_${vt}${nbin}},3>, itk::CudaImage<${ITKT_F},3>") - endif() - endforeach() + + if(RTK_USE_CUDA) + itk_wrap_template("CI${ITKM_VF${nmat}}3CI${ITKM_VF${nbin}}3CI${ITKM_F}3" "itk::CudaImage<${ITKT_VF${nmat}},3>, itk::CudaImage<${ITKT_VF${nbin}},3>, itk::CudaImage<${ITKT_F},3>") + endif() endforeach() endforeach()