Skip to content
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.

Sign up for GitHub

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

feat: add support for RNTuple RC2 #1115

Merged
merged 13 commits into from
Mar 22, 2024
Merged

feat: add support for RNTuple RC2 #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
798c9fe
Started implementing RNTuple RC2 spec
ariostas Feb 1, 2024
b643fd7
style: pre-commit fixes
pre-commit-ci[bot] Feb 1, 2024
8f74d83
Header is now read correctly
ariostas Feb 2, 2024
d59f356
Footer is now read correctly
ariostas Feb 5, 2024
2afc5b7
Merge pre-commit changes.
ariostas Feb 5, 2024
e09bad6
style: pre-commit fixes
pre-commit-ci[bot] Feb 5, 2024
502a91f
Reading page links now seems to work
ariostas Feb 7, 2024
a8978e5
Mostly working, but column logic is broken
ariostas Feb 7, 2024
1f98ef6
Columns of strings can now be read correctly
ariostas Mar 5, 2024
06bf08c
Merge branch 'main' into ariostas/rntuple_rc2
ariostas Mar 5, 2024
1a55022
All RNTuple tests pass now
ariostas Mar 6, 2024
e6cde44
Moved xxhash back to only being a testing dependency
ariostas Mar 7, 2024
3037545
Merge branch 'main' into ariostas/rntuple_rc2
ariostas Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/uproot/const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,12 @@
kStreamedMemberWise = numpy.uint16(1 << 14)

############ RNTuple https://github.com/root-project/root/blob/master/tree/ntuple/v7/doc/specifications.md
_rntuple_frame_format = struct.Struct("<HH")
rntuple_env_header = _rntuple_frame_format.pack(1, 1)
_rntuple_frame_format = struct.Struct("<Q")
rntuple_env_header = _rntuple_frame_format.pack(0) # TODO: need to check this
rntuple_col_num_to_dtype_dict = {
1: "uint64",
2: "uint32",
3: "uint64", # Switch
3: "switch", # Switch
4: "uint8",
5: "uint8", # char
6: "bit",
Expand Down Expand Up @@ -153,7 +153,7 @@
rntuple_col_num_to_size_dict = {
1: 64,
2: 32,
3: 64, # Switch
3: 96, # Switch
4: 8,
5: 8, # char
6: 1,
Expand Down
Loading