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

remove some old debug asserts

Browse source
This commit is contained in:
Christian Zimmermann 2021-07-18 18:40:10 +02:00
parent 8bde2d7250
commit a841782115
2 changed files with 12 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/include/multi_array_operation.cc.h
View file

@ -180,14 +180,10 @@ namespace MultiArrayTools
} }
return 0; return 0;
} }
/*
template <typename T, class IOp, class Target, class OpClass, OpIndexAff OIA>
AssignmentExpr<T,IOp,Target,OpClass,OIA>::AssignmentExpr(T* dataPtr, const Target& tar, const OpClass& sec) :
mTar(tar), mSec(sec), mDataPtr(dataPtr) {}
*/
template <typename T, class IOp, class AT, class Target, class OpClass, OpIndexAff OIA> template <typename T, class IOp, class AT, class Target, class OpClass, OpIndexAff OIA>
AssignmentExpr<T,IOp,AT,Target,OpClass,OIA>::AssignmentExpr(T* dataPtr, const AccessTemplate<AT>& dataAcc, const Target& tar, const OpClass& sec) : AssignmentExpr<T,IOp,AT,Target,OpClass,OIA>::AssignmentExpr(const AccessTemplate<AT>& dataAcc, const Target& tar, const OpClass& sec) :
mTar(tar), mSec(sec), mDataAcc(static_cast<const AT&>(dataAcc)), mDataPtr(dataPtr) {} mTar(tar), mSec(sec), mDataAcc(static_cast<const AT&>(dataAcc)) {}
template <typename T, class IOp, class AT, class Target, class OpClass, OpIndexAff OIA> template <typename T, class IOp, class AT, class Target, class OpClass, OpIndexAff OIA>
inline void AssignmentExpr<T,IOp,AT,Target,OpClass,OIA>::operator()(size_t start) inline void AssignmentExpr<T,IOp,AT,Target,OpClass,OIA>::operator()(size_t start)
@ -565,7 +561,7 @@ namespace MultiArrayTools
{ {
static_assert( OpClass::SIZE == decltype(in.rootSteps())::SIZE, "Ext Size mismatch" ); static_assert( OpClass::SIZE == decltype(in.rootSteps())::SIZE, "Ext Size mismatch" );
return mIndex.ifor(1,in.loop(AssignmentExpr<T,IOp,PointerAccess<T>,OperationRoot<T,Ranges...>,OpClass,OpIndexAff::TARGET> return mIndex.ifor(1,in.loop(AssignmentExpr<T,IOp,PointerAccess<T>,OperationRoot<T,Ranges...>,OpClass,OpIndexAff::TARGET>
(mOrigDataPtr,mDataAcc,*this,in))).template vec<IOp::VSIZE>(); (mDataAcc,*this,in))).template vec<IOp::VSIZE>();
} }
template <typename T, class... Ranges> template <typename T, class... Ranges>
@ -574,7 +570,7 @@ namespace MultiArrayTools
{ {
static_assert( OpClass::SIZE == decltype(in.rootSteps())::SIZE, "Ext Size mismatch" ); static_assert( OpClass::SIZE == decltype(in.rootSteps())::SIZE, "Ext Size mismatch" );
return in.loop(AssignmentExpr<T,IOp,PointerAccess<T>,OperationRoot<T,Ranges...>,OpClass> return in.loop(AssignmentExpr<T,IOp,PointerAccess<T>,OperationRoot<T,Ranges...>,OpClass>
(mOrigDataPtr,mDataAcc,*this,in)); (mDataAcc,*this,in));
} }
template <typename T, class... Ranges> template <typename T, class... Ranges>
@ -583,7 +579,7 @@ namespace MultiArrayTools
{ {
static_assert( OpClass::SIZE == decltype(in.rootSteps())::SIZE, "Ext Size mismatch" ); static_assert( OpClass::SIZE == decltype(in.rootSteps())::SIZE, "Ext Size mismatch" );
return i->ifor(1,in.loop(AssignmentExpr<T,IOp,PointerAccess<T>,OperationRoot<T,Ranges...>,OpClass> return i->ifor(1,in.loop(AssignmentExpr<T,IOp,PointerAccess<T>,OperationRoot<T,Ranges...>,OpClass>
(mOrigDataPtr,mDataAcc,*this,in))).template vec<IOp::VSIZE>(); (mDataAcc,*this,in))).template vec<IOp::VSIZE>();
} }
template <typename T, class... Ranges> template <typename T, class... Ranges>
@ -676,18 +672,14 @@ namespace MultiArrayTools
template <class ET> template <class ET>
inline T& OperationRoot<T,Ranges...>::get(ET pos) const inline T& OperationRoot<T,Ranges...>::get(ET pos) const
{ {
assert(mDataAcc.get(pos.val()) == mDataPtr+pos.val());
return *mDataAcc.get(pos.val()); return *mDataAcc.get(pos.val());
//return mDataPtr[pos.val()];
} }
template <typename T, class... Ranges> template <typename T, class... Ranges>
template <typename V, class ET> template <typename V, class ET>
inline V& OperationRoot<T,Ranges...>::vget(ET pos) const inline V& OperationRoot<T,Ranges...>::vget(ET pos) const
{ {
assert(mDataAcc.get(pos.val()) == mDataPtr+pos.val());
return *(reinterpret_cast<V*>(mDataAcc.get(pos.val()))); return *(reinterpret_cast<V*>(mDataAcc.get(pos.val())));
//return *(reinterpret_cast<V*>(mDataPtr+pos.val()));
} }
template <typename T, class... Ranges> template <typename T, class... Ranges>
@ -696,7 +688,6 @@ namespace MultiArrayTools
{ {
mDataAcc.set(pos.val()); mDataAcc.set(pos.val());
mDataPtr = mOrigDataPtr + pos.val(); mDataPtr = mOrigDataPtr + pos.val();
assert(mDataAcc.get(0) == mDataPtr);
return *this; return *this;
} }
@ -716,9 +707,7 @@ namespace MultiArrayTools
template <typename T, class... Ranges> template <typename T, class... Ranges>
T* OperationRoot<T,Ranges...>::data() const T* OperationRoot<T,Ranges...>::data() const
{ {
assert(mDataAcc.get(0) == mDataPtr);
return mDataAcc.get(0); return mDataAcc.get(0);
//return mDataPtr;
} }
template <typename T, class... Ranges> template <typename T, class... Ranges>
@ -765,7 +754,7 @@ namespace MultiArrayTools
{ {
static_assert( OpClass::SIZE == decltype(in.rootSteps())::SIZE, "Ext Size mismatch" ); static_assert( OpClass::SIZE == decltype(in.rootSteps())::SIZE, "Ext Size mismatch" );
return mIndex.pifor(1,in.loop(AssignmentExpr<T,IOp,PointerAccess<T>,ParallelOperationRoot<T,Ranges...>,OpClass,OpIndexAff::TARGET> return mIndex.pifor(1,in.loop(AssignmentExpr<T,IOp,PointerAccess<T>,ParallelOperationRoot<T,Ranges...>,OpClass,OpIndexAff::TARGET>
(mOrigDataPtr,mDataAcc,*this,in))).template vec<IOp::VSIZE>(); (mDataAcc,*this,in))).template vec<IOp::VSIZE>();
} }
template <typename T, class... Ranges> template <typename T, class... Ranges>
@ -774,7 +763,7 @@ namespace MultiArrayTools
{ {
static_assert( OpClass::SIZE == decltype(in.rootSteps())::SIZE, "Ext Size mismatch" ); static_assert( OpClass::SIZE == decltype(in.rootSteps())::SIZE, "Ext Size mismatch" );
return in.loop(AssignmentExpr<T,IOp,PointerAccess<T>,ParallelOperationRoot<T,Ranges...>,OpClass> return in.loop(AssignmentExpr<T,IOp,PointerAccess<T>,ParallelOperationRoot<T,Ranges...>,OpClass>
(mOrigDataPtr,mDataAcc,*this,in)); (mDataAcc,*this,in));
} }
template <typename T, class... Ranges> template <typename T, class... Ranges>
@ -783,7 +772,7 @@ namespace MultiArrayTools
{ {
static_assert( OpClass::SIZE == decltype(in.rootSteps())::SIZE, "Ext Size mismatch" ); static_assert( OpClass::SIZE == decltype(in.rootSteps())::SIZE, "Ext Size mismatch" );
return i->pifor(1,in.loop(AssignmentExpr<T,IOp,PointerAccess<T>,ParallelOperationRoot<T,Ranges...>,OpClass> return i->pifor(1,in.loop(AssignmentExpr<T,IOp,PointerAccess<T>,ParallelOperationRoot<T,Ranges...>,OpClass>
(mOrigDataPtr,mDataAcc,*this,in))).template vec<IOp::VSIZE>(); (mDataAcc,*this,in))).template vec<IOp::VSIZE>();
} }
template <typename T, class... Ranges> template <typename T, class... Ranges>

26
src/include/multi_array_operation.h
View file

@ -254,8 +254,8 @@ namespace MultiArrayTools
T* mOrigPtr = nullptr; T* mOrigPtr = nullptr;
public: public:
PointerAccess(T* ptr, T* origPtr) : mPtr(ptr), mOrigPtr(origPtr) PointerAccess(T* ptr, T* origPtr) : mPtr(ptr), mOrigPtr(origPtr) {}
{ assert(mPtr != nullptr); assert(mOrigPtr != nullptr); }
PointerAccess(const PointerAccess& in) = default; PointerAccess(const PointerAccess& in) = default;
PointerAccess(PointerAccess&& in) = default; PointerAccess(PointerAccess&& in) = default;
PointerAccess& operator=(const PointerAccess& in) = default; PointerAccess& operator=(const PointerAccess& in) = default;
@ -273,24 +273,6 @@ namespace MultiArrayTools
} }
}; };
template <typename T>
class ConstPointerAccess : public AccessTemplate<ConstPointerAccess<T>>
{
public:
typedef T value_type;
typedef T in_type;
private:
const T* mPtr;
public:
ConstPointerAccess(T* ptr) : mPtr(ptr) {}
const T* get(size_t pos) { return mPtr+pos; }
const T* get(size_t pos) const { return mPtr+pos; }
template <class F, typename Op, class ExtType>
inline void exec(size_t pos, const Op& op, ExtType e) const { assert(0); }
};
template <typename T, class IOp, class AT, class Target, class OpClass, OpIndexAff OIA=OpIndexAff::EXTERN> template <typename T, class IOp, class AT, class Target, class OpClass, OpIndexAff OIA=OpIndexAff::EXTERN>
class AssignmentExpr : public ExpressionBase class AssignmentExpr : public ExpressionBase
@ -301,7 +283,6 @@ namespace MultiArrayTools
Target mTar; Target mTar;
OpClass mSec; OpClass mSec;
AT mDataAcc; AT mDataAcc;
T* mDataPtr;
public: public:
@ -310,8 +291,7 @@ namespace MultiArrayTools
static constexpr size_t SIZE = Target::SIZE + OpClass::SIZE; static constexpr size_t SIZE = Target::SIZE + OpClass::SIZE;
typedef decltype(mTar.rootSteps(0).extend( mSec.rootSteps(0) )) ExtType; typedef decltype(mTar.rootSteps(0).extend( mSec.rootSteps(0) )) ExtType;
//AssignmentExpr(T* dataPtr, const Target& tar, const OpClass& sec); AssignmentExpr(const AccessTemplate<AT>& dataAcc, const Target& tar, const OpClass& sec);
AssignmentExpr(T* dataPtr, const AccessTemplate<AT>& dataAcc, const Target& tar, const OpClass& sec);
AssignmentExpr(const AssignmentExpr& in) = default; AssignmentExpr(const AssignmentExpr& in) = default;
AssignmentExpr(AssignmentExpr&& in) = default; AssignmentExpr(AssignmentExpr&& in) = default;
AssignmentExpr& operator=(const AssignmentExpr& in) = default; AssignmentExpr& operator=(const AssignmentExpr& in) = default;