Merge pull request #6421 from hjmjohnson/update-vnl-stripped-vxl

ENH: Update vendored VNL to the ITK-stripped numerics-only vxl (UpdateFromUpstream)

Author: hjmjohnson

Modules/Core/Common/wrapping/CMakeLists.txt

@@ -13,8 +13,6 @@ set(
   vnl_c_vector
   vnl_cost_function
   vnl_diag_matrix
-  vnl_file_matrix
-  vnl_file_vector
   vnl_fortran_copy
   vnl_least_squares_function
   vnl_matrix_fixed

Modules/Core/Common/wrapping/vnl_file_matrix.wrap

@@ -20,104 +20,14 @@ if(ITK_USE_SYSTEM_VXL)
     vnl
     v3p_netlib
     netlib
-    vcl
   )
   set(ITKVNL_SYSTEM_LIBRARY_DIRS "${VXL_LIBRARY_DIR}")
   set(ITKVNL_NO_SRC 1)
 else()
-  # ITKv5 no longer supports legacy method signatures for VNL
-  set(
-    VNL_CONFIG_LEGACY_METHODS
-    OFF
-    CACHE BOOL
-    "Whether backward-compatibility methods are provided by vnl."
-    FORCE
-  )
-  set(VNL_CONFIG_CHECK_BOUNDS OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_BUILD_CONTRIB OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_BUILD_CORE_GEOMETRY OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_BUILD_CORE_IMAGING OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_BUILD_CORE_NUMERICS ON CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(
-    VXL_BUILD_CORE_NUMERICS_ONLY
-    ON
-    CACHE BOOL
-    "VXL configuration for ITK"
-    FORCE
-  ) #This hides other VXL core options from CMake
-  set(
-    VXL_BUILD_CORE_PROBABILITY
-    OFF
-    CACHE BOOL
-    "VXL configuration for ITK"
-    FORCE
-  )
-  set(
-    VXL_BUILD_CORE_SERIALISATION
-    OFF
-    CACHE BOOL
-    "VXL configuration for ITK"
-    FORCE
-  )
-  set(VXL_BUILD_CORE_UTILITIES OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_BUILD_CORE_VIDEO OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_BUILD_DCMTK OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_BUILD_DOCUMENTATION OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_BUILD_EXAMPLES OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(
-    VXL_BUILD_NONDEPRECATED_ONLY
-    ON
-    CACHE BOOL
-    "VXL configuration for ITK"
-    FORCE
-  )
-  set(
-    VXL_BUILD_OBJECT_LIBRARIES
-    OFF
-    CACHE BOOL
-    "VXL configuration for ITK"
-    FORCE
-  )
-  set(VXL_BUILD_VGUI OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_NO_EXPORT ON CACHE BOOL "VXL configuration for ITK" FORCE)
-  #
-  set(VXL_FORCE_B3P_EXPAT OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_FORCE_B3P_SHAPELIB OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_FORCE_V3P_BZLIB2 OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_FORCE_V3P_CLIPPER OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_FORCE_V3P_DCMTK OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_FORCE_V3P_GEOTIFF OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_FORCE_V3P_J2K OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_FORCE_V3P_JPEG OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_FORCE_V3P_OPENJPEG2 OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_FORCE_V3P_PNG OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_FORCE_V3P_RPLY OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_FORCE_V3P_TIFF OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_FORCE_V3P_ZLIB OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  #
-  set(VXL_RUN_FAILING_TESTS OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(VXL_UPDATE_CONFIGURATION OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  # set(VXL_USE_DCMTK                    OFF CACHE BOOL "VXL configuration for ITK" FORCE) # <- Not visible in itk extracted code
-  # set(VXL_USE_ECW                      OFF CACHE BOOL "VXL configuration for ITK" FORCE) # <- Visible, but unreachable in itk extracted code
-  set(VXL_USE_GEOTIFF OFF CACHE BOOL "VXL configuration for ITK" FORCE)
-  set(
-    VXL_USE_HISTORICAL_IMPLICIT_CONVERSIONS
-    OFF
-    CACHE BOOL
-    "Allow default deprecated implicit conversions."
-    FORCE
-  )
-  set(
-    VXL_USE_HISTORICAL_PROTECTED_IVARS
-    OFF
-    CACHE BOOL
-    "VXL configuration for ITK"
-    FORCE
-  )
-
-  set(VXL_USE_LFS OFF CACHE BOOL "VXL configuration for ITK" FORCE) # <-visible in ITK vnl, must be OFF
-  # set(VXL_VIL_INCLUDE_IMAGE_IO         ON  CACHE BOOL "VXL configuration for ITK" FORCE) # <- not visible in ITK
-  set(VXL_LIB_PREFIX "itk")
+  # The ITK-stripped vxl is numerics-only and hardcodes its former configure
+  # options (bounds-checking off, thread-safe on, core-numerics on, no failing
+  # tests, no introspection), so there are no VXL_* options left to force here;
+  # only the library properties are passed through from ITK.
   set(VXL_LIBRARY_PROPERTIES ${ITK_LIBRARY_PROPERTIES})
 
   set(
@@ -134,7 +44,6 @@ else()
     itkvnl_algo
     itkvnl
     itkv3p_netlib
-    itkvcl
   )
 
   if(ITK_TEMPLATE_VISIBILITY_DEFAULT)
@@ -146,53 +55,4 @@ endif()
 
 itk_module_impl()
 
-mark_as_advanced(
-  FORCE
-  TESTLIB_VCL_WHERE_ROOT_DIR_H
-  VNL_CONFIG_CHECK_BOUNDS
-  VXL_BUILD_CONTRIB
-  VXL_BUILD_CORE_GEOMETRY
-  VXL_BUILD_CORE_IMAGING
-  VXL_BUILD_CORE_NUMERICS
-  VXL_BUILD_CORE_NUMERICS_ONLY
-  VXL_BUILD_CORE_PROBABILITY
-  VXL_BUILD_CORE_SERIALISATION
-  VXL_BUILD_CORE_UTILITIES
-  VXL_BUILD_CORE_VIDEO
-  VXL_BUILD_DCMTK
-  VXL_BUILD_DOCUMENTATION
-  VXL_BUILD_EXAMPLES
-  VXL_BUILD_FOR_VXL_DASHBOARD
-  VXL_BUILD_NONDEPRECATED_ONLY
-  VXL_BUILD_OBJECT_LIBRARIES
-  VXL_BUILD_VGUI
-  VXL_EXTRA_CMAKE_C_FLAGS
-  VXL_EXTRA_CMAKE_CXX_FLAGS
-  VXL_EXTRA_CMAKE_EXE_LINKER_FLAGS
-  VXL_EXTRA_CMAKE_MODULE_LINKER_FLAGS
-  VXL_EXTRA_CMAKE_SHARED_LINKER_FLAGS
-  VXL_FORCE_B3P_EXPAT
-  VXL_FORCE_B3P_SHAPELIB
-  VXL_FORCE_V3P_BZLIB2
-  VXL_FORCE_V3P_CLIPPER
-  VXL_FORCE_V3P_DCMTK
-  VXL_FORCE_V3P_GEOTIFF
-  VXL_FORCE_V3P_J2K
-  VXL_FORCE_V3P_JPEG
-  VXL_FORCE_V3P_OPENJPEG2
-  VXL_FORCE_V3P_PNG
-  VXL_FORCE_V3P_RPLY
-  VXL_FORCE_V3P_TIFF
-  VXL_FORCE_V3P_ZLIB
-  VXL_LEGACY_ERROR_REPORTING
-  VXL_NO_EXPORT
-  VXL_RUN_FAILING_TESTS
-  VXL_UPDATE_CONFIGURATION
-  #VXL_USE_DCMTK <- Not visible in itk extracted code
-  #VXL_USE_ECW   <- Visible, but unreachable in itk extracted code
-  VXL_USE_GEOTIFF # <- Visible, and must be off
-  VXL_USE_HISTORICAL_IMPLICIT_CONVERSIONS # <- forced OFF; ITK targets the modern VNL API
-  VXL_USE_HISTORICAL_PROTECTED_IVARS # <- forced OFF; ITK targets the modern VNL API
-  VXL_USE_LFS # <- Visible, and must be off
-  #VXL_VIL_INCLUDE_IMAGE_IO <- Not visible in itk extracted code
-)
+mark_as_advanced(FORCE TESTLIB_VCL_WHERE_ROOT_DIR_H)

Modules/Core/Common/wrapping/vnl_file_vector.wrap

@@ -5,10 +5,10 @@ set -x
 shopt -s dotglob
 
 readonly name='VXL'
-readonly ownership='VXL Maintainers <vxl-maintainers@lists.sourceforge.net>'
+readonly ownership='Insight Software Consortium Maintainers <https://discourse.itk.org/>'
 readonly subtree="Modules/ThirdParty/VNL/src/vxl"
-readonly repo="https://github.com/vxl/vxl.git"
-readonly tag="master"
+readonly repo="https://github.com/InsightSoftwareConsortium/vxl.git"
+readonly tag="for/itk-vxl-master-272c3f1" # 2026-06-09 (272c3f1: linkage fixes + config-option removals)
 readonly shortlog=false
 readonly exact_tree_match=false
 readonly paths="
@@ -28,9 +28,6 @@ readonly paths="
 extract_source () {
     git_archive
     pushd "${extractdir}/${name}-reduced"
-    rm v3p/netlib/triangle*
-    rm -rf v3p/netlib/toms
-    rm v3p/netlib/examples/showme.c
     echo "* -whitespace" > .gitattributes
     popd
 }

Modules/ThirdParty/VNL/CMakeLists.txt

@@ -20,14 +20,7 @@ set(BUILD_DOCUMENTATION OFF)
 
 add_subdirectory(vxl)
 
-foreach(
-  lib
-  itkvcl
-  itkv3p_netlib
-  itktestlib
-  itkvnl
-  itkvnl_algo
-)
+foreach(lib itkv3p_netlib itktestlib itkvnl itkvnl_algo)
   itk_module_target(${lib} NO_INSTALL)
 endforeach()