Skip to content

Simple VXL update - #6423

Merged
hjmjohnson merged 2 commits into
InsightSoftwareConsortium:mainfrom
dzenanz:updateVNL
Jun 9, 2026
Merged

Simple VXL update#6423
hjmjohnson merged 2 commits into
InsightSoftwareConsortium:mainfrom
dzenanz:updateVNL

Conversation

@dzenanz

@dzenanz dzenanz commented Jun 8, 2026

Copy link
Copy Markdown
Member

Update vendored VNL/vxl to vxl master cf2b6e0f via Modules/ThirdParty/VNL/UpdateFromUpstream.sh. Rebased onto current main; 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 stale main. Those cherry-picks have all landed in vxl upstream, so this revision re-runs UpdateFromUpstream.sh against vxl master cf2b6e0f (which contains them) and drops the cherry-picks entirely.

The resulting vendored Modules/ThirdParty/VNL/src/vxl tree is byte-identical to the previous draft's tree — only the commit topology changed (clean VXL 2026-06-08 (cf2b6e0f) snapshot + -Xsubtree merge, rebased onto current main).

vxl PR Fix
#1047 Export vxl_platform_math even when VXL_NO_EXPORT is ON
#1048 VALID_CXX_STANDARDS = 17/20/23 (drop 11/14)
#1049 Drop redundant static_cast<int> in vnl_rnpoly_solve powr()
#1050 Validate size_tint before narrowing in vnl_powell_1dfun ctor

PR Checklist

@dzenanz
dzenanz requested a review from hjmjohnson June 8, 2026 15:15
@github-actions github-actions Bot added type:Infrastructure Infrastructure/ecosystem related changes, such as CMake or buildbots area:ThirdParty Issues affecting the ThirdParty module labels Jun 8, 2026
@greptile-apps

This comment was marked as resolved.

Comment thread Modules/ThirdParty/VNL/src/vxl/core/vnl/algo/vnl_powell.cxx Outdated
Comment thread Modules/ThirdParty/VNL/src/vxl/core/vnl/algo/vnl_rnpoly_solve.cxx Outdated
Comment thread Modules/ThirdParty/VNL/src/vxl/CMakeLists.txt
@dzenanz

dzenanz commented Jun 8, 2026

Copy link
Copy Markdown
Member Author

Given the amount of failures, maybe this intermediate step is not advantageous? Leaving it up to you Hans.

@dzenanz
dzenanz marked this pull request as draft June 8, 2026 15:43
@hjmjohnson

Copy link
Copy Markdown
Member

@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

@hjmjohnson
hjmjohnson marked this pull request as ready for review June 8, 2026 19:42
@dzenanz

dzenanz commented Jun 8, 2026

Copy link
Copy Markdown
Member Author

Shouldn't we merge the fixes in VXL first, then re-run the update script here?

@hjmjohnson

Copy link
Copy Markdown
Member

@dzenanz
vxl/vxl#1050
#1050 opened 1 hour ago by hjmjohnson Member
1

vxl/vxl#1049
#1049 opened 1 hour ago by hjmjohnson Member
Draft
1

vxl/vxl#1048
#1048 opened 1 hour ago by hjmjohnson Member
1

vxl/vxl#1047
#1047 opened 1 hour ago by hjmjohnson Member

Either way should produce the same codebase result.

@hjmjohnson

Copy link
Copy Markdown
Member

@dzenanz Will update in a few minutes. I just noticed your approvals on those.

VXL Maintainers and others added 2 commits June 8, 2026 16:00
Code extracted from:

    https://github.com/vxl/vxl.git

at commit cf2b6e0f6f401ae4897dd33a0ca770c40fb706ff (master).
@hjmjohnson
hjmjohnson merged commit 83bc376 into InsightSoftwareConsortium:main Jun 9, 2026
19 checks passed
@dzenanz
dzenanz deleted the updateVNL branch June 9, 2026 01:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:ThirdParty Issues affecting the ThirdParty module type:Infrastructure Infrastructure/ecosystem related changes, such as CMake or buildbots

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants