Simple VXL update - #6423
Conversation
This comment was marked as resolved.
This comment was marked as resolved.
|
Given the amount of failures, maybe this intermediate step is not advantageous? Leaving it up to you Hans. |
|
@dzenanz Thanks for the suggestion. I think this is a good idea. I will take over this work and syncronize the two back to back updates of VNL. Step 1: Minimal updates against VNL upstream (pushing to VXL/vnl the recommendations where appropriate), then Step 2: Aggressive local changes to the InsightSoftwareConsortium/vxl @ for/itk-vxl-master diet targeted only for what ITK needs |
|
Shouldn't we merge the fixes in VXL first, then re-run the update script here? |
|
@dzenanz vxl/vxl#1049 vxl/vxl#1048 vxl/vxl#1047 Either way should produce the same codebase result. |
|
@dzenanz Will update in a few minutes. I just noticed your approvals on those. |
Code extracted from:
https://github.com/vxl/vxl.git
at commit cf2b6e0f6f401ae4897dd33a0ca770c40fb706ff (master).
Update vendored VNL/vxl to vxl master
cf2b6e0fviaModules/ThirdParty/VNL/UpdateFromUpstream.sh. Rebased onto currentmain; single snapshot + subtree merge, no hand-applied cherry-picks.This snapshot natively includes four vxl fixes that were merged upstream today (vxl/vxl#1047, #1048, #1049, #1050), so the earlier interim cherry-pick commits are gone — the imported tree carries them directly.
I think it is advantageous to merge this before #6421, so only the differences related to pruning appear there.
What changed since the previous draft
The previous revision was
VXL 2026-06-02 (30cfa520)plus four manual(cherry-pick vxl/vxl#…)commits applied on top of a stalemain. Those cherry-picks have all landed in vxl upstream, so this revision re-runsUpdateFromUpstream.shagainst vxl mastercf2b6e0f(which contains them) and drops the cherry-picks entirely.The resulting vendored
Modules/ThirdParty/VNL/src/vxltree is byte-identical to the previous draft's tree — only the commit topology changed (cleanVXL 2026-06-08 (cf2b6e0f)snapshot +-Xsubtreemerge, rebased onto currentmain).vxl_platform_matheven whenVXL_NO_EXPORTis ONVALID_CXX_STANDARDS= 17/20/23 (drop 11/14)static_cast<int>invnl_rnpoly_solvepowr()size_t→intbefore narrowing invnl_powell_1dfunctorPR Checklist