fix: add support for new RNTuple switches #1218
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
|
I'm going to make it a bit cleaner by using structured |
|
Thanks @jpivarski, it's definitely a lot nicer with a structured numpy dtype than reading a switch as 3 int32. Now it's ready for review. |
jpivarski
approved these changes
May 16, 2024
There was a problem hiding this comment.
Oh, yeah: now that I see the context, the structured dtype is much better. I thought we were talking about three equal-sized integers, which can just as easily be a reshaped array, but it's one 64-bit integer and one 32-bit integer. Reinterpreting as a structured array does the same job with no intermediate arrays, so it's both cleaner to read and more efficient.
Go ahead and merge if you have no additional changes to make!
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 PR fixes reading RNTuple switch data, which is now 96 bits as opposed to 64 bits. These are used to encode
std::varianttypes. I re-enabled a test for them, which I didn't realize was being skipped.Also, as a minor thing, I disabled another RNTuple test because the test file takes a relatively long file to download, and sometimes the server seems to get stuck.