COMP: Fix Python redefinition warnings with default options

RTKConsortium · Jan 28, 2024 · c32c1e9 · c32c1e9
1 parent 0cc6639
commit c32c1e9
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 59 deletions.
diff --git a/.github/workflows/build-test-package-python-cuda.yml b/.github/workflows/build-test-package-python-cuda.yml
@@ -7,7 +7,7 @@ env:
   itk-wheel-tag: 'v5.4rc01'
   itk-python-package-tag: '5ad02309321621cdc7269b9b68a35013c912271c'
   itk-python-package-org: 'InsightSoftwareConsortium'
-  itk-module-deps: "RTKConsortium/ITKCudaCommon@v1.0.1"
+  itk-module-deps: "RTKConsortium/ITKCudaCommon@b4f15f28fe7547f43de543b229d1a962df828e7f"
 
 jobs:
   build-linux-cuda-python-packages:

diff --git a/wrapping/itkCudaImageDataManagerRTK.wrap b/wrapping/itkCudaImageDataManagerRTK.wrap
@@ -8,7 +8,7 @@ if(RTK_USE_CUDA)
     list(FIND ITK_WRAP_IMAGE_DIMS "4" _index)
     if(${_index} EQUAL -1)
       itk_wrap_template("CI${ITKM_F}4" "itk::CudaImage<${ITKT_F}, 4>")
-      foreach(c 2 3 4 5)
+      foreach(c 2 3 4)
         itk_wrap_template("CI${ITKM_VF${c}}4" "itk::CudaImage<${ITKT_VF${c}}, 4>")
         itk_wrap_template("CI${ITKM_CVF${c}}4" "itk::CudaImage<${ITKT_CVF${c}}, 4>")
       endforeach()

diff --git a/wrapping/itkCudaImageRTK.wrap b/wrapping/itkCudaImageRTK.wrap
@@ -6,7 +6,7 @@ if(RTK_USE_CUDA)
     list(FIND ITK_WRAP_IMAGE_DIMS "4" _index)
     if (${_index} EQUAL -1)
       itk_wrap_template("F4" "${ITKT_F}, 4")
-      foreach(c 2 3 4 5)
+      foreach(c 2 3 4)
         itk_wrap_template("${ITKM_VF${c}}4" "${ITKT_VF${c}}, 4")
         itk_wrap_template("${ITKM_CVF${c}}4" "${ITKT_CVF${c}}, 4")
       endforeach()

diff --git a/wrapping/itkImageSourceRTK.wrap b/wrapping/itkImageSourceRTK.wrap
@@ -41,19 +41,41 @@ itk_wrap_class("itk::ImageSource" POINTER)
     if (ITK_WRAP_double)
       itk_wrap_template("ID4" "itk::Image<${ITKT_D}, 4>")
     endif()
-    if(RTK_USE_CUDA)
+  endif()
+
+  # Wrap CUDA types
+  if(RTK_USE_CUDA)
+    itk_wrap_include(itkCudaImage.h)
+
+    # Wrap ITK dimension 4 missing types
+    list(FIND ITK_WRAP_IMAGE_DIMS "4" _index)
+    if (${_index} EQUAL -1)
       itk_wrap_template("CIF4" "itk::CudaImage<${ITKT_F}, 4>")
     endif()
+
+    # Force VECTOR_COMPONENTS to "2;3;4;5"
+    UNIQUE(imageDimensions "${ITK_WRAP_IMAGE_DIMS};2;3;4")
+    UNIQUE(vectorComponents "${ITK_WRAP_VECTOR_COMPONENTS};2;3;4;5")
+    foreach(c ${vectorComponents})
+      foreach(d ${imageDimensions})
+        list(FIND ITK_WRAP_IMAGE_DIMS "${d}" _indexd)
+        list(FIND ITK_WRAP_VECTOR_COMPONENTS "${c}" _indexc)
+        if (${_indexd} EQUAL -1 OR ${_indexc} EQUAL -1)
+          itk_wrap_template("CI${ITKM_VF${c}}${d}" "itk::CudaImage<${ITKT_VF${c}}, ${d}>")
+        endif()
+      endforeach()
+    endforeach()
+
   endif()
 
   # Force ITK_WRAP_IMAGE_DIMS to contain "2;3;4"
   UNIQUE(imageDimensions "${ITK_WRAP_IMAGE_DIMS};2;3;4")
-  set(vectorComponents 2 3 4 5)
+  set(vectorComponents "2;3;4;5")
   remove(vectorComponents "${vectorComponents}" "${ITK_WRAP_VECTOR_COMPONENTS}")
-  foreach(component ${vectorComponents})
+  foreach(c ${vectorComponents})
     foreach(vt ${WRAP_ITK_VECTOR_REAL})
       foreach(d ${imageDimensions})
-        itk_wrap_template("I${ITKM_${vt}${component}}${d}" "itk::Image<${ITKT_${vt}${component}}, ${d}>")
+        itk_wrap_template("I${ITKM_${vt}${c}}${d}" "itk::Image<${ITKT_${vt}${c}}, ${d}>")
       endforeach()
     endforeach()
   endforeach()
@@ -64,37 +86,13 @@ itk_wrap_class("itk::ImageSource" POINTER)
     list(FIND ITK_WRAP_IMAGE_DIMS "${d}" _index)
     if (${_index} EQUAL -1)
       foreach(vt ${WRAP_ITK_VECTOR_REAL})
-        foreach(component ${ITK_WRAP_VECTOR_COMPONENTS})
-          itk_wrap_template("I${ITKM_${vt}${component}}${d}" "itk::Image<${ITKT_${vt}${component}}, ${d}>")
+        foreach(c ${ITK_WRAP_VECTOR_COMPONENTS})
+          itk_wrap_template("I${ITKM_${vt}${c}}${d}" "itk::Image<${ITKT_${vt}${c}}, ${d}>")
         endforeach()
       endforeach()
     endif()
   endforeach()
 
-  # Wrap CUDA types
-  if(RTK_USE_CUDA)
-    itk_wrap_include(itkCudaImage.h)
-    foreach(d ${ITK_WRAP_IMAGE_DIMS})
-      itk_wrap_template("CI${ITKM_F}${d}" "itk::CudaImage<${ITKT_F}, ${d}>")
-    endforeach()
-
-    # Wrap ITK dimension 4 missing types
-    list(FIND ITK_WRAP_IMAGE_DIMS "4" _index)
-    if (${_index} EQUAL -1)
-      itk_wrap_template("CIF4" "itk::CudaImage<${ITKT_F}, 4>")
-    endif()
-
-    # Force VECTOR_COMPONENTS to "2;3;4;5"
-    UNIQUE(imageDimensions "${ITK_WRAP_IMAGE_DIMS};2;3;4")
-    UNIQUE(vectorComponents "${ITK_WRAP_VECTOR_COMPONENTS};2;3;4;5")
-    foreach(component ${vectorComponents})
-      foreach(d ${imageDimensions})
-        itk_wrap_template("CI${ITKM_VF${component}}${d}" "itk::CudaImage<${ITKT_VF${component}}, ${d}>")
-      endforeach()
-    endforeach()
-
-  endif()
-
   # Wrap ITK CovariantVector missing types
   if (NOT ITK_WRAP_covariant_vector_double)
 

diff --git a/wrapping/itkImageToImageFilterRTK.wrap b/wrapping/itkImageToImageFilterRTK.wrap
@@ -1,6 +1,6 @@
 itk_wrap_class("itk::ImageToImageFilter" POINTER)
 
-  # Wrap ITK double missing types --
+  # Wrap ITK double missing types
   if (NOT ITK_WRAP_double)
     itk_wrap_template("ID1ID1" "itk::Image<${ITKT_D}, 1>, itk::Image<${ITKT_D}, 1>")
     itk_wrap_template("ID3ID2" "itk::Image<${ITKT_D}, 3>, itk::Image<${ITKT_D}, 2>")
@@ -52,44 +52,44 @@ itk_wrap_class("itk::ImageToImageFilter" POINTER)
     endif()
   endif()
 
+  # Wrap CUDA types
   if(RTK_USE_CUDA)
     itk_wrap_include(itkCudaImage.h)
-    foreach(d ${ITK_WRAP_IMAGE_DIMS})
-      itk_wrap_template("CI${ITKM_F}${d}CI${ITKM_F}${d}"
-        "itk::CudaImage<${ITKT_F}, ${d}>, itk::CudaImage<${ITKT_F}, ${d}>")
-    endforeach()
 
     # Wrap ITK dimension 4 missing types
     list(FIND ITK_WRAP_IMAGE_DIMS "4" _index)
     if (${_index} EQUAL -1)
-      itk_wrap_template("CIF4CIF4" "itk::CudaImage<${ITKT_F}, 4>, itk::CudaImage<${ITKT_F}, 4>")
+      itk_wrap_template("CI${ITKM_F}4CI${ITKM_F}4"
+        "itk::CudaImage<${ITKT_F}, 4>, itk::CudaImage<${ITKT_F}, 4>")
     endif()
 
     # Force VECTOR_COMPONENTS to "2;3;4;5"
     UNIQUE(imageDimensions "${ITK_WRAP_IMAGE_DIMS};2;3;4")
     UNIQUE(vectorComponents "${ITK_WRAP_VECTOR_COMPONENTS};2;3;4;5")
-    foreach(component ${vectorComponents})
+    foreach(c ${vectorComponents})
       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}>")
+        list(FIND ITK_WRAP_IMAGE_DIMS "${d}" _indexd)
+        list(FIND ITK_WRAP_VECTOR_COMPONENTS "${c}" _indexc)
+        if (${_indexd} EQUAL -1 OR ${_indexc} EQUAL -1)
+          itk_wrap_template("CI${ITKM_VF${c}}${d}CI${ITKM_VF${c}}${d}"
+          "itk::CudaImage<${ITKT_VF${c}}, ${d}>, itk::CudaImage<${ITKT_VF${c}}, ${d}>")
+        endif()
       endforeach()
     endforeach()
 
   endif()
 
   # Force ITK_WRAP_IMAGE_DIMS to contain "2;3;4"
   UNIQUE(imageDimensions "${ITK_WRAP_IMAGE_DIMS};2;3;4")
-  set(vectorComponents 2 3 4 5)
-  foreach(component ${vectorComponents})
-    list(FIND ITK_WRAP_VECTOR_COMPONENTS "${component}" _index)
-    if (${_index} EQUAL -1)
-      foreach(vt ${WRAP_ITK_VECTOR_REAL})
-        foreach(d ${imageDimensions})
-          itk_wrap_template("I${ITKM_${vt}${component}}${d}I${ITKM_${vt}${component}}${d}"
-            "itk::Image<${ITKT_${vt}${component}}, ${d}>, itk::Image<${ITKT_${vt}${component}}, ${d}>")
-        endforeach()
+  set(vectorComponents "2;3;4;5")
+  remove(vectorComponents "${vectorComponents}" "${ITK_WRAP_VECTOR_COMPONENTS}")
+  foreach(c ${vectorComponents})
+    foreach(vt ${WRAP_ITK_VECTOR_REAL})
+      foreach(d ${imageDimensions})
+        itk_wrap_template("I${ITKM_${vt}${c}}${d}I${ITKM_${vt}${c}}${d}"
+          "itk::Image<${ITKT_${vt}${c}}, ${d}>, itk::Image<${ITKT_${vt}${c}}, ${d}>")
       endforeach()
-    endif()
+    endforeach()
   endforeach()
 
   # Force ITK_WRAP_VECTOR_COMPONENTS to contain "2;3;4;5"
@@ -101,19 +101,19 @@ itk_wrap_class("itk::ImageToImageFilter" POINTER)
     list(FIND ITK_WRAP_IMAGE_DIMS "${d}" _index)
     if (${_index} EQUAL -1)
       foreach(vt ${WRAP_ITK_VECTOR_REAL})
-        foreach(component ${ITK_WRAP_VECTOR_COMPONENTS})
-          itk_wrap_template("I${ITKM_${vt}${component}}${d}I${ITKM_${vt}${component}}${d}"
-            "itk::Image<${ITKT_${vt}${component}}, ${d}>, itk::Image<${ITKT_${vt}${component}}, ${d}>")
+        foreach(c ${ITK_WRAP_VECTOR_COMPONENTS})
+          itk_wrap_template("I${ITKM_${vt}${c}}${d}I${ITKM_${vt}${c}}${d}"
+            "itk::Image<${ITKT_${vt}${c}}, ${d}>, itk::Image<${ITKT_${vt}${c}}, ${d}>")
         endforeach()
       endforeach()
     endif()
   endforeach()
 
   # Combination
   set(vectorComponents 2 3 4 5)
-  foreach(component ${vectorComponents})
+  foreach(c ${vectorComponents})
     foreach(vt ${WRAP_ITK_VECTOR_REAL})
-      itk_wrap_template("I${ITKM_${vt}${component}}4I${ITKM_${vt}${component}}3" "itk::Image<${ITKT_${vt}${component}}, 4>, itk::Image<${ITKT_${vt}${component}}, 3>")
+      itk_wrap_template("I${ITKM_${vt}${c}}4I${ITKM_${vt}${c}}3" "itk::Image<${ITKT_${vt}${c}}, 4>, itk::Image<${ITKT_${vt}${c}}, 3>")
     endforeach()
   endforeach()
 
@@ -140,5 +140,3 @@ itk_wrap_class("itk::ImageToImageFilter" POINTER)
   endforeach()
 
 itk_end_wrap_class()
-
-