Skip to content

[ntuple] Binary format RC3 #16645

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

Merged
merged 9 commits into from
Nov 4, 2024
Merged

[ntuple] Binary format RC3 #16645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
54fa7e9
[ntuple] bump anchor version to RC3
jblomer Oct 8, 2024
08dd336
[ntuple] Fix RNTupleCardinality on-disk type name
jblomer Oct 8, 2024
fb32cb1
[ntuple] move anchor out of experimental namespace
jblomer Oct 8, 2024
c5887c1
[ntuple] remove column groups
jblomer Oct 8, 2024
8528ac3
[ntuple] reset on-disk column flags
jblomer Oct 9, 2024
c211a5e
[ntuple] field s11n: optional bits last
jblomer Oct 9, 2024
4fed802
[ntuple] reorder column constants
jblomer Oct 9, 2024
dd667ba
[ntuple] merge version to/from in extra type info
jblomer Oct 9, 2024
2a90c5f
[ntuple] update links to input files to RC3
jblomer Oct 9, 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
2 changes: 1 addition & 1 deletion gui/browsable/src/RFieldHolder.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public:
{
}

const TClass *GetClass() const override { return TClass::GetClass<ROOT::Experimental::RNTuple>(); }
const TClass *GetClass() const override { return TClass::GetClass<ROOT::RNTuple>(); }

/** Returns direct (temporary) object pointer */
const void *GetObject() const override { return nullptr; }
Expand Down
4 changes: 2 additions & 2 deletions gui/browsable/src/RNTupleBrowseProvider.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class RFieldElement : public RElement {
std::unique_ptr<RLevelIter> GetChildsIter() override;

/** Return class of field - for a moment using RNTuple class as dummy */
const TClass *GetClass() const { return TClass::GetClass<ROOT::Experimental::RNTuple>(); }
const TClass *GetClass() const { return TClass::GetClass<ROOT::RNTuple>(); }

std::unique_ptr<RHolder> GetObject() override
{
Expand Down Expand Up @@ -124,7 +124,7 @@ class RNTupleElement : public RElement {
/** Create iterator for childs elements if any */
std::unique_ptr<RLevelIter> GetChildsIter() override;

const TClass *GetClass() const { return TClass::GetClass<ROOT::Experimental::RNTuple>(); }
const TClass *GetClass() const { return TClass::GetClass<ROOT::RNTuple>(); }

std::unique_ptr<RItem> CreateItem() const override
{
Expand Down
17 changes: 8 additions & 9 deletions gui/browsable/src/RNTupleDraw6Provider.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,16 @@ class RNTupleDraw6Provider : public RFieldProvider {

RNTupleDraw6Provider()
{
RegisterDraw6(TClass::GetClass<ROOT::Experimental::RNTuple>(), [this](TVirtualPad *pad, std::unique_ptr<RHolder> &obj, const std::string &opt) -> bool {

auto h1 = DrawField(dynamic_cast<RFieldHolder*> (obj.get()));
if (!h1) return false;

pad->Add(h1, opt.c_str());

return true;
});
RegisterDraw6(TClass::GetClass<ROOT::RNTuple>(),
[this](TVirtualPad *pad, std::unique_ptr<RHolder> &obj, const std::string &opt) -> bool {
auto h1 = DrawField(dynamic_cast<RFieldHolder *>(obj.get()));
if (!h1)
return false;

pad->Add(h1, opt.c_str());

return true;
});
}

} newRNTupleDraw6Provider;
Expand Down
26 changes: 14 additions & 12 deletions gui/browsable/src/RNTupleDraw7Provider.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,20 @@ class RNTupleDraw7Provider : public RFieldProvider {

RNTupleDraw7Provider()
{
RegisterDraw7(TClass::GetClass<ROOT::Experimental::RNTuple>(), [this](std::shared_ptr<ROOT::Experimental::RPadBase> &subpad, std::unique_ptr<RHolder> &obj, const std::string &opt) -> bool {

auto h1 = DrawField(dynamic_cast<RFieldHolder*> (obj.get()));
if (!h1) return false;

std::shared_ptr<TH1> shared;
shared.reset(h1);

subpad->Draw<ROOT::Experimental::TObjectDrawable>(shared, opt);
subpad->GetCanvas()->Update(true);
return true;
});
RegisterDraw7(TClass::GetClass<ROOT::RNTuple>(),
[this](std::shared_ptr<ROOT::Experimental::RPadBase> &subpad, std::unique_ptr<RHolder> &obj,
const std::string &opt) -> bool {
auto h1 = DrawField(dynamic_cast<RFieldHolder *>(obj.get()));
if (!h1)
return false;

std::shared_ptr<TH1> shared;
shared.reset(h1);

subpad->Draw<ROOT::Experimental::TObjectDrawable>(shared, opt);
subpad->GetCanvas()->Update(true);
return true;
});
}

} newRNTupleDraw7Provider;
Expand Down
5 changes: 3 additions & 2 deletions gui/browsable/src/RProvider.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ std::shared_ptr<RElement> RProvider::Browse(std::unique_ptr<RHolder> &object)
std::shared_ptr<RElement> RProvider::BrowseNTuple(const std::string &tuplename, const std::string &filename)
{
if (!gNTupleFunc) {
auto &entry = GetClassEntry("ROOT::Experimental::RNTuple");
auto &entry = GetClassEntry("ROOT::RNTuple");

if (entry.browselib.empty())
return nullptr;
Expand Down Expand Up @@ -513,7 +513,8 @@ class RDefaultProvider : public RProvider {
RegisterClass("ROOT::Experimental::RH2D", "sap-icon://pixelate", "", "", "libROOTHistDrawProvider");
RegisterClass("ROOT::Experimental::RH3D", "sap-icon://product", "", "", "libROOTHistDrawProvider");
RegisterClass("ROOT::Experimental::RCanvas", "sap-icon://business-objects-experience", "", "", "libROOTHistDrawProvider");
RegisterClass("ROOT::Experimental::RNTuple", "sap-icon://table-chart", "libROOTNTupleBrowseProvider", "libROOTNTupleDraw6Provider", "libROOTNTupleDraw7Provider");
RegisterClass("ROOT::RNTuple", "sap-icon://table-chart", "libROOTNTupleBrowseProvider",
"libROOTNTupleDraw6Provider", "libROOTNTupleDraw7Provider");
}

} newRDefaultProvider;
Expand Down
2 changes: 1 addition & 1 deletion gui/browsable/src/TDirectoryElement.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ std::shared_ptr<RElement> TDirectoryLevelIter::GetDirElement(bool read_dir)
if (!fKeysIter && fObj)
return std::make_shared<TObjectElement>(fObj);

if ("ROOT::Experimental::RNTuple"s == fKey->GetClassName())
if ("ROOT::RNTuple"s == fKey->GetClassName())
return RProvider::BrowseNTuple(fKey->GetName(), fDir->GetFile()->GetName());

std::string key_class = fKey->GetClassName();
Expand Down
2 changes: 1 addition & 1 deletion io/io/src/TFileMerger.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ ClassImp(TFileMerger);

TClassRef R__TH1_Class("TH1");
TClassRef R__TTree_Class("TTree");
TClassRef R__RNTuple_Class("ROOT::Experimental::RNTuple");
TClassRef R__RNTuple_Class("ROOT::RNTuple");

static const Int_t kCpProgress = BIT(14);
static const Int_t kCintFileNumber = 100;
Expand Down
10 changes: 5 additions & 5 deletions tree/dataframe/inc/ROOT/RNTupleDS.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include <unordered_map>

namespace ROOT {
namespace Experimental {
class RNTuple;

namespace Experimental {
Copy link
Member

@pcanal pcanal Oct 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are those still in Experimental? Should they be in Internal and/or Detail?

Copy link
Contributor Author

@jblomer jblomer Oct 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed, at this point only type names that are part of the on-disk format move out of experimental.

class RFieldBase;
class RNTuple;
class RNTupleDescriptor;

namespace Internal {
Expand Down Expand Up @@ -153,7 +153,7 @@ class RNTupleDS final : public ROOT::RDF::RDataSource {

public:
RNTupleDS(std::string_view ntupleName, std::string_view fileName);
RNTupleDS(ROOT::Experimental::RNTuple *ntuple);
RNTupleDS(ROOT::RNTuple *ntuple);
RNTupleDS(std::string_view ntupleName, const std::vector<std::string> &fileNames);
~RNTupleDS();

Expand All @@ -180,13 +180,13 @@ protected:
Record_t GetColumnReadersImpl(std::string_view name, const std::type_info &) final;
};

} // ns Experimental
} // namespace Experimental

namespace RDF {
namespace Experimental {
RDataFrame FromRNTuple(std::string_view ntupleName, std::string_view fileName);
RDataFrame FromRNTuple(std::string_view ntupleName, const std::vector<std::string> &fileNames);
RDataFrame FromRNTuple(ROOT::Experimental::RNTuple *ntuple);
RDataFrame FromRNTuple(ROOT::RNTuple *ntuple);
} // namespace Experimental
} // namespace RDF

Expand Down
4 changes: 2 additions & 2 deletions tree/dataframe/src/RLoopManager.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,7 +1249,7 @@ ROOT::Detail::RDF::CreateLMFromFile(std::string_view datasetName, std::string_vi

if (inFile->Get<TTree>(datasetName.data())) {
return CreateLMFromTTree(datasetName, fileNameGlob, defaultColumns, /*checkFile=*/false);
} else if (inFile->Get<ROOT::Experimental::RNTuple>(datasetName.data())) {
} else if (inFile->Get<ROOT::RNTuple>(datasetName.data())) {
return CreateLMFromRNTuple(datasetName, fileNameGlob, defaultColumns);
}

Expand All @@ -1266,7 +1266,7 @@ ROOT::Detail::RDF::CreateLMFromFile(std::string_view datasetName, const std::vec

if (inFile->Get<TTree>(datasetName.data())) {
return CreateLMFromTTree(datasetName, fileNameGlobs, defaultColumns, /*checkFile=*/false);
} else if (inFile->Get<ROOT::Experimental::RNTuple>(datasetName.data())) {
} else if (inFile->Get<ROOT::RNTuple>(datasetName.data())) {
return CreateLMFromRNTuple(datasetName, fileNameGlobs, defaultColumns);
}

Expand Down
2 changes: 1 addition & 1 deletion tree/dataframe/src/RNTupleDS.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ ROOT::RDF::Experimental::FromRNTuple(std::string_view ntupleName, const std::vec
return ROOT::RDataFrame(std::make_unique<ROOT::Experimental::RNTupleDS>(ntupleName, fileNames));
}

ROOT::RDataFrame ROOT::RDF::Experimental::FromRNTuple(ROOT::Experimental::RNTuple *ntuple)
ROOT::RDataFrame ROOT::RDF::Experimental::FromRNTuple(ROOT::RNTuple *ntuple)
{
return ROOT::RDataFrame(std::make_unique<ROOT::Experimental::RNTupleDS>(ntuple));
}
2 changes: 1 addition & 1 deletion tree/ntuple/inc/LinkDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
#pragma link off all classes;
#pragma link off all functions;

#pragma link C++ class ROOT::Experimental::RNTuple - ;
#pragma link C++ class ROOT::RNTuple - ;

#endif
Loading
Loading