-
Notifications
You must be signed in to change notification settings - Fork 3
Add first tests for fundamental types #1
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
Merged
Merged
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
*.json | ||
*.root |
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,3 @@ | ||
# Types | ||
|
||
* [`fundamental`](fundamental): fundamental column types |
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,13 @@ | ||
# Fundamental Column Types | ||
|
||
* [`integer`](integer): `[U]Int{8,16,32,64}`, `Split[U]Int{16,32,64}` | ||
* [`misc`](misc): `Bit`, `Byte`, `Char` | ||
* [`real`](real): `Real{16,32,64}`, `SplitReal{32,64}` | ||
|
||
__Covered under a different category:__ | ||
* `[Split]Index{32,64}` | ||
* `Switch` | ||
|
||
__Missing:__ | ||
* `Real32Trunc` | ||
* `Real32Quant` |
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,16 @@ | ||
# Integer Column Types | ||
|
||
## Fields | ||
|
||
* `[U]Int{8,16,32,64}` | ||
* `Split[U]Int{16,32,64}` | ||
|
||
with the corresponding column types. | ||
|
||
## Entries | ||
|
||
1. Ascending values | ||
2. Values in each byte (to validate split encoding) | ||
3. Negative values for signed integer types (to validate zigzag encoding) | ||
4. Minimum (lowest) values | ||
5. Maximum values |
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,66 @@ | ||
#include <ROOT/REntry.hxx> | ||
#include <ROOT/RNTupleReader.hxx> | ||
|
||
using ROOT::Experimental::REntry; | ||
using ROOT::Experimental::RNTupleReader; | ||
|
||
#include <cstdint> | ||
#include <fstream> | ||
#include <ostream> | ||
#include <string> | ||
#include <string_view> | ||
|
||
template <typename T> | ||
static void PrintIntegerValue(const REntry &entry, std::string_view name, | ||
std::ostream &os, bool last = false) { | ||
T value = *entry.GetPtr<T>(name); | ||
os << " \"" << name << "\": "; | ||
// We want to print the integer value even if it is a character; use the unary | ||
// + operator (https://stackoverflow.com/a/28414758). | ||
os << +value; | ||
if (!last) { | ||
os << ","; | ||
} | ||
os << "\n"; | ||
} | ||
|
||
void read(std::string_view input = "types.fundamental.integer.root", | ||
std::string_view output = "types.fundamental.integer.json") { | ||
std::ofstream os(std::string{output}); | ||
os << "[\n"; | ||
|
||
auto reader = RNTupleReader::Open("ntpl", input); | ||
auto &entry = reader->GetModel().GetDefaultEntry(); | ||
bool first = true; | ||
for (auto index : *reader) { | ||
reader->LoadEntry(index); | ||
|
||
if (first) { | ||
first = false; | ||
} else { | ||
os << ",\n"; | ||
} | ||
os << " {\n"; | ||
|
||
PrintIntegerValue<std::int8_t>(entry, "Int8", os); | ||
PrintIntegerValue<std::uint8_t>(entry, "UInt8", os); | ||
PrintIntegerValue<std::int16_t>(entry, "Int16", os); | ||
PrintIntegerValue<std::uint16_t>(entry, "UInt16", os); | ||
PrintIntegerValue<std::int32_t>(entry, "Int32", os); | ||
PrintIntegerValue<std::uint32_t>(entry, "UInt32", os); | ||
PrintIntegerValue<std::int64_t>(entry, "Int64", os); | ||
PrintIntegerValue<std::uint64_t>(entry, "UInt64", os); | ||
PrintIntegerValue<std::int16_t>(entry, "SplitInt16", os); | ||
PrintIntegerValue<std::uint16_t>(entry, "SplitUInt16", os); | ||
PrintIntegerValue<std::int32_t>(entry, "SplitInt32", os); | ||
PrintIntegerValue<std::uint32_t>(entry, "SplitUInt32", os); | ||
PrintIntegerValue<std::int64_t>(entry, "SplitInt64", os); | ||
PrintIntegerValue<std::uint64_t>(entry, "SplitUInt64", os, /*last=*/true); | ||
|
||
os << " }"; | ||
// Newline is intentionally missing, may need to print a comma before the | ||
// next entry. | ||
} | ||
os << "\n"; | ||
os << "]\n"; | ||
} |
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,164 @@ | ||
#include <ROOT/RField.hxx> | ||
#include <ROOT/RNTupleModel.hxx> | ||
#include <ROOT/RNTupleUtil.hxx> | ||
#include <ROOT/RNTupleWriteOptions.hxx> | ||
#include <ROOT/RNTupleWriter.hxx> | ||
|
||
using ROOT::Experimental::EColumnType; | ||
using ROOT::Experimental::RField; | ||
using ROOT::Experimental::RNTupleModel; | ||
using ROOT::Experimental::RNTupleWriteOptions; | ||
using ROOT::Experimental::RNTupleWriter; | ||
|
||
#include <cstdint> | ||
#include <limits> | ||
#include <memory> | ||
#include <string_view> | ||
|
||
template <typename T> | ||
static std::shared_ptr<T> MakeFundamentalField(RNTupleModel &model, | ||
std::string_view name, | ||
EColumnType type) { | ||
auto field = std::make_unique<RField<T>>(name); | ||
field->SetColumnRepresentatives({{type}}); | ||
model.AddField(std::move(field)); | ||
return model.GetDefaultEntry().GetPtr<T>(name); | ||
} | ||
|
||
void write(std::string_view filename = "types.fundamental.integer.root") { | ||
auto model = RNTupleModel::Create(); | ||
|
||
auto Int8 = | ||
MakeFundamentalField<std::int8_t>(*model, "Int8", EColumnType::kInt8); | ||
auto UInt8 = | ||
MakeFundamentalField<std::uint8_t>(*model, "UInt8", EColumnType::kUInt8); | ||
|
||
// Non-split integer encoding | ||
auto Int16 = | ||
MakeFundamentalField<std::int16_t>(*model, "Int16", EColumnType::kInt16); | ||
auto UInt16 = MakeFundamentalField<std::uint16_t>(*model, "UInt16", | ||
EColumnType::kUInt16); | ||
auto Int32 = | ||
MakeFundamentalField<std::int32_t>(*model, "Int32", EColumnType::kInt32); | ||
auto UInt32 = MakeFundamentalField<std::uint32_t>(*model, "UInt32", | ||
EColumnType::kUInt32); | ||
auto Int64 = | ||
MakeFundamentalField<std::int64_t>(*model, "Int64", EColumnType::kInt64); | ||
auto UInt64 = MakeFundamentalField<std::uint64_t>(*model, "UInt64", | ||
EColumnType::kUInt64); | ||
|
||
// Split integer encoding | ||
auto SplitInt16 = MakeFundamentalField<std::int16_t>( | ||
*model, "SplitInt16", EColumnType::kSplitInt16); | ||
auto SplitUInt16 = MakeFundamentalField<std::uint16_t>( | ||
*model, "SplitUInt16", EColumnType::kSplitUInt16); | ||
auto SplitInt32 = MakeFundamentalField<std::int32_t>( | ||
*model, "SplitInt32", EColumnType::kSplitInt32); | ||
auto SplitUInt32 = MakeFundamentalField<std::uint32_t>( | ||
*model, "SplitUInt32", EColumnType::kSplitUInt32); | ||
auto SplitInt64 = MakeFundamentalField<std::int64_t>( | ||
*model, "SplitInt64", EColumnType::kSplitInt64); | ||
auto SplitUInt64 = MakeFundamentalField<std::uint64_t>( | ||
*model, "SplitUInt64", EColumnType::kSplitUInt64); | ||
|
||
RNTupleWriteOptions options; | ||
options.SetCompression(0); | ||
auto writer = | ||
RNTupleWriter::Recreate(std::move(model), "ntpl", filename, options); | ||
|
||
// First entry: ascending values | ||
*Int8 = 1; | ||
*UInt8 = 2; | ||
*Int16 = 3; | ||
*UInt16 = 4; | ||
*Int32 = 5; | ||
*UInt32 = 6; | ||
*Int64 = 7; | ||
*UInt64 = 8; | ||
*SplitInt16 = 9; | ||
*SplitUInt16 = 10; | ||
*SplitInt32 = 11; | ||
*SplitUInt32 = 12; | ||
*SplitInt64 = 13; | ||
*SplitUInt64 = 14; | ||
writer->Fill(); | ||
|
||
// Second entry: values in each byte (to validate split encoding) | ||
static constexpr std::uint8_t Value8 = 0x12; // = 18 | ||
static constexpr std::uint16_t Value16 = 0x1234; // = 4660 | ||
static constexpr std::uint32_t Value32 = 0x12345678; // = 305419896 | ||
static constexpr std::uint64_t Value64 = | ||
0x123456780112358c; // = 1311768464885691788 | ||
*Int8 = Value8; | ||
*UInt8 = Value8; | ||
*Int16 = Value16; | ||
*UInt16 = Value16; | ||
*Int32 = Value32; | ||
*UInt32 = Value32; | ||
*Int64 = Value64; | ||
*UInt64 = Value64; | ||
*SplitInt16 = Value16; | ||
*SplitUInt16 = Value16; | ||
*SplitInt32 = Value32; | ||
*SplitUInt32 = Value32; | ||
*SplitInt64 = Value64; | ||
*SplitUInt64 = Value64; | ||
writer->Fill(); | ||
|
||
// Third entry: negative values for signed integer types (to validate zigzag | ||
// encoding) | ||
static constexpr std::int8_t NegativeValue8 = 0x92; // = -110 | ||
static constexpr std::int16_t NegativeValue16 = 0x9234; // = -28108 | ||
static constexpr std::int32_t NegativeValue32 = 0x92345678; // = -1842063752 | ||
static constexpr std::int64_t NegativeValue64 = | ||
0x923456780112358c; // = -7911603571969084020 | ||
*Int8 = NegativeValue8; | ||
*UInt8 = Value8; | ||
*Int16 = NegativeValue16; | ||
*UInt16 = Value16; | ||
*Int32 = NegativeValue32; | ||
*UInt32 = Value32; | ||
*Int64 = NegativeValue64; | ||
*UInt64 = Value64; | ||
*SplitInt16 = NegativeValue16; | ||
*SplitUInt16 = Value16; | ||
*SplitInt32 = NegativeValue32; | ||
*SplitUInt32 = Value32; | ||
*SplitInt64 = NegativeValue64; | ||
*SplitUInt64 = Value64; | ||
writer->Fill(); | ||
|
||
// Fourth entry: minimum (lowest) values | ||
*Int8 = std::numeric_limits<std::int8_t>::lowest(); | ||
*UInt8 = std::numeric_limits<std::uint8_t>::lowest(); | ||
*Int16 = std::numeric_limits<std::int16_t>::lowest(); | ||
*UInt16 = std::numeric_limits<std::uint16_t>::lowest(); | ||
*Int32 = std::numeric_limits<std::int32_t>::lowest(); | ||
*UInt32 = std::numeric_limits<std::uint32_t>::lowest(); | ||
*Int64 = std::numeric_limits<std::int64_t>::lowest(); | ||
*UInt64 = std::numeric_limits<std::uint64_t>::lowest(); | ||
*SplitInt16 = std::numeric_limits<std::int16_t>::lowest(); | ||
*SplitUInt16 = std::numeric_limits<std::uint16_t>::lowest(); | ||
*SplitInt32 = std::numeric_limits<std::int32_t>::lowest(); | ||
*SplitUInt32 = std::numeric_limits<std::uint32_t>::lowest(); | ||
*SplitInt64 = std::numeric_limits<std::int64_t>::lowest(); | ||
*SplitUInt64 = std::numeric_limits<std::uint64_t>::lowest(); | ||
writer->Fill(); | ||
|
||
// Fifth entry: maximum values | ||
*Int8 = std::numeric_limits<std::int8_t>::max(); | ||
*UInt8 = std::numeric_limits<std::uint8_t>::max(); | ||
*Int16 = std::numeric_limits<std::int16_t>::max(); | ||
*UInt16 = std::numeric_limits<std::uint16_t>::max(); | ||
*Int32 = std::numeric_limits<std::int32_t>::max(); | ||
*UInt32 = std::numeric_limits<std::uint32_t>::max(); | ||
*Int64 = std::numeric_limits<std::int64_t>::max(); | ||
*UInt64 = std::numeric_limits<std::uint64_t>::max(); | ||
*SplitInt16 = std::numeric_limits<std::int16_t>::max(); | ||
*SplitUInt16 = std::numeric_limits<std::uint16_t>::max(); | ||
*SplitInt32 = std::numeric_limits<std::int32_t>::max(); | ||
*SplitUInt32 = std::numeric_limits<std::uint32_t>::max(); | ||
*SplitInt64 = std::numeric_limits<std::int64_t>::max(); | ||
*SplitUInt64 = std::numeric_limits<std::uint64_t>::max(); | ||
writer->Fill(); | ||
} |
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,15 @@ | ||
# Integer Column Types | ||
|
||
## Fields | ||
|
||
* `Bit` | ||
* `Byte` | ||
* `Char` | ||
|
||
with the corresponding column types. | ||
|
||
## Entries | ||
|
||
1. Ascending values | ||
2. Low values | ||
3. High values |
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,57 @@ | ||
#include <ROOT/REntry.hxx> | ||
#include <ROOT/RNTupleReader.hxx> | ||
|
||
using ROOT::Experimental::REntry; | ||
using ROOT::Experimental::RNTupleReader; | ||
|
||
#include <cstddef> // for std::byte | ||
#include <fstream> | ||
#include <ostream> | ||
#include <string> | ||
#include <string_view> | ||
|
||
template <typename T> | ||
static void PrintIntegerValue(const REntry &entry, std::string_view name, | ||
std::ostream &os, bool last = false) { | ||
T value = *entry.GetPtr<T>(name); | ||
pcanal marked this conversation as resolved.
Show resolved
Hide resolved
|
||
os << " \"" << name << "\": "; | ||
// We want to print the integer value even if it is a character; use the unary | ||
// + operator (https://stackoverflow.com/a/28414758). | ||
os << +value; | ||
if (!last) { | ||
os << ","; | ||
} | ||
os << "\n"; | ||
} | ||
|
||
void read(std::string_view input = "types.fundamental.misc.root", | ||
std::string_view output = "types.fundamental.misc.json") { | ||
std::ofstream os(std::string{output}); | ||
os << "[\n"; | ||
|
||
auto reader = RNTupleReader::Open("ntpl", input); | ||
auto &entry = reader->GetModel().GetDefaultEntry(); | ||
bool first = true; | ||
for (auto index : *reader) { | ||
reader->LoadEntry(index); | ||
|
||
if (first) { | ||
first = false; | ||
} else { | ||
os << ",\n"; | ||
} | ||
os << " {\n"; | ||
|
||
PrintIntegerValue<bool>(entry, "Bit", os); | ||
os << " \"Byte\": "; | ||
os << std::to_integer<int>(*entry.GetPtr<std::byte>("Byte")); | ||
os << ",\n"; | ||
PrintIntegerValue<char>(entry, "Char", os, /*last=*/true); | ||
|
||
os << " }"; | ||
// Newline is intentionally missing, may need to print a comma before the | ||
// next entry. | ||
} | ||
os << "\n"; | ||
os << "]\n"; | ||
} |
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.
Uh oh!
There was an error while loading. Please reload this page.