Skip to content

Commit

Permalink
COMP: remove wrapping of Cuda double images, incompatible with Cuda code
Browse files Browse the repository at this point in the history 
Fixes RTKConsortium#350
  • Loading branch information
Simon Rit committed May 10, 2020
1 parent 86f2583 commit 0babff4
Show file tree
Hide file tree
Showing 12 changed files with 46 additions and 85 deletions.
16 changes: 4 additions & 12 deletions wrapping/itkCudaImageDataManager.wrap
View file
Expand Up @@ -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()
Expand Down
8 changes: 3 additions & 5 deletions wrapping/itkCudaImageToImageFilter.wrap
View file
Expand Up @@ -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()

Expand Down
8 changes: 3 additions & 5 deletions wrapping/itkCudaInPlaceImageFilter.wrap
View file
Expand Up @@ -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()

Expand Down
19 changes: 7 additions & 12 deletions wrapping/itkImageSourceRTK.wrap
View file
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions wrapping/itkImageToImageFilterRTK.wrap
View file
Expand Up @@ -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()

Expand Down
10 changes: 4 additions & 6 deletions wrapping/itkInPlaceImageFilterRTK.wrap
View file
Expand Up @@ -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()

Expand Down
18 changes: 6 additions & 12 deletions wrapping/rtkBackProjectionImageFilter.wrap
View file
Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand Down
4 changes: 1 addition & 3 deletions wrapping/rtkCudaBackProjectionImageFilter.wrap
View file
Expand Up @@ -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()
Expand Down
16 changes: 5 additions & 11 deletions wrapping/rtkCudaForwardProjectionImageFilter.wrap
View file
Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand Down
9 changes: 3 additions & 6 deletions wrapping/rtkForwardProjectionImageFilter.wrap
View file
Expand Up @@ -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()
7 changes: 3 additions & 4 deletions wrapping/rtkIterativeConeBeamReconstructionFilter.wrap
View file
Expand Up @@ -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()
8 changes: 4 additions & 4 deletions wrapping/rtkMechlemOneStepSpectralReconstructionFilter.wrap
View file
Expand Up @@ -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()

Expand Down

0 comments on commit 0babff4

Please sign in to comment.