corrections + partially pre-compile hl operations
This commit is contained in:
parent
863dd09b40
commit
51961901a0
8 changed files with 157 additions and 90 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -4,3 +4,4 @@ build/
|
||||||
install/
|
install/
|
||||||
*/build/
|
*/build/
|
||||||
*/install/
|
*/install/
|
||||||
|
src/lib/hl_ops/*.cc
|
|
@ -176,8 +176,6 @@ namespace MultiArrayTools
|
||||||
typename B::template RetT<Inds...> res;
|
typename B::template RetT<Inds...> res;
|
||||||
Create<N-1>::template cx<Inds...>::template ccx<ROP,OpF>::template cccx<N>
|
Create<N-1>::template cx<Inds...>::template ccx<ROP,OpF>::template cccx<N>
|
||||||
(res,mIn,inds...);
|
(res,mIn,inds...);
|
||||||
// assert(res.op.init());
|
|
||||||
//assert(res.outer.init());
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -262,26 +260,47 @@ namespace MultiArrayTools
|
||||||
if(dim > 2){
|
if(dim > 2){
|
||||||
auto ci1 = di->getP(dim-2)->reduced();
|
auto ci1 = di->getP(dim-2)->reduced();
|
||||||
auto ci2 = di->getP(dim-1)->reduced();
|
auto ci2 = di->getP(dim-1)->reduced();
|
||||||
//auto ci1 = std::dynamic_pointer_cast<IndexWrapper<CI>>(di->getP(dim-2));
|
|
||||||
//auto ci2 = std::dynamic_pointer_cast<IndexWrapper<CI>>(di->getP(dim-1));
|
|
||||||
assert(ci1 != nullptr);
|
assert(ci1 != nullptr);
|
||||||
assert(ci2 != nullptr);
|
assert(ci2 != nullptr);
|
||||||
auto odi = mkSubSpaceX(di, dim-2);
|
auto odi = mkSubSpaceX(di, dim-2);
|
||||||
auto mi = mkMIndex(is..., odi);
|
auto mi = mkMIndex(is..., odi);
|
||||||
//this->assign(in, mi, ci1->getIndex(), ci2->getIndex());
|
|
||||||
this->assign(in, mi, ci1, ci2);
|
this->assign(in, mi, ci1, ci2);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
assert(dim == 2 or dim == 1);
|
assert(dim == 2 or dim == 1);
|
||||||
//auto ci1 = std::dynamic_pointer_cast<IndexWrapper<CI>>(di->getP(dim-2));
|
|
||||||
auto ci1 = di->getP(dim-1)->reduced();
|
auto ci1 = di->getP(dim-1)->reduced();
|
||||||
assert(ci1 != nullptr);
|
assert(ci1 != nullptr);
|
||||||
auto odi = mkSubSpaceX(di, dim-1);
|
auto odi = mkSubSpaceX(di, dim-1);
|
||||||
auto mi = mkMIndex(is..., odi);
|
auto mi = mkMIndex(is..., odi);
|
||||||
this->assign(in, mi, ci1);
|
this->assign(in, mi, ci1);
|
||||||
}
|
}
|
||||||
//INDS<ROP,Indices...>::template CallHLOp<> call;
|
return *this;
|
||||||
//call.assign(*this, in, is..., di);
|
}
|
||||||
|
|
||||||
|
template <class ROP>
|
||||||
|
template <class... Indices>
|
||||||
|
HighLevelOpHolder<ROP>& HighLevelOpHolder<ROP>::xplus(const HighLevelOpHolder& in,
|
||||||
|
const std::shared_ptr<DynamicIndex>& di,
|
||||||
|
const std::shared_ptr<Indices>&... is)
|
||||||
|
{
|
||||||
|
const size_t dim = di->dim();
|
||||||
|
if(dim > 2){
|
||||||
|
auto ci1 = di->getP(dim-2)->reduced();
|
||||||
|
auto ci2 = di->getP(dim-1)->reduced();
|
||||||
|
assert(ci1 != nullptr);
|
||||||
|
assert(ci2 != nullptr);
|
||||||
|
auto odi = mkSubSpaceX(di, dim-2);
|
||||||
|
auto mi = mkMIndex(is..., odi);
|
||||||
|
this->plus(in, mi, ci1, ci2);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
assert(dim == 2 or dim == 1);
|
||||||
|
auto ci1 = di->getP(dim-1)->reduced();
|
||||||
|
assert(ci1 != nullptr);
|
||||||
|
auto odi = mkSubSpaceX(di, dim-1);
|
||||||
|
auto mi = mkMIndex(is..., odi);
|
||||||
|
this->plus(in, mi, ci1);
|
||||||
|
}
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -305,12 +324,11 @@ namespace MultiArrayTools
|
||||||
const std::shared_ptr<MIndex>& mi,
|
const std::shared_ptr<MIndex>& mi,
|
||||||
const std::shared_ptr<Indices>&... inds)
|
const std::shared_ptr<Indices>&... inds)
|
||||||
{
|
{
|
||||||
//VCHECK(printInd(inds...));
|
|
||||||
auto xx = mkArrayPtr<double>(nullr());
|
auto xx = mkArrayPtr<double>(nullr());
|
||||||
ROP& opr = *mOp->get();
|
ROP& opr = *mOp->get();
|
||||||
if(in.root()){
|
if(in.root()){
|
||||||
auto inx = in;
|
auto inx = in;
|
||||||
opr.par() = *inx.get();
|
opr.par().assign( *inx.get(), mkMIndex(mi,inds...) )();
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
auto loop = mkPILoop
|
auto loop = mkPILoop
|
||||||
|
@ -318,8 +336,6 @@ namespace MultiArrayTools
|
||||||
auto inx = in;
|
auto inx = in;
|
||||||
auto dop = inx.create(inds...);
|
auto dop = inx.create(inds...);
|
||||||
DynamicO<size_t> gexp;
|
DynamicO<size_t> gexp;
|
||||||
//VCHECK(dop.outer.init());
|
|
||||||
//VCHECK(dop.op.init());
|
|
||||||
if(dop.outer.init()){
|
if(dop.outer.init()){
|
||||||
gexp = mkDynOp1<size_t>(mkMOp<size_t>(dop.outer,dop.op));
|
gexp = mkDynOp1<size_t>(mkMOp<size_t>(dop.outer,dop.op));
|
||||||
}
|
}
|
||||||
|
@ -347,7 +363,7 @@ namespace MultiArrayTools
|
||||||
ROP& opr = *mOp->get();
|
ROP& opr = *mOp->get();
|
||||||
if(in.root()){
|
if(in.root()){
|
||||||
auto inx = in;
|
auto inx = in;
|
||||||
opr.par() += *inx.get();
|
opr.par().plus( *inx.get(), mkMIndex(mi,inds...) )();
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
auto loop = mkPILoop
|
auto loop = mkPILoop
|
||||||
|
|
|
@ -13,6 +13,11 @@ namespace MultiArrayTools
|
||||||
typedef CR::IndexType CI;
|
typedef CR::IndexType CI;
|
||||||
typedef std::shared_ptr<CI> CIP;
|
typedef std::shared_ptr<CI> CIP;
|
||||||
|
|
||||||
|
typedef OperationRoot<double,CR,DynamicRange> OpCD;
|
||||||
|
typedef OperationRoot<double,DynamicRange> OpD;
|
||||||
|
extern template class OperationRoot<double,CR,DynamicRange>;
|
||||||
|
extern template class OperationRoot<double,DynamicRange>;
|
||||||
|
|
||||||
template <typename T, class Op>
|
template <typename T, class Op>
|
||||||
DynamicO<T> mkDynOp1(const Op& op);
|
DynamicO<T> mkDynOp1(const Op& op);
|
||||||
|
|
||||||
|
@ -90,6 +95,11 @@ namespace MultiArrayTools
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extern template class HighLevelOpBase<OpCD>;
|
||||||
|
extern template class HighLevelOpBase<OpD>;
|
||||||
|
extern template class HighLevelOpRoot<OpCD>;
|
||||||
|
extern template class HighLevelOpRoot<OpD>;
|
||||||
|
|
||||||
template <class OpF, class... Ops>
|
template <class OpF, class... Ops>
|
||||||
auto mkFOp(const Ops&... ops)
|
auto mkFOp(const Ops&... ops)
|
||||||
{
|
{
|
||||||
|
@ -125,6 +135,20 @@ namespace MultiArrayTools
|
||||||
#undef reg_ind3
|
#undef reg_ind3
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extern template class HighLevelOp<OpCD,plusx<double,double>,2>;
|
||||||
|
extern template class HighLevelOp<OpCD,minusx<double,double>,2>;
|
||||||
|
extern template class HighLevelOp<OpCD,multipliesx<double,double>,2>;
|
||||||
|
extern template class HighLevelOp<OpCD,dividesx<double,double>,2>;
|
||||||
|
extern template class HighLevelOp<OpD,plusx<double,double>,2>;
|
||||||
|
extern template class HighLevelOp<OpD,minusx<double,double>,2>;
|
||||||
|
extern template class HighLevelOp<OpD,multipliesx<double,double>,2>;
|
||||||
|
extern template class HighLevelOp<OpD,dividesx<double,double>,2>;
|
||||||
|
|
||||||
|
#define regFunc1(fff) \
|
||||||
|
extern template class HighLevelOp<OpCD,x_##fff<double>,1>; \
|
||||||
|
extern template class HighLevelOp<OpD,x_##fff<double>,1>;
|
||||||
|
#include "extensions/math.h"
|
||||||
|
#undef regFunc1
|
||||||
|
|
||||||
template <class ROP>
|
template <class ROP>
|
||||||
class HighLevelOpHolder
|
class HighLevelOpHolder
|
||||||
|
@ -161,6 +185,11 @@ namespace MultiArrayTools
|
||||||
const std::shared_ptr<DynamicIndex>& di,
|
const std::shared_ptr<DynamicIndex>& di,
|
||||||
const std::shared_ptr<Indices>&... is);
|
const std::shared_ptr<Indices>&... is);
|
||||||
|
|
||||||
|
template <class... Indices>
|
||||||
|
HighLevelOpHolder& xplus(const HighLevelOpHolder& in,
|
||||||
|
const std::shared_ptr<DynamicIndex>& di,
|
||||||
|
const std::shared_ptr<Indices>&... is);
|
||||||
|
|
||||||
template <class MIndex, class... Indices>
|
template <class MIndex, class... Indices>
|
||||||
HighLevelOpHolder& assign(const HighLevelOpHolder& in,
|
HighLevelOpHolder& assign(const HighLevelOpHolder& in,
|
||||||
const std::shared_ptr<MIndex>& mi,
|
const std::shared_ptr<MIndex>& mi,
|
||||||
|
@ -172,6 +201,9 @@ namespace MultiArrayTools
|
||||||
const std::shared_ptr<Indices>&... inds);
|
const std::shared_ptr<Indices>&... inds);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extern template class HighLevelOpHolder<OpCD>;
|
||||||
|
extern template class HighLevelOpHolder<OpD>;
|
||||||
|
|
||||||
template <class F, class ROP, class... ROPs>
|
template <class F, class ROP, class... ROPs>
|
||||||
HighLevelOpHolder<ROP> mkSFunc(const HighLevelOpHolder<ROP>& a, const HighLevelOpHolder<ROPs>&... as);
|
HighLevelOpHolder<ROP> mkSFunc(const HighLevelOpHolder<ROP>& a, const HighLevelOpHolder<ROPs>&... as);
|
||||||
|
|
||||||
|
@ -179,87 +211,19 @@ namespace MultiArrayTools
|
||||||
template <class ROP>
|
template <class ROP>
|
||||||
HighLevelOpHolder<ROP> mkHLO(const ROP& op);
|
HighLevelOpHolder<ROP> mkHLO(const ROP& op);
|
||||||
|
|
||||||
#define SP " "
|
|
||||||
#define regFunc1(fff) template <class ROP> \
|
#define regFunc1(fff) template <class ROP> \
|
||||||
HighLevelOpHolder<ROP> hl_##fff (const HighLevelOpHolder<ROP>& in);
|
HighLevelOpHolder<ROP> hl_##fff (const HighLevelOpHolder<ROP>& in);
|
||||||
#include "extensions/math.h"
|
#include "extensions/math.h"
|
||||||
#undef regFunc1
|
#undef regFunc1
|
||||||
#undef SP
|
|
||||||
/*
|
|
||||||
template <size_t N>
|
|
||||||
struct SetLInds
|
|
||||||
{
|
|
||||||
template <class ITuple>
|
|
||||||
static inline void mkLIT(const ITuple& itp, const std::shared_ptr<DynamicIndex>& di);
|
|
||||||
|
|
||||||
template <class Tar, class ITp, typename... Args>
|
#define regFunc1(fff) template <class ROP> \
|
||||||
struct xx
|
HighLevelOpHolder<ROP> hl_##fff (const HighLevelOpHolder<ROP>& in); \
|
||||||
{
|
extern template HighLevelOpHolder<OpCD> hl_##fff (const HighLevelOpHolder<OpCD>& in); \
|
||||||
template <class... Is>
|
extern template HighLevelOpHolder<OpD> hl_##fff (const HighLevelOpHolder<OpD>& in);
|
||||||
static inline void assign(Tar& tar, const Args&... args,
|
#include "extensions/math.h"
|
||||||
const ITp& itp, const std::shared_ptr<Is>&... is);
|
#undef regFunc1
|
||||||
|
|
||||||
template <class... Is>
|
|
||||||
static inline void plus(Tar& tar, const Args&... args,
|
|
||||||
const ITp& itp, const std::shared_ptr<Is>&... is);
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
template <>
|
|
||||||
struct SetLInds<0>
|
|
||||||
{
|
|
||||||
template <class ITuple>
|
|
||||||
static inline void mkLIT(const ITuple& itp, const std::shared_ptr<DynamicIndex>& di);
|
|
||||||
|
|
||||||
template <class Tar, class ITp, typename... Args>
|
|
||||||
struct xx
|
|
||||||
{
|
|
||||||
template <class... Is>
|
|
||||||
static inline void assign(Tar& tar, const Args&... args,
|
|
||||||
const ITp& itp, const std::shared_ptr<Is>&... is);
|
|
||||||
|
|
||||||
template <class... Is>
|
|
||||||
static inline void plus(Tar& tar, const Args&... args,
|
|
||||||
const ITp& itp, const std::shared_ptr<Is>&... is);
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
template <class ROP, class... Indices>
|
|
||||||
struct INDS
|
|
||||||
{
|
|
||||||
class CallHLOpBase
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
size_t mDepth;
|
|
||||||
public:
|
|
||||||
size_t depth() const;
|
|
||||||
|
|
||||||
void assign(const HighLevelOpHolder<ROP>& target, const HighLevelOpHolder<ROP>& source,
|
|
||||||
const std::shared_ptr<Indices>&... is,
|
|
||||||
const std::shared_ptr<DynamicIndex>& di) const = 0;
|
|
||||||
|
|
||||||
void plus(const HighLevelOpHolder<ROP>& target, const HighLevelOpHolder<ROP>& source,
|
|
||||||
const std::shared_ptr<Indices>&... is,
|
|
||||||
const std::shared_ptr<DynamicIndex>& di) const = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
template <class... LIndices>
|
|
||||||
class CallHLOp
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
typedef std::tuple<std::shared_ptr<LIndices>...> ITuple;
|
|
||||||
static vector<std::shared_ptr<CallHLOpBase>> sNext;
|
|
||||||
public:
|
|
||||||
void assign(HighLevelOpHolder<ROP>& target, const HighLevelOpHolder<ROP>& source,
|
|
||||||
const std::shared_ptr<Indices>&... is,
|
|
||||||
const std::shared_ptr<DynamicIndex>& di) const override final;
|
|
||||||
|
|
||||||
void plus(HighLevelOpHolder<ROP>& target, const HighLevelOpHolder<ROP>& source,
|
|
||||||
const std::shared_ptr<Indices>&... is,
|
|
||||||
const std::shared_ptr<DynamicIndex>& di) const override final;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -711,6 +711,17 @@ namespace MultiArrayTools
|
||||||
(mOrigDataPtr,*this,in)));
|
(mOrigDataPtr,*this,in)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <typename T, class... Ranges>
|
||||||
|
template <class OpClass, class Index>
|
||||||
|
auto ParallelOperationRoot<T,Ranges...>::assign(const OpClass& in, const std::shared_ptr<Index>& i) const
|
||||||
|
-> decltype(i->pifor(1,in.loop(AssignmentExpr2<T,ParallelOperationRoot<T,Ranges...>,OpClass>
|
||||||
|
(mOrigDataPtr,*this,in))))
|
||||||
|
{
|
||||||
|
static_assert( OpClass::SIZE == decltype(in.rootSteps())::SIZE, "Ext Size mismatch" );
|
||||||
|
return i->pifor(1,in.loop(AssignmentExpr2<T,ParallelOperationRoot<T,Ranges...>,OpClass>
|
||||||
|
(mOrigDataPtr,*this,in)));
|
||||||
|
}
|
||||||
|
|
||||||
template <typename T, class... Ranges>
|
template <typename T, class... Ranges>
|
||||||
template <class OpClass>
|
template <class OpClass>
|
||||||
auto ParallelOperationRoot<T,Ranges...>::plus(const OpClass& in)
|
auto ParallelOperationRoot<T,Ranges...>::plus(const OpClass& in)
|
||||||
|
@ -721,6 +732,17 @@ namespace MultiArrayTools
|
||||||
(mOrigDataPtr,*this,in)));
|
(mOrigDataPtr,*this,in)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <typename T, class... Ranges>
|
||||||
|
template <class OpClass, class Index>
|
||||||
|
auto ParallelOperationRoot<T,Ranges...>::plus(const OpClass& in, const std::shared_ptr<Index>& i) const
|
||||||
|
-> decltype(i->pifor(1,in.loop(AddExpr<T,ParallelOperationRoot<T,Ranges...>,OpClass>
|
||||||
|
(mOrigDataPtr,*this,in))))
|
||||||
|
{
|
||||||
|
static_assert( OpClass::SIZE == decltype(in.rootSteps())::SIZE, "Ext Size mismatch" );
|
||||||
|
return i->pifor(1,in.loop(AddExpr<T,ParallelOperationRoot<T,Ranges...>,OpClass>
|
||||||
|
(mOrigDataPtr,*this,in)));
|
||||||
|
}
|
||||||
|
|
||||||
template <typename T, class... Ranges>
|
template <typename T, class... Ranges>
|
||||||
template <class OpClass>
|
template <class OpClass>
|
||||||
ParallelOperationRoot<T,Ranges...>& ParallelOperationRoot<T,Ranges...>::operator=(const OpClass& in)
|
ParallelOperationRoot<T,Ranges...>& ParallelOperationRoot<T,Ranges...>::operator=(const OpClass& in)
|
||||||
|
|
|
@ -587,11 +587,21 @@ namespace MultiArrayTools
|
||||||
-> decltype(mIndex.pifor(1,in.loop(AssignmentExpr2<T,ParallelOperationRoot<T,Ranges...>,OpClass,OpIndexAff::TARGET>
|
-> decltype(mIndex.pifor(1,in.loop(AssignmentExpr2<T,ParallelOperationRoot<T,Ranges...>,OpClass,OpIndexAff::TARGET>
|
||||||
(mOrigDataPtr,*this,in))));
|
(mOrigDataPtr,*this,in))));
|
||||||
|
|
||||||
|
template <class OpClass, class Index>
|
||||||
|
auto assign(const OpClass& in, const std::shared_ptr<Index>& i) const
|
||||||
|
-> decltype(i->pifor(1,in.loop(AssignmentExpr2<T,ParallelOperationRoot<T,Ranges...>,OpClass>
|
||||||
|
(mOrigDataPtr,*this,in))));
|
||||||
|
|
||||||
template <class OpClass>
|
template <class OpClass>
|
||||||
auto plus(const OpClass& in)
|
auto plus(const OpClass& in)
|
||||||
-> decltype(mIndex.pifor(1,in.loop(AddExpr<T,ParallelOperationRoot<T,Ranges...>,OpClass,OpIndexAff::TARGET>
|
-> decltype(mIndex.pifor(1,in.loop(AddExpr<T,ParallelOperationRoot<T,Ranges...>,OpClass,OpIndexAff::TARGET>
|
||||||
(mOrigDataPtr,*this,in))));
|
(mOrigDataPtr,*this,in))));
|
||||||
|
|
||||||
|
template <class OpClass, class Index>
|
||||||
|
auto plus(const OpClass& in, const std::shared_ptr<Index>& i) const
|
||||||
|
-> decltype(i->pifor(1,in.loop(AddExpr<T,ParallelOperationRoot<T,Ranges...>,OpClass>
|
||||||
|
(mOrigDataPtr,*this,in))));
|
||||||
|
|
||||||
template <class OpClass>
|
template <class OpClass>
|
||||||
ParallelOperationRoot& operator=(const OpClass& in);
|
ParallelOperationRoot& operator=(const OpClass& in);
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
|
|
||||||
|
execute_process ( COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mk_hl_op.sh
|
||||||
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ )
|
||||||
|
|
||||||
set(libmultiarray_a_SOURCES
|
set(libmultiarray_a_SOURCES
|
||||||
${CMAKE_SOURCE_DIR}/src/lib/ranges/range_base.cc
|
${CMAKE_SOURCE_DIR}/src/lib/ranges/range_base.cc
|
||||||
${CMAKE_SOURCE_DIR}/src/lib/ranges/anonymous_range.cc
|
${CMAKE_SOURCE_DIR}/src/lib/ranges/anonymous_range.cc
|
||||||
|
@ -16,6 +19,12 @@ foreach(ccfile ${cc_files})
|
||||||
${ccfile})
|
${ccfile})
|
||||||
endforeach(ccfile)
|
endforeach(ccfile)
|
||||||
|
|
||||||
|
file(GLOB cc_files "${CMAKE_SOURCE_DIR}/src/lib/hl_ops/*.cc")
|
||||||
|
foreach(ccfile ${cc_files})
|
||||||
|
set(libmultiarray_a_SOURCES ${libmultiarray_a_SOURCES}
|
||||||
|
${ccfile})
|
||||||
|
endforeach(ccfile)
|
||||||
|
|
||||||
add_library(multiarray_obj OBJECT
|
add_library(multiarray_obj OBJECT
|
||||||
${libmultiarray_a_SOURCES}
|
${libmultiarray_a_SOURCES}
|
||||||
)
|
)
|
||||||
|
|
|
@ -21,4 +21,15 @@ namespace MultiArrayTools
|
||||||
return odi;
|
return odi;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template class OperationRoot<double,CR,DynamicRange>;
|
||||||
|
template class OperationRoot<double,DynamicRange>;
|
||||||
|
|
||||||
|
template class HighLevelOpHolder<OpCD>;
|
||||||
|
template class HighLevelOpHolder<OpD>;
|
||||||
|
|
||||||
|
template class HighLevelOpBase<OpCD>;
|
||||||
|
template class HighLevelOpBase<OpD>;
|
||||||
|
template class HighLevelOpRoot<OpCD>;
|
||||||
|
template class HighLevelOpRoot<OpD>;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
34
src/lib/mk_hl_op.sh
Executable file
34
src/lib/mk_hl_op.sh
Executable file
|
@ -0,0 +1,34 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
for x in $(cat ../include/extensions/math.h) ; do
|
||||||
|
test "${x}" = "#ifdef" && continue
|
||||||
|
test "${x}" = "#endif" && continue
|
||||||
|
test "${x}" = "regFunc1" && continue
|
||||||
|
xx=${x#regFunc1\(}
|
||||||
|
fff=${xx%\)}
|
||||||
|
file=hl_ops/${fff}.cc
|
||||||
|
test -f ${file} && rm -f ${file}
|
||||||
|
echo "#include \"multi_array_header.h\"" >> ${file}
|
||||||
|
echo "#include \"high_level_operation.h\"" >> ${file}
|
||||||
|
echo "" >> ${file}
|
||||||
|
echo "namespace MultiArrayTools" >> ${file}
|
||||||
|
echo "{" >> ${file}
|
||||||
|
echo " template class HighLevelOp<OpCD,x_${fff}<double>,1>;" >> ${file}
|
||||||
|
echo " template class HighLevelOp<OpD,x_${fff}<double>,1>;" >> ${file}
|
||||||
|
echo " template HighLevelOpHolder<OpCD> hl_${fff} (const HighLevelOpHolder<OpCD>& in);" >> ${file}
|
||||||
|
echo " template HighLevelOpHolder<OpD> hl_${fff} (const HighLevelOpHolder<OpD>& in);" >> ${file}
|
||||||
|
echo "}" >> ${file}
|
||||||
|
done
|
||||||
|
|
||||||
|
for fff in plus minus multiplies divides ; do
|
||||||
|
file=hl_ops/${fff}.cc
|
||||||
|
test -f ${file} && rm -f ${fff}
|
||||||
|
echo "#include \"multi_array_header.h\"" >> ${file}
|
||||||
|
echo "#include \"high_level_operation.h\"" >> ${file}
|
||||||
|
echo "" >> ${file}
|
||||||
|
echo "namespace MultiArrayTools" >> ${file}
|
||||||
|
echo "{" >> ${file}
|
||||||
|
echo " template class HighLevelOp<OpCD,${fff}x<double,double>,2>;" >> ${file}
|
||||||
|
echo " template class HighLevelOp<OpD,${fff}x<double,double>,2>;" >> ${file}
|
||||||
|
echo "}" >> ${file}
|
||||||
|
done
|
Loading…
Reference in a new issue