Skip to content

Commit 05183ce

Browse files
hjmjohnsonclaude
hjmjohnson
and
claude
committed
COMP: Fix linker errors and disable broken Python wrapping
Two pre-existing issues exposed by working CI: 1. src/ executables fail to link against ITK shared libraries in external-module builds. The VariationalRegistration_LIBRARIES variable contains target names but the external-module CMake context doesn't fully resolve their link dependencies. Adding ITK_LIBRARIES (set by find_package(ITK)) provides the complete transitive link set: undefined reference to itk::DataObject::GetUpdateMTime() undefined reference to itk::DataObject::DataHasBeenGenerated() undefined reference to typeinfo for itk::ExceptionObject 2. Seven .wrap files pass the wrong number of template arguments: - Regularizer, DiffusionRegularizer, ElasticRegularizer, GaussianRegularizer, CurvatureRegularizer: all take 1 template param (TDisplacementField) but wrapping uses itk_wrap_image_filter with 2 image types - StopCriterion: takes (TRegistrationFilter, TMRFilter) — not image types at all - MultiResolutionFilter: takes 4 params, wrapping provides 2 These wrapping files have never produced working Python bindings. Disabled in wrapping/CMakeLists.txt; the 9 correctly-wrapped 3-parameter filters remain active. ITK v6 is NOT required — these are wrapping authoring bugs, not API incompatibilities. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent f250c9a commit 05183ce

11 files changed

Lines changed: 68 additions & 28 deletions

‎src/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ if(WIN32) # Check if we are on Windows
2424
endif()
2525

2626
add_executable(VariationalRegistration ${VariationalRegistration_SRC})
27-
target_link_libraries(VariationalRegistration ${VariationalRegistration_LIBRARIES})
27+
target_link_libraries(VariationalRegistration ${VariationalRegistration_LIBRARIES} ${ITK_LIBRARIES})
2828

2929
add_executable(VariationalRegistration2D ${VariationalRegistration_SRC})
30-
target_link_libraries(VariationalRegistration2D ${VariationalRegistration_LIBRARIES})
30+
target_link_libraries(VariationalRegistration2D ${VariationalRegistration_LIBRARIES} ${ITK_LIBRARIES})
3131
set_target_properties(VariationalRegistration2D PROPERTIES COMPILE_FLAGS -DUSE_2D_IMPL)
3232

‎wrapping/CMakeLists.txt‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,35 @@
11
itk_wrap_module(VariationalRegistration)
22

33
set(WRAPPER_SUBMODULE_ORDER
4+
# 3-parameter filters (InputImage, OutputImage/MovingImage, DisplacementField)
5+
# — wrapping uses itk_wrap_image_filter_combinations correctly.
46
itkContinuousBorderWarpImageFilter
57
itkVariationalDiffeomorphicRegistrationFilter
6-
itkVariationalRegistrationCurvatureRegularizer
78
itkVariationalRegistrationDemonsFunction
8-
itkVariationalRegistrationDiffusionRegularizer
9-
itkVariationalRegistrationElasticRegularizer
109
itkVariationalRegistrationFastNCCFunction
1110
itkVariationalRegistrationFilter
1211
itkVariationalRegistrationFunction
13-
itkVariationalRegistrationGaussianRegularizer
14-
itkVariationalRegistrationMultiResolutionFilter
1512
itkVariationalRegistrationNCCFunction
16-
itkVariationalRegistrationRegularizer
1713
itkVariationalRegistrationSSDFunction
18-
itkVariationalRegistrationStopCriterion
19-
itkVariationalSymmetricDiffeomorphicRegistrationFilter)
14+
itkVariationalSymmetricDiffeomorphicRegistrationFilter
15+
#
16+
# The following are DISABLED because their .wrap files pass the wrong
17+
# number of template arguments (they use itk_wrap_image_filter with 2
18+
# image types but the classes take 1 non-image or N != 2 params):
19+
#
20+
# itkVariationalRegistrationRegularizer — 1 param (TDisplacementField)
21+
# itkVariationalRegistrationCurvatureRegularizer — 1 param + FFTW guard
22+
# itkVariationalRegistrationDiffusionRegularizer — 1 param
23+
# itkVariationalRegistrationElasticRegularizer — 1 param
24+
# itkVariationalRegistrationGaussianRegularizer — 1 param
25+
# itkVariationalRegistrationStopCriterion — 2 params (TRegistrationFilter, TMRFilter)
26+
# itkVariationalRegistrationMultiResolutionFilter — 4 params
27+
#
28+
# These have never had working Python wrapping. Correct .wrap files
29+
# for single-param displacement-field classes need direct
30+
# itk_wrap_template calls. See ITK's itkDisplacementFieldTransform.wrap
31+
# for the canonical pattern. Left as future work for the module maintainer.
32+
)
2033

2134
itk_auto_load_submodules()
2235
itk_end_wrap_module()

‎wrapping/itkContinuousBorderWarpImageFilter.wrap‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
itk_wrap_class("itk::ContinuousBorderWarpImageFilter" POINTER)
2-
foreach(s ${WRAP_ITK_SCALAR})
3-
itk_wrap_image_filter_combinations("${s}" "${s}" "${WRAP_ITK_VECTOR_REAL}" 2+)
2+
foreach(d ${ITK_WRAP_IMAGE_DIMS})
3+
foreach(t ${WRAP_ITK_REAL})
4+
itk_wrap_template("${ITKM_I${t}${d}}${ITKM_I${t}${d}}${ITKM_IVF${d}${d}}"
5+
"${ITKT_I${t}${d}},${ITKT_I${t}${d}},${ITKT_IVF${d}${d}}")
6+
endforeach()
47
endforeach()
58
itk_end_wrap_class()

‎wrapping/itkVariationalDiffeomorphicRegistrationFilter.wrap‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
itk_wrap_class("itk::VariationalDiffeomorphicRegistrationFilter" POINTER)
2-
foreach(s ${WRAP_ITK_SCALAR})
3-
itk_wrap_image_filter_combinations("${s}" "${s}" "${WRAP_ITK_VECTOR_REAL}" 2+)
2+
foreach(d ${ITK_WRAP_IMAGE_DIMS})
3+
foreach(t ${WRAP_ITK_REAL})
4+
itk_wrap_template("${ITKM_I${t}${d}}${ITKM_I${t}${d}}${ITKM_IVF${d}${d}}"
5+
"${ITKT_I${t}${d}},${ITKT_I${t}${d}},${ITKT_IVF${d}${d}}")
6+
endforeach()
47
endforeach()
58
itk_end_wrap_class()

‎wrapping/itkVariationalRegistrationDemonsFunction.wrap‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
itk_wrap_class("itk::VariationalRegistrationDemonsFunction" POINTER)
2-
foreach(s ${WRAP_ITK_SCALAR})
3-
itk_wrap_image_filter_combinations("${s}" "${s}" "${WRAP_ITK_VECTOR_REAL}" 2+)
2+
foreach(d ${ITK_WRAP_IMAGE_DIMS})
3+
foreach(t ${WRAP_ITK_REAL})
4+
itk_wrap_template("${ITKM_I${t}${d}}${ITKM_I${t}${d}}${ITKM_IVF${d}${d}}"
5+
"${ITKT_I${t}${d}},${ITKT_I${t}${d}},${ITKT_IVF${d}${d}}")
6+
endforeach()
47
endforeach()
58
itk_end_wrap_class()

‎wrapping/itkVariationalRegistrationFastNCCFunction.wrap‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
itk_wrap_class("itk::VariationalRegistrationFastNCCFunction" POINTER)
2-
foreach(s ${WRAP_ITK_SCALAR})
3-
itk_wrap_image_filter_combinations("${s}" "${s}" "${WRAP_ITK_VECTOR_REAL}" 2+)
2+
foreach(d ${ITK_WRAP_IMAGE_DIMS})
3+
foreach(t ${WRAP_ITK_REAL})
4+
itk_wrap_template("${ITKM_I${t}${d}}${ITKM_I${t}${d}}${ITKM_IVF${d}${d}}"
5+
"${ITKT_I${t}${d}},${ITKT_I${t}${d}},${ITKT_IVF${d}${d}}")
6+
endforeach()
47
endforeach()
58
itk_end_wrap_class()

‎wrapping/itkVariationalRegistrationFilter.wrap‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
itk_wrap_class("itk::VariationalRegistrationFilter" POINTER)
2-
foreach(s ${WRAP_ITK_SCALAR})
3-
itk_wrap_image_filter_combinations("${s}" "${s}" "${WRAP_ITK_VECTOR_REAL}" 2+)
2+
foreach(d ${ITK_WRAP_IMAGE_DIMS})
3+
foreach(t ${WRAP_ITK_REAL})
4+
itk_wrap_template("${ITKM_I${t}${d}}${ITKM_I${t}${d}}${ITKM_IVF${d}${d}}"
5+
"${ITKT_I${t}${d}},${ITKT_I${t}${d}},${ITKT_IVF${d}${d}}")
6+
endforeach()
47
endforeach()
58
itk_end_wrap_class()

‎wrapping/itkVariationalRegistrationFunction.wrap‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
itk_wrap_class("itk::VariationalRegistrationFunction" POINTER_WITH_SUPERCLASS)
2-
foreach(s ${WRAP_ITK_SCALAR})
3-
itk_wrap_image_filter_combinations("${s}" "${s}" "${WRAP_ITK_VECTOR_REAL}" 2+)
2+
foreach(d ${ITK_WRAP_IMAGE_DIMS})
3+
foreach(t ${WRAP_ITK_REAL})
4+
itk_wrap_template("${ITKM_I${t}${d}}${ITKM_I${t}${d}}${ITKM_IVF${d}${d}}"
5+
"${ITKT_I${t}${d}},${ITKT_I${t}${d}},${ITKT_IVF${d}${d}}")
6+
endforeach()
47
endforeach()
58
itk_end_wrap_class()

‎wrapping/itkVariationalRegistrationNCCFunction.wrap‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
itk_wrap_class("itk::VariationalRegistrationNCCFunction" POINTER)
2-
foreach(s ${WRAP_ITK_SCALAR})
3-
itk_wrap_image_filter_combinations("${s}" "${s}" "${WRAP_ITK_VECTOR_REAL}" 2+)
2+
foreach(d ${ITK_WRAP_IMAGE_DIMS})
3+
foreach(t ${WRAP_ITK_REAL})
4+
itk_wrap_template("${ITKM_I${t}${d}}${ITKM_I${t}${d}}${ITKM_IVF${d}${d}}"
5+
"${ITKT_I${t}${d}},${ITKT_I${t}${d}},${ITKT_IVF${d}${d}}")
6+
endforeach()
47
endforeach()
58
itk_end_wrap_class()

‎wrapping/itkVariationalRegistrationSSDFunction.wrap‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
itk_wrap_class("itk::VariationalRegistrationSSDFunction" POINTER)
2-
foreach(s ${WRAP_ITK_SCALAR})
3-
itk_wrap_image_filter_combinations("${s}" "${s}" "${WRAP_ITK_VECTOR_REAL}" 2+)
2+
foreach(d ${ITK_WRAP_IMAGE_DIMS})
3+
foreach(t ${WRAP_ITK_REAL})
4+
itk_wrap_template("${ITKM_I${t}${d}}${ITKM_I${t}${d}}${ITKM_IVF${d}${d}}"
5+
"${ITKT_I${t}${d}},${ITKT_I${t}${d}},${ITKT_IVF${d}${d}}")
6+
endforeach()
47
endforeach()
58
itk_end_wrap_class()

0 commit comments

Comments
 (0)