Add late model extension to RNTupleMerger #16080
Merged
Conversation
This file contains 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
Test Results 13 files 13 suites 3d 2h 17m 12s ⏱️ Results for commit edc5d49. ♻️ This comment has been updated with latest results. |
silverweed
force-pushed
the
ntuple_merge_lmext
branch
3 times, most recently
from
39ee934
to
3ea010a
Compare
silverweed
force-pushed
the
ntuple_merge_lmext
branch
3 times, most recently
from
e3fa48f
to
e4f81d5
Compare
silverweed
force-pushed
the
ntuple_merge_lmext
branch
2 times, most recently
from
51eb509
to
9b203c5
Compare
jblomer
requested changes
Sep 3, 2024
silverweed
force-pushed
the
ntuple_merge_lmext
branch
from
9b203c5
to
9976d02
Compare
[ntuple] extract ExtendOutputModel from Merge
... rather than saving one per source.
- grouped most data that is commonly passed to merge helper functions into a struct to reduce the number of function params - added a page allocator to the merger - removed friendship with RPageStorage, created a public static version of SealPage() - other minor cleanups
silverweed
force-pushed
the
ntuple_merge_lmext
branch
from
9976d02
to
adfda4c
Compare
jblomer
approved these changes
Sep 19, 2024
| struct RColumnInfo { | ||
| // This column name is built as a dot-separated concatenation of the ancestry of | ||
| // the columns' parent fields' names plus the index of the column itself. | ||
| // e.g. "Muon.pt.x._0" |
There was a problem hiding this comment.
We can do this in a follow-up PR: I think the representation index needs to be part of the name, too.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This Pull request:
refactors RNTupleMerger to properly support late model extension.
The "Union" merging mode is added, allowing the merger to late-model-extend the destination to include all the fields of the input ntuples (instead of ignoring unknown fields / complaining when models don't match).
Likewise, the "Strict" merging mode is added that checks that all inputs have the exact same structure.
By default, the old behavior (named "Filter") is used.
To better compare the RNTuples structures, the merging logic is now more properly considering the fields of each input, rather than just the columns as it was previously. This also allows for more descriptive messages to the user if some mismatch is found.
NOTE: the
RNTupleMerger::Mergefunction now returns a RResult instead of throwing exceptions on error.TODO
Checklist: