Skip to content

Fix compile warnings and errors #296

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
dpiparo merged 2 commits into from
Jan 6, 2026
Merged

Fix compile warnings and errors #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff477be
Snapshot does not need template args now
dpiparo Jan 6, 2026
59302a5
Fix compilation error on macos26
dpiparo Jan 6, 2026
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 root/io/io/TFile_RDFSnapshot.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ static void BM_TFile_RDFSnapshot_ZLIB(benchmark::State &state) {
auto options = SetupRDFOptions(ROOT::RCompressionSetting::EAlgorithm::kZLIB, 1);
for (auto _ : state) {
//And we write out the dataset on disk
tdf.Snapshot<double>("randomNumbers", "bench_data.root", {"rnd"}, options);
tdf.Snapshot("randomNumbers", "bench_data.root", {"rnd"}, options);
}
}
BENCHMARK(BM_TFile_RDFSnapshot_ZLIB)->Unit(benchmark::kMicrosecond);
Expand All @@ -39,7 +39,7 @@ static void BM_TFile_RDFSnapshot_LZ4(benchmark::State &state) {
auto options = SetupRDFOptions(ROOT::RCompressionSetting::EAlgorithm::kLZ4, 4);
for (auto _ : state) {
//And we write out the dataset on disk
tdf.Snapshot<double>("randomNumbers", "bench_data.root", {"rnd"}, options);
tdf.Snapshot("randomNumbers", "bench_data.root", {"rnd"}, options);
}
}
BENCHMARK(BM_TFile_RDFSnapshot_LZ4)->Unit(benchmark::kMicrosecond);
Expand All @@ -50,7 +50,7 @@ static void BM_TFile_RDFSnapshot_LZMA (benchmark::State &state) {
auto options = SetupRDFOptions(ROOT::RCompressionSetting::EAlgorithm::kLZMA, 8);
for (auto _ : state) {
//And we write out the dataset on disk
tdf.Snapshot<double>("randomNumbers", "bench_data.root", {"rnd"}, options);
tdf.Snapshot("randomNumbers", "bench_data.root", {"rnd"}, options);
}
}
BENCHMARK(BM_TFile_RDFSnapshot_LZMA)->Unit(benchmark::kMicrosecond);
Expand All @@ -60,7 +60,7 @@ static void BM_TFile_RDFSnapshot_ZSTD (benchmark::State &state) {
auto options = SetupRDFOptions(ROOT::RCompressionSetting::EAlgorithm::kZSTD, 6);
for (auto _ : state) {
//And we write out the dataset on disk
tdf.Snapshot<double>("randomNumbers", "bench_data.root", {"rnd"}, options);
tdf.Snapshot("randomNumbers", "bench_data.root", {"rnd"}, options);
}
}
BENCHMARK(BM_TFile_RDFSnapshot_ZSTD)->Unit(benchmark::kMicrosecond);
Expand Down
8 changes: 7 additions & 1 deletion root/roofit/roofit/BenchmarkUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@ template <typename F>
void doBenchmarks(const char *name, int backend, F func, std::vector<long int> const &range, int numIterations = 1,
benchmark::TimeUnit unit = benchmark::kMillisecond)
{
benchmark::RegisterBenchmark(name, func)->ArgsProduct({{backend}, range})->Unit(unit)->Iterations(numIterations);
std::vector<std::vector<int64_t>> arglists;
arglists.emplace_back(std::vector<int64_t>{backend});
arglists.emplace_back();
for (auto val : range) {
arglists.back().emplace_back(val);
}
benchmark::RegisterBenchmark(name, func)->ArgsProduct(arglists)->Unit(unit)->Iterations(numIterations);
}

void randomizeParameters(const RooArgSet &parameters)
Expand Down
4 changes: 2 additions & 2 deletions root/tree/dataframe/RDataFrameBenchmarks.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ static void BM_RDataFrame_CreateFromFile(benchmark::State &state)
{
const auto fname = RB::GetTempFs() + "/tdf_createfromfile.root";
const auto treeName = "t";
RDataFrame(0).Snapshot<>(treeName, fname, {});
RDataFrame(0).Snapshot(treeName, fname, {});

for (auto _ : state)
RDataFrame(treeName, fname);
Expand Down Expand Up @@ -84,7 +84,7 @@ static void BM_RDataFrame_NoOpLoopOnFile(benchmark::State &state)
{
const auto fname = RB::GetTempFs() + "/tdf_nooplooponfile" + std::to_string(state.range(0)) + ".root";
const auto treeName = "t";
RDataFrame(state.range(0)).Snapshot<>(treeName, fname, {});
RDataFrame(state.range(0)).Snapshot(treeName, fname, {});

for (auto _ : state)
RDataFrame(treeName, fname).Foreach([] {});
Expand Down
2 changes: 1 addition & 1 deletion root/tree/dataframe/RDataFrameSumBenchmarks.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void MakeDataIfNeeded()
ROOT::RDataFrame(nEntries)
.Define(scalarBranch, [] { return 42; })
.Define(vectorBranch, [] { return std::vector<int>{1, 2, 3, 4, 5, 6, 7, 8}; })
.Snapshot<int, std::vector<int>>(treeName, pathToFile.c_str(), {scalarBranch, vectorBranch});
.Snapshot(treeName, pathToFile.c_str(), {scalarBranch, vectorBranch});
}

static void BM_RDataFrameSum_CreateEmptyDF(benchmark::State &state)
Expand Down
2 changes: 1 addition & 1 deletion root/tree/tree/TTreeSumBenchmarks.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void MakeDataIfNeeded()
ROOT::RDataFrame(nEntries)
.Define(scalarBranch, [] { return 42; })
.Define(vectorBranch, [] { return std::vector<int>{1, 2, 3, 4, 5, 6, 7, 8}; })
.Snapshot<int, std::vector<int>>(treeName, pathToFile.c_str(), {scalarBranch, vectorBranch});
.Snapshot(treeName, pathToFile.c_str(), {scalarBranch, vectorBranch});
}

static void BM_TTreeSum_SumScalarTBranchGetEntry(benchmark::State &state)
Expand Down
Loading