Skip to content

Commit

Permalink
feat: add support for RNTuple RC2 (#1115)
Browse files Browse the repository at this point in the history
* Started implementing RNTuple RC2 spec

* style: pre-commit fixes

* Header is now read correctly

* Footer is now read correctly

[skip ci]

* style: pre-commit fixes

* Reading page links now seems to work

* Mostly working, but column logic is broken

[skip ci]

* Columns of strings can now be read correctly

* All RNTuple tests pass now

* Moved xxhash back to only being a testing dependency

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
ariostas and pre-commit-ci[bot] authored Mar 22, 2024
1 parent e1cc99c commit e29932f
Show file tree
Hide file tree
Showing 7 changed files with 142 additions and 148 deletions.
8 changes: 4 additions & 4 deletions src/uproot/const.py
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

0 comments on commit e29932f

Please sign in to comment.