Skip to content

[TypeTraits] Move general-purpose metaprogramming utilities from TDataFrame's utils to ROOT TypeTraits #636

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 20 commits into from
Jun 27, 2017
Merged

[TypeTraits] Move general-purpose metaprogramming utilities from TDataFrame's utils to ROOT TypeTraits #636

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8a7c93a
[TypeTraits] Create TypeTraits namespace
eguiraud Jun 8, 2017
bc08f41
[TypeTraits] Move TDF general-purpose utilities to TTypeTraits.hxx
eguiraud Jun 8, 2017
6f84b40
[TypeTraits] Static-assert that type passed to IsV7Histo is an histogram
eguiraud Jun 9, 2017
d9a0797
[TypeTraits] Add forward declarations for IsV7Hist
eguiraud Jun 9, 2017
d2d2e99
[TypeTraits] Move back IsV7Histo to TDataFrame
eguiraud Jun 13, 2017
c069b65
[TypeTraits] Rename TTypeTraits.hxx -> TypeTraits.hxx
eguiraud Jun 9, 2017
1dc11d9
[TypeTraits] Add missing includes to TypeTraits.hxx
eguiraud Jun 9, 2017
4be3969
[TypeTraits] clang-format TypeTraits.hxx
eguiraud Jun 12, 2017
50d1b36
[TypeTraits] Update `Author` field
eguiraud Jun 12, 2017
a1f1902
[TypeTraits] Add testTypeTraits google test
eguiraud Jun 12, 2017
3c530fa
[TypeTraits] Rename TakeFirst[_t] -> TakeFirstType[_t]
eguiraud Jun 13, 2017
ca17ca6
[TDF] Update TDFActionHelpers.hxx to use ROOT/TypeTraits.hxx
eguiraud Jun 9, 2017
8dd1bb9
[TDF] Update TDFInterface.hxx to use ROOT/TypeTraits.hxx
eguiraud Jun 9, 2017
9a87e70
[TDF] Update TDFNodes.hxx to use ROOT/TypeTraits.hxx
eguiraud Jun 9, 2017
3aa4afa
[TDF] Update TDFUtils.hxx to use ROOT/TypeTraits.hxx
eguiraud Jun 9, 2017
172888b
[TDF] Update TDataFrame.hxx to use ROOT/TypeTraits.hxx
eguiraud Jun 9, 2017
09ebc02
[TDF] Update TResultProxy.hxx to use ROOT/TypeTraits.hxx
eguiraud Jun 9, 2017
1d1ccdd
[TDF] Add helper alias for GenStaticSeq
eguiraud Jun 12, 2017
5dda3b9
[TDF] clang-format pass on TDF headers
eguiraud Jun 12, 2017
24b2b18
[TDF] Fix GenStaticSeq namespace
eguiraud Jun 14, 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] Update TDFInterface.hxx to use ROOT/TypeTraits.hxx
  • Loading branch information
@eguiraud
eguiraud committed Jun 26, 2017
commit 8dd1bb9dca082f2fa6cdc46becf966f6b32b29c7
39 changes: 20 additions & 19 deletions tree/treeplayer/inc/ROOT/TDFInterface.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ namespace Experimental {
namespace TDF {
namespace TDFDetail = ROOT::Detail::TDF;
namespace TDFInternal = ROOT::Internal::TDF;
namespace TTraits = ROOT::TypeTraits;

/**
* \class ROOT::Experimental::TDF::TInterface
Expand Down Expand Up @@ -127,7 +128,7 @@ public:
TDFInternal::CheckFilter(f);
auto df = GetDataFrameChecked();
const ColumnNames_t &defBl = df->GetDefaultBranches();
auto nArgs = TDFInternal::TFunctionTraits<F>::Args_t::fgSize;
auto nArgs = TTraits::CallableTraits<F>::arg_types::list_size;
const ColumnNames_t &actualBl = TDFInternal::PickBranchNames(nArgs, bn, defBl);
using DFF_t = TDFDetail::TFilter<F, Proxied>;
auto FilterPtr = std::make_shared<DFF_t>(std::move(f), actualBl, *fProxiedPtr, name);
Expand Down Expand Up @@ -207,7 +208,7 @@ public:
auto df = GetDataFrameChecked();
TDFInternal::CheckTmpBranch(name, df->GetTree());
const ColumnNames_t &defBl = df->GetDefaultBranches();
auto nArgs = TDFInternal::TFunctionTraits<F>::Args_t::fgSize;
auto nArgs = TTraits::CallableTraits<F>::arg_types::list_size;
const ColumnNames_t &actualBl = TDFInternal::PickBranchNames(nArgs, bl, defBl);
using DFB_t = TDFDetail::TCustomColumn<F, Proxied>;
const std::string nameInt(name);
Expand Down Expand Up @@ -245,7 +246,7 @@ public:
TInterface<TLoopManager> Snapshot(std::string_view treename, std::string_view filename,
const ColumnNames_t &bnames)
{
using TypeInd_t = typename TDFInternal::TGenStaticSeq<sizeof...(BranchTypes)>::Type_t;
using TypeInd_t = typename TTraits::GenStaticSeq<sizeof...(BranchTypes)>::type;
return SnapshotImpl<BranchTypes...>(treename, filename, bnames, TypeInd_t());
}

Expand Down Expand Up @@ -375,9 +376,9 @@ public:
template <typename F>
void Foreach(F f, const ColumnNames_t &bl = {})
{
using Args_t = typename TDFInternal::TFunctionTraits<decltype(f)>::ArgsNoDecay_t;
using Ret_t = typename TDFInternal::TFunctionTraits<decltype(f)>::Ret_t;
ForeachSlot(TDFInternal::AddSlotParameter<Ret_t>(f, Args_t()), bl);
using arg_types = typename TTraits::CallableTraits<decltype(f)>::arg_types_nodecay;
using ret_type = typename TTraits::CallableTraits<decltype(f)>::ret_type;
ForeachSlot(TDFInternal::AddSlotParameter<ret_type>(f, arg_types()), bl);
}

////////////////////////////////////////////////////////////////////////////
Expand All @@ -401,7 +402,7 @@ public:
{
auto df = GetDataFrameChecked();
const ColumnNames_t &defBl = df->GetDefaultBranches();
auto nArgs = TDFInternal::TFunctionTraits<F>::Args_t::fgSize;
auto nArgs = TTraits::CallableTraits<F>::arg_types::list_size;
const ColumnNames_t &actualBl = TDFInternal::PickBranchNames(nArgs - 1, bl, defBl);
using Op_t = TDFInternal::ForeachSlotHelper<F>;
using DFA_t = TDFInternal::TAction<Op_t, Proxied>;
Expand All @@ -426,7 +427,7 @@ public:
///
/// This action is *lazy*: upon invocation of this method the calculation is
/// booked but not executed. See TResultProxy documentation.
template <typename F, typename T = typename TDFInternal::TFunctionTraits<F>::Ret_t>
template <typename F, typename T = typename TTraits::CallableTraits<F>::ret_type>
TResultProxy<T> Reduce(F f, std::string_view branchName = {})
{
static_assert(std::is_default_constructible<T>::value,
Expand All @@ -443,11 +444,11 @@ public:
/// \param[in] initValue The reduced object is initialised to this value rather than being default-constructed
///
/// See the description of the other Reduce overload for more information.
template <typename F, typename T = typename TDFInternal::TFunctionTraits<F>::Ret_t>
template <typename F, typename T = typename TTraits::CallableTraits<F>::ret_type>
TResultProxy<T> Reduce(F f, std::string_view branchName, const T &initValue)
{
using Args_t = typename TDFInternal::TFunctionTraits<F>::Args_t;
TDFInternal::CheckReduce(f, Args_t());
using arg_types = typename TTraits::CallableTraits<F>::arg_types;
TDFInternal::CheckReduce(f, arg_types());
auto df = GetDataFrameChecked();
unsigned int nSlots = df->GetNSlots();
auto bl = GetBranchNames<T>({branchName}, "reduce branch values");
Expand Down Expand Up @@ -941,7 +942,7 @@ private:
ActionType *)
{
using Op_t = TDFInternal::FillTOHelper<ActionResultType>;
using DFA_t = TDFInternal::TAction<Op_t, Proxied, TDFInternal::TTypeList<BranchTypes...>>;
using DFA_t = TDFInternal::TAction<Op_t, Proxied, TTraits::TypeList<BranchTypes...>>;
auto df = GetDataFrameChecked();
df->Book(std::make_shared<DFA_t>(Op_t(h, nSlots), bl, *fProxiedPtr));
}
Expand All @@ -956,11 +957,11 @@ private:

if (hasAxisLimits) {
using Op_t = TDFInternal::FillTOHelper<::TH1F>;
using DFA_t = TDFInternal::TAction<Op_t, Proxied, TDFInternal::TTypeList<BranchTypes...>>;
using DFA_t = TDFInternal::TAction<Op_t, Proxied, TTraits::TypeList<BranchTypes...>>;
df->Book(std::make_shared<DFA_t>(Op_t(h, nSlots), bl, *fProxiedPtr));
} else {
using Op_t = TDFInternal::FillHelper;
using DFA_t = TDFInternal::TAction<Op_t, Proxied, TDFInternal::TTypeList<BranchTypes...>>;
using DFA_t = TDFInternal::TAction<Op_t, Proxied, TTraits::TypeList<BranchTypes...>>;
df->Book(std::make_shared<DFA_t>(Op_t(h, nSlots), bl, *fProxiedPtr));
}
}
Expand All @@ -971,7 +972,7 @@ private:
TDFInternal::ActionTypes::Min *)
{
using Op_t = TDFInternal::MinHelper;
using DFA_t = TDFInternal::TAction<Op_t, Proxied, TDFInternal::TTypeList<BranchType>>;
using DFA_t = TDFInternal::TAction<Op_t, Proxied, TTraits::TypeList<BranchType>>;
auto df = GetDataFrameChecked();
df->Book(std::make_shared<DFA_t>(Op_t(minV, nSlots), bl, *fProxiedPtr));
}
Expand All @@ -982,7 +983,7 @@ private:
TDFInternal::ActionTypes::Max *)
{
using Op_t = TDFInternal::MaxHelper;
using DFA_t = TDFInternal::TAction<Op_t, Proxied, TDFInternal::TTypeList<BranchType>>;
using DFA_t = TDFInternal::TAction<Op_t, Proxied, TTraits::TypeList<BranchType>>;
auto df = GetDataFrameChecked();
df->Book(std::make_shared<DFA_t>(Op_t(maxV, nSlots), bl, *fProxiedPtr));
}
Expand All @@ -993,7 +994,7 @@ private:
TDFInternal::ActionTypes::Mean *)
{
using Op_t = TDFInternal::MeanHelper;
using DFA_t = TDFInternal::TAction<Op_t, Proxied, TDFInternal::TTypeList<BranchType>>;
using DFA_t = TDFInternal::TAction<Op_t, Proxied, TTraits::TypeList<BranchType>>;
auto df = GetDataFrameChecked();
df->Book(std::make_shared<DFA_t>(Op_t(meanV, nSlots), bl, *fProxiedPtr));
}
Expand Down Expand Up @@ -1070,7 +1071,7 @@ protected:
/// the TTreeReaderValue/TemporaryBranch
template <typename... BranchTypes, int... S>
TInterface<TLoopManager> SnapshotImpl(std::string_view treename, std::string_view filename,
const ColumnNames_t &bnames, TDFInternal::TStaticSeq<S...> /*dummy*/)
const ColumnNames_t &bnames, TTraits::StaticSeq<S...> /*dummy*/)
{
// check for input sanity
const auto templateParamsN = sizeof...(S);
Expand Down Expand Up @@ -1108,7 +1109,7 @@ protected:
if (!ROOT::IsImplicitMTEnabled()) {
// single-thread snapshot
using Op_t = TDFInternal::SnapshotHelper<BranchTypes...>;
using DFA_t = TDFInternal::TAction<Op_t, Proxied, TDFInternal::TTypeList<BranchTypes...>>;
using DFA_t = TDFInternal::TAction<Op_t, Proxied, TTraits::TypeList<BranchTypes...>>;
actionPtr.reset(new DFA_t(Op_t(filenameInt, dirnameInt, treenameInt, bnames), bnames, *fProxiedPtr));
} else {
// multi-thread snapshot
Expand Down