Skip to content

Working TTrivialDS #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.

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

Closed
dpiparo wants to merge 10 commits into from
Closed

Working TTrivialDS #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6cbefec
Revert "[TDF] Avoid copies when reading values through a data-source"
dpiparo Sep 15, 2017
3421c43
[TDF] Add SetNSlots to TDS interface
dpiparo Sep 15, 2017
eeb696c
[TDF] TDataSource: number of slots is an unsigned int and not ULong64_t
dpiparo Sep 15, 2017
2c62b93
[TDF] Add the TTrivialDS and its unit tests
dpiparo Sep 15, 2017
d66c3f3
[TDF] Make TLoopManager the entity setting the TDS number of slots
dpiparo Sep 16, 2017
18f4cf2
[TDF] Assert on multiple number of nodes setting and add unit
dpiparo Sep 16, 2017
8c9222a
[TDF] Spelling mistake in a variable name
dpiparo Sep 16, 2017
a9644db
[TDF] Formatting
dpiparo Sep 16, 2017
5bae940
[TDF] First working version of RootTDF and its unit tests.
dpiparo Sep 18, 2017
bd2a734
[TDF] Refactor data sources in headers and implementation files
dpiparo Sep 18, 2017
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
Prev Previous commit
Next Next commit
[TDF] Make TLoopManager the entity setting the TDS number of slots
  • Loading branch information
@dpiparo
dpiparo committed Sep 16, 2017
commit d66c3f3767968ed7df07a92ab780f19c44a2d194
2 changes: 2 additions & 0 deletions tree/treeplayer/src/TDFNodes.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ TLoopManager::TLoopManager(std::unique_ptr<TDataSource> ds, const ColumnNames_t
: fDefaultColumns(defaultBranches), fNSlots(TDFInternal::GetNSlots()), fLoopType(ELoopType::kDataSource),
fDataSource(std::move(ds))
{
const auto nSlots = TDFInternal::GetNSlots();
fDataSource->SetNSlots( 0U == nSlots ? 1U : nSlots);
}

/// Run event loop with no source files, in parallel.
Expand Down
2 changes: 0 additions & 2 deletions tree/treeplayer/src/TDataFrame.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,4 @@ TDataFrame::TDataFrame(ULong64_t numEntries)
TDataFrame::TDataFrame(std::unique_ptr<TDataSource> ds, const ColumnNames_t &defaultBranches)
: TInterface<TDFDetail::TLoopManager>(std::make_shared<TDFDetail::TLoopManager>(std::move(ds), defaultBranches))
{
const auto nSlots = ROOT::GetImplicitMTPoolSize();
GetProxiedPtr()->GetDataSource()->SetNSlots( 0U == nSlots ? 1U : nSlots);
}
Copy link
Owner

@eguiraud eguiraud Sep 15, 2017

Choose a reason for hiding this comment

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

I would change these two lines with fDataSource->SetNSlots(fNSlots) in TDFNodes.cxx:129 (TLoopManager's ctor) to keep TLoopManager the sole authority when it comes to TDF's number of slots.