-
-
Notifications
You must be signed in to change notification settings - Fork 742
ENH: Add Modules/Beta/ container (infra-only for stacked beta-module ingests) #6085
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
hjmjohnson
wants to merge
1
commit into
InsightSoftwareConsortium:main
from
hjmjohnson:wip-inline-beta-modules
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| # Modules/Beta/ | ||
| # | ||
| # In-tree home for modules that were formerly configure-time remote | ||
| # fetches (Modules/Remote/*.remote.cmake). Each module lives at | ||
| # Modules/Beta/<Name>/ with its own itk-module.cmake and is discovered | ||
| # automatically by the normal ITK module DAG scan (see | ||
| # CMake/ITKModuleEnablement.cmake). | ||
| # | ||
| # Alongside each ingested module, an optional manifest | ||
| # Modules/Beta/<Name>.beta.cmake records upstream provenance | ||
| # (UPSTREAM_URL, UPSTREAM_SHA at last ingest, INGEST_DATE, license, | ||
| # compliance level). The manifest files are inert at build time -- | ||
| # they are passive metadata consumed by tooling and human readers. | ||
|
|
||
| # itk_beta_module_manifest() is a no-op that makes the *.beta.cmake | ||
| # files valid CMake so they can be include()-d by tooling without | ||
| # producing build-time side effects. | ||
| function(itk_beta_module_manifest _name) | ||
| # arguments are intentionally discarded; parsed by external tooling. | ||
| endfunction() | ||
|
|
||
| # Include every *.beta.cmake so CMake at least syntactically validates | ||
| # them at configure time. This does not enable, build, or fetch anything. | ||
| # CONFIGURE_DEPENDS asks CMake to re-glob whenever a manifest is added, | ||
| # removed, or renamed, so a Beta-module ingest does not require a manual | ||
| # `cmake .` reconfigure. | ||
| file(GLOB _beta_manifests CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/*.beta.cmake") | ||
| foreach(_manifest ${_beta_manifests}) | ||
| include(${_manifest}) | ||
| endforeach() | ||
| unset(_beta_manifests) | ||
| unset(_manifest) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would welcome suggestions for the naming of this new subdirectory. I chose "Beta," but I don't have a strong affinity for it. Perhaps "Community", "PreRelease", "Contributed", .... ?
I like the overall simplicity of this scheme. It's extensible, provides containment for items we don't yet want to put into the primary core, and provides historical context as we move some elements into the core.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are they not added to their appropriate group / module according to their topic? We want to make modules simpler and more maintainable. And easier for libraries clients to use and find content.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@thewtex
TLDR; Shortest path to reduced maintenance burden.
======
I was trying to keep the scope of this initial step small. The primary concern at the moment was reducing the maintainer burden by moving all code for modules primarily maintained by the core ITK developers into ITK. Thus, greatly reduces the number of repositories that need to be touched for every style, code, or CI change.
Using this beta directory adjacent to the review directory allows for the minimum amount of infrastructure change to achieve the goal of reducing maintenance burden.
Moving them from Remote or Beta to a location where clients can more easily find their content will likely involve extensive community discussions about each module: about testing code coverage, code quality, whether they have broad community appeal, ITK style conformance, and other concerns that will likely take a longer time frame to resolve per module.
This step is nearly all mechanical. I was hoping that this would allow 1/2 - 3/4 of the current remote modules to be sucked into ITK's primary repo quickly. The build behavior does not change, and it should be backward compatible with external tools that currently enable a subset of Remote modules.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@thewtex If you think the correct path is to move directly from remote modules to direct ITK integration, would you recommend a single PR per remote module, 1 per day over the next month or two?
I'll make a trial remote module -> Direct ITK inclusion draft PR for Cuberille as a discussion point to contrast with the proposed method here.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree with this goal.
This duplicates code, in an unstable location, and at location that is not logically connected with existing groups and modules. This is increasing maintenance burden.
Many of the remote modules have not changed for years, have at least decent test coverage, and are not going to change. Some are easier to identify than others on which Group and Module (or a new module) they belong in. Some are trivial to locate. I do not agree that another beta group is better than putting it in the appropriate location.
@hjmjohnson I agree with you that a single PR per remote module is what is going to improve maintenance burden. It does not have to be all of them -- just the most obvious ones will make a difference on the maintenance burden and beneficial impact on the community. Then mark the remote module repository Archived on GitHub.
Thank you!