chizeta/cnorxz
chizeta/cnorxz
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

some implementations reg FOR-utilities (step-array creation still missing)

Browse source
This commit is contained in:
Christian Zimmermann 2018-01-09 17:24:10 +01:00
parent 3b36f96bfa
commit 529ae3353e
7 changed files with 194 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
src/multi_array_operation.h
View file

@ -84,7 +84,9 @@ namespace MultiArrayTools
class AssignmentExpr
{
public:
AssignmentExpr(OperationMaster* mPtr, OpClass* secPtr);
static size_t layer() { return 0; }
AssignmentExpr(OperationMaster* mPtr, const OpClass* secPtr);
AssignmentExpr(AssignmentExpr&& in) = default;
AssignmentExpr& operator=(AssignmentExpr&& in) = default;
@ -95,7 +97,7 @@ namespace MultiArrayTools
AssignmentExpr() = default;
OperationMaster* mMPtr;
OpClass* mSecPtr;
const OpClass* mSecPtr;
};
typedef T value_type;
@ -104,6 +106,8 @@ namespace MultiArrayTools
typedef typename MultiRange<Ranges...>::IndexType IndexType;
typedef MBlock<T> bType;
static size_t rootNum() { return 1; }
OperationMaster(MutableMultiArrayBase<T,Ranges...>& ma, const OpClass& second,
std::shared_ptr<typename CRange::IndexType>& index);
@ -117,7 +121,7 @@ namespace MultiArrayTools
std::vector<BTSS> block(const IndexInfo* blockIndex, bool init = false) const;
const OperationMaster& block() const;
protected:
private:
std::shared_ptr<IndexType> mkIndex(std::shared_ptr<typename CRange::IndexType>& index);
void performAssignment(std::intptr_t blockIndexNum);
@ -142,6 +146,8 @@ namespace MultiArrayTools
typedef typename CRange::IndexType IndexType;
typedef Block<T> bType;
static size_t rootNum() { return 1; }
ConstOperationRoot(const MultiArrayBase<T,Ranges...>& ma,
const std::shared_ptr<typename Ranges::IndexType>&... indices);
@ -150,7 +156,9 @@ namespace MultiArrayTools
std::vector<BTSS> block(const IndexInfo* blockIndex, bool init = false) const;
const ConstOperationRoot& block() const;
protected:
std::tuple<size_t> rootSteps(const IndexInfo* ii = nullptr) const; // nullptr for simple usage with decltype
private:
std::shared_ptr<IndexType>
mkIndex(const MultiArrayBase<T,Ranges...>& ma,
@ -174,6 +182,8 @@ namespace MultiArrayTools
typedef typename CRange::IndexType IndexType;
typedef MBlock<T> bType;
static size_t rootNum() { return 1; }
OperationRoot(MutableMultiArrayBase<T,Ranges...>& ma,
const std::shared_ptr<typename Ranges::IndexType>&... indices);
@ -187,7 +197,9 @@ namespace MultiArrayTools
std::vector<BTSS> block(const IndexInfo* blockIndex, bool init = false) const;
const OperationRoot& block() const;
protected:
std::tuple<size_t> rootSteps(const IndexInfo* ii = nullptr) const; // nullptr for simple usage with decltype
private:
std::shared_ptr<IndexType>
mkIndex(const MultiArrayBase<T,Ranges...>& ma,
@ -200,6 +212,18 @@ namespace MultiArrayTools
const IndexInfo* mBlockII; // predefine to save time
};
template <class Op>
size_t sumRootNum()
{
return typename Op::rootNum();
}
template <class Op1, class Op2, class... Ops>
size_t sumRootNum()
{
return typename Op1::rootNum() + sumRootNum<Op2,Ops...>();
}
template <typename T, class OpFunction, class... Ops>
class Operation : public OperationTemplate<T,Operation<T,OpFunction,Ops...> >
{
@ -211,6 +235,13 @@ namespace MultiArrayTools
typedef OpFunction F;
typedef BlockResult<T> bType;
static size_t rootNum() { return sumRootNum<Ops...>(); }
private:
std::tuple<Ops const&...> mOps;
mutable bType mRes;
public:
Operation(const Ops&... ops);
const BlockResult<T>& get() const;
@ -218,9 +249,9 @@ namespace MultiArrayTools
std::vector<BTSS> block(const IndexInfo* blockIndex, bool init = false) const;
const Operation& block() const;
protected:
std::tuple<Ops const&...> mOps;
mutable bType mRes;
auto rootSteps(const IndexInfo* ii = nullptr) const // nullptr for simple usage with decltype
-> decltype(PackNum<sizeof...(Ops)-1>::mkStepTuple(ii, mOps));
};
template <typename T, class Op, class IndexType>
@ -232,6 +263,15 @@ namespace MultiArrayTools
typedef OperationTemplate<T,Contraction<T,Op,IndexType> > OT;
typedef BlockResult<T> bType;
static size_t rootNum() { return typename Op::rootNum(); }
private:
const Op& mOp;
std::shared_ptr<IndexType> mInd;
mutable bType mRes;
public:
Contraction(const Op& op, std::shared_ptr<IndexType> ind);
const BlockResult<T>& get() const;
@ -239,11 +279,9 @@ namespace MultiArrayTools
std::vector<BTSS> block(const IndexInfo* blockIndex, bool init = false) const;
const Contraction& block() const;
protected:
auto rootSteps(const IndexInfo* ii = nullptr) const // nullptr for simple usage with decltype
-> decltype(mOp.rootSteps(ii));
const Op& mOp;
std::shared_ptr<IndexType> mInd;
mutable bType mRes;
};
}
@ -399,13 +437,21 @@ namespace MultiArrayTools
template <typename T, class OpClass, class... Ranges>
void OperationMaster<T,OpClass,Ranges...>::performAssignment(std::intptr_t blockIndexNum)
{
//static auto loop = mkLoop(mIndex, *this, mSecond);
//loop();
#ifdef XX_USE_NEW_LOOP_ROUTINE_XX
// === N E W ===
AssignmentExpr ae(this, &mSecond);
typedef decltype(mSecond.rootSteps()) RootStepType;
std::array<RootStepType,/*sizeof single indices!!*/>
ee(PackNum</*sizeof single indices!!*/-1>::mkExt(mIndex, mSecond));
static auto loop = mIndex->ifor(ee, ae);
loop();
#else
// === O L D ===
for(*mIndex = 0; mIndex->pos() != mIndex->max(); mIndex->pp(blockIndexNum) ){
block();
get() = mSecond.get();
}
#endif
}
template <typename T, class OpClass, class... Ranges>
@ -485,6 +531,12 @@ namespace MultiArrayTools
return *this;
}
template <typename T, class... Ranges>
std::tuple<size_t> ConstOperationRoot<T,Ranges...>::rootSteps(const IndexInfo* ii) const
{
return std::tuple<size_t>(0ul); // !!!!!!
}
/***********************
* OperationRoot *
***********************/
@ -560,6 +612,12 @@ namespace MultiArrayTools
return *this;
}
template <typename T, class... Ranges>
std::tuple<size_t> OperationRoot<T,Ranges...>::rootSteps(const IndexInfo* ii) const
{
return std::tuple<size_t>(0ul); // !!!!!!
}
/*******************
* Operation *
*******************/
@ -595,6 +653,14 @@ namespace MultiArrayTools
return *this;
}
template <typename T, class OpFunction, class... Ops>
auto Operation<T,OpFunction,Ops...>::rootSteps(const IndexInfo* ii) const
-> decltype(PackNum<sizeof...(Ops)-1>::mkStepTuple(ii, mOps))
{
return PackNum<sizeof...(Ops)-1>::mkStepTuple(ii, mOps);
}
/*********************
* Contraction *
*********************/
@ -630,6 +696,13 @@ namespace MultiArrayTools
return *this;
}
template <typename T, class Op, class IndexType>
auto Contraction<T,Op,IndexType>::rootSteps(const IndexInfo* ii) const
-> decltype(mOp.rootSteps(ii))
{
return mOp.rootSteps(ii);
}
}
#endif

25
src/pack_num.h
View file

@ -44,11 +44,24 @@ namespace MultiArrayHelper
}
template <typename... T>
static void printTuple(std::ostream& out, const std::tuple<T...>& tp){
static void printTuple(std::ostream& out, const std::tuple<T...>& tp)
{
out << std::get<sizeof...(T)-N-1>(tp) << ", ";
PackNum<N-1>::printTuple(out, tp);
}
template <class... Ops>
static auto mkStepTuple(const IndexInfo* ii, std::tuple<Ops const&...> otp)
-> decltype(std::tuple_cat( PackNum<N-1>::mkStepTuple(ii, otp), std::get<N>(otp).rootSteps(ii) ))
{
return std::tuple_cat( PackNum<N-1>::mkStepTuple(ii, otp), std::get<N>(otp).rootSteps(ii) );
}
/*
template <class IndexClass, class OpClass>
static auto mkExt(const std::shared_ptr<IndexClass>& idxPtr, const OpClass& second)
{
// !!!!!
}*/
};
template<>
@ -83,10 +96,18 @@ namespace MultiArrayHelper
}
template <typename... T>
static void printTuple(std::ostream& out, const std::tuple<T...>& tp){
static void printTuple(std::ostream& out, const std::tuple<T...>& tp)
{
out << std::get<sizeof...(T)-1>(tp);
}
template <class... Ops>
static auto mkStepTuple(const IndexInfo* ii, std::tuple<Ops const&...> otp)
-> decltype(std::get<0>(otp).rootSteps(ii))
{
return std::get<0>(otp).rootSteps(ii);
}
};

14
src/ranges/container_range.h
View file

@ -88,9 +88,9 @@ namespace MultiArrayTools
std::string id();
void print(size_t offset);
template <class... Exprs>
auto ifor(Exprs&&... exs) const
-> decltype(RPackNum<sizeof...(Indices)-1>::mkFor(mIPack, exs...));
template <class Ext, class Exprs>
auto ifor(const Ext& ext, Exprs&& exs) const
-> decltype(RPackNum<sizeof...(Indices)-1>::mkFor(mIPack, ext, exs));
};
@ -371,11 +371,11 @@ namespace MultiArrayTools
}
template <class... Indices>
template <class... Exprs>
auto ContainerIndex<Indices...>::ifor(Exprs&&... exs) const
-> decltype(RPackNum<sizeof...(Indices)-1>::mkFor(mIPack, exs...))
template <class Ext, class Exprs>
auto ContainerIndex<Indices...>::ifor(const Ext& ext, Exprs&& exs) const
-> decltype(RPackNum<sizeof...(Indices)-1>::mkFor(mIPack, ext, exs))
{
return RPackNum<sizeof...(Indices)-1>::mkFor(mIPack, exs...);
return RPackNum<sizeof...(Indices)-1>::mkFor(mIPack, ext, exs);
}

14
src/ranges/multi_range.h
View file

@ -104,9 +104,9 @@ namespace MultiArrayTools
std::string id();
void print(size_t offset);
template <class... Exprs>
auto ifor(Exprs&&... exs) const
-> decltype(RPackNum<sizeof...(Indices)-1>::mkFor(mIPack, exs...));
template <class Ext, class Exprs>
auto ifor(const Ext& ext, Exprs&& exs) const
-> decltype(RPackNum<sizeof...(Indices)-1>::mkFor(mIPack, ext, exs));
};
/*************************
@ -415,11 +415,11 @@ namespace MultiArrayTools
}
template <class... Indices>
template <class... Exprs>
auto MultiIndex<Indices...>::ifor(Exprs&&... exs) const
-> decltype(RPackNum<sizeof...(Indices)-1>::mkFor(mIPack, exs...))
template <class Ext, class Exprs>
auto MultiIndex<Indices...>::ifor(const Ext& ext, Exprs&& exs) const
-> decltype(RPackNum<sizeof...(Indices)-1>::mkFor(mIPack, ext, exs))
{
return RPackNum<sizeof...(Indices)-1>::mkFor(mIPack, exs...);
return RPackNum<sizeof...(Indices)-1>::mkFor(mIPack, ext, exs);
}
/*************************

19
src/ranges/rpack_num.h
View file

@ -219,14 +219,13 @@ namespace MultiArrayHelper
RPackNum<N-1>::buildInfoVec(out, ip, bs);
}
template <class IndexPack, class... Exprs>
static auto mkFor(const IndexPack& ipack, Exprs&&... exs)
template <class IndexPack, class Ext, class Exprs>
static auto mkFor(const IndexPack& ipack, const Ext& ext, Exprs&& exs)
-> decltype(std::get<std::tuple_size<IndexPack>::value-N>(ipack)
->ifor(RPackNum<N-1>::template mkFor<IndexPack,Exprs...>
(ipack, exs...) ) )
->ifor(ext, RPackNum<N-1>::mkFor(ipack, ext, exs) ) )
{
return std::get<std::tuple_size<IndexPack>::value-N>(ipack)
->ifor( RPackNum<N-1>::template mkFor<IndexPack,Exprs...>(ipack, exs...) );
->ifor( ext, RPackNum<N-1>::mkFor(ipack, ext, exs) );
}
};
@ -392,12 +391,12 @@ namespace MultiArrayHelper
out.emplace_back(*std::get<POS>(ip), std::get<POS>(bs));
}
template <class IndexPack, class... Exprs>
static auto mkFor(const IndexPack& ipack, Exprs&&... exs)
-> decltype(std::get<std::tuple_size<IndexPack>::value-1>(ipack)
->ifor(exs...) )
template <class IndexPack, class Ext, class Exprs>
static auto mkFor(const IndexPack& ipack, const Ext& ext, Exprs&& exs)
-> decltype(std::get<std::tuple_size<IndexPack>::value-1>(ipack, ext)
->ifor(ext, exs) )
{
return std::get<std::tuple_size<IndexPack>::value-1>(ipack)->ifor(exs...);
return std::get<std::tuple_size<IndexPack>::value-1>(ipack)->ifor(ext, exs);
}
};

12
src/ranges/single_range.h
View file

@ -64,8 +64,8 @@ namespace MultiArrayTools
std::string id();
void print(size_t offset);
template <class Expr, class... Ops>
auto ifor(std::tuple<to_size_t<Ops>...>&& ee, Expr&& ex) const
template <class Expr, size_t DIM, class... Ops>
auto ifor(const std::array<std::tuple<to_size_t<Ops>...>,DIM>& ee, Expr&& ex) const
-> For<SingleIndex<U,TYPE>,Expr,Ops...>;
};
@ -248,12 +248,12 @@ namespace MultiArrayTools
}
template <typename U, SpaceType TYPE>
template <class Expr, class... Ops>
auto SingleIndex<U,TYPE>::ifor(std::tuple<to_size_t<Ops>...>&& ee, Expr&& ex) const
template <class Expr, size_t DIM, class... Ops>
auto SingleIndex<U,TYPE>::ifor(const std::array<std::tuple<to_size_t<Ops>...>,DIM>& ee, Expr&& ex) const
-> For<SingleIndex<U,TYPE>,Expr,Ops...>
{
return For<SingleIndex<U,TYPE>,Expr>
( std::make_shared<SingleIndex<U,TYPE> >(*this), ex, ee );
static const size_t layer = typename Expr::layer();
return For<SingleIndex<U,TYPE>,Expr,Ops...>( this, ex, std::get<layer>( ee ) );
}

48
src/xfor/xfor.h
View file

@ -15,6 +15,8 @@ namespace MultiArrayHelper
{
public:
static size_t layer() { return typename Expr::layer() + 1; }
For(For&& in) = default;
For& operator=(For&& in) = default;
@ -25,16 +27,30 @@ namespace MultiArrayHelper
For(const std::shared_ptr<IndexClass>& indPtr,
Expr&& expr, std::tuple<to_size_t<Ops>...>&& ext);
template <typename... Args>
For(IndexClass* indPtr,
std::tuple<to_size_t<Ops>...>&& ext, const Args&... args);
For(IndexClass* indPtr,
Expr&& expr, std::tuple<to_size_t<Ops>...>&& ext);
inline void operator()(size_t mlast, const std::tuple<to_size_t<Ops>...>& last) const;
inline void operator()(size_t mlast = 0) const;
private:
For() = default;
mutable std::shared_ptr<IndexClass> mIndPtr;
IndexClass* mIndPtr;
const Expr mExpr;
const std::tuple<to_size_t<Ops>...> mExt;
};
template <size_t N>
size_t exceptMax(size_t max) { return max; }
template <>
size_t exceptMax<1>(size_t max) { return 1; }
} // namespace MultiArrayHelper
@ -51,11 +67,23 @@ namespace MultiArrayHelper
For<IndexClass,Expr,Ops...>::For(const std::shared_ptr<IndexClass>& indPtr,
std::tuple<to_size_t<Ops>...>&& ext,
const Args&... args) :
mIndPtr(indPtr), mExpr(args...), mExt(ext) {}
mIndPtr(indPtr.get()), mExpr(args...), mExt(ext) {}
template <class IndexClass, class Expr, class... Ops>
For<IndexClass,Expr,Ops...>::For(const std::shared_ptr<IndexClass>& indPtr,
Expr&& expr, std::tuple<to_size_t<Ops>...>&& ext) :
mIndPtr(indPtr.get()), mExpr(expr), mExt(ext) {}
template <class IndexClass, class Expr, class... Ops>
template <typename... Args>
For<IndexClass,Expr,Ops...>::For(IndexClass* indPtr,
std::tuple<to_size_t<Ops>...>&& ext,
const Args&... args) :
mIndPtr(indPtr), mExpr(args...), mExt(ext) {}
template <class IndexClass, class Expr, class... Ops>
For<IndexClass,Expr,Ops...>::For(IndexClass* indPtr,
Expr&& expr, std::tuple<to_size_t<Ops>...>&& ext) :
mIndPtr(indPtr), mExpr(expr), mExt(ext) {}
template <class IndexClass, class Expr, class... Ops>
@ -64,7 +92,21 @@ namespace MultiArrayHelper
{
static const size_t opNum = sizeof...(Ops);
auto& ind = *mIndPtr;
const size_t max = ind.max();
const size_t max = exceptMax<For<IndexClass,Expr,Ops...>::layer()>( ind.max() ); // blocking
for(ind = 0; ind.pos() != max; ++ind){
const size_t mnpos = mlast * max + ind.pos();
const std::tuple<to_size_t<Ops>...> npos = std::move( XFPackNum<opNum-1>::mkPos(ind, mExt, last) );
mExpr(mnpos, npos);
}
}
template <class IndexClass, class Expr, class... Ops>
inline void For<IndexClass,Expr,Ops...>::operator()(size_t mlast) const
{
static const size_t opNum = sizeof...(Ops);
std::tuple<to_size_t<Ops>...> last(to_size_t<Ops>(0)...);
auto& ind = *mIndPtr;
const size_t max = exceptMax<For<IndexClass,Expr,Ops...>::layer()>( ind.max() ); // blocking
for(ind = 0; ind.pos() != max; ++ind){
const size_t mnpos = mlast * max + ind.pos();
const std::tuple<to_size_t<Ops>...> npos = std::move( XFPackNum<opNum-1>::mkPos(ind, mExt, last) );