GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-05-22 20:47:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated the tensor traits: the alignment is not part of the Flags enum anymore

Browse Source
This commit is contained in:
Benoit Steiner 2016-01-11 16:42:18 -08:00
parent 4f7714d72c
commit f894736d61
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h
View File

@ -20,7 +20,7 @@ class compute_tensor_flags
enum { enum {
is_dynamic_size_storage = 1, is_dynamic_size_storage = 1,
aligned_bit = is_aligned =
( (
((Options&DontAlign)==0) && ( ((Options&DontAlign)==0) && (
#if EIGEN_MAX_STATIC_ALIGN_BYTES>0 #if EIGEN_MAX_STATIC_ALIGN_BYTES>0
@ -35,12 +35,12 @@ class compute_tensor_flags
0 0
#endif #endif
) )
) ? AlignedBit : 0, ),
packet_access_bit = packet_traits<Scalar>::Vectorizable && aligned_bit ? PacketAccessBit : 0 packet_access_bit = packet_traits<Scalar>::Vectorizable && is_aligned ? PacketAccessBit : 0
}; };
public: public:
enum { ret = packet_access_bit | aligned_bit}; enum { ret = packet_access_bit};
}; };
@ -86,7 +86,7 @@ struct traits<TensorMap<PlainObjectType, Options_> >
static const int Layout = BaseTraits::Layout; static const int Layout = BaseTraits::Layout;
enum { enum {
Options = Options_, Options = Options_,
Flags = (BaseTraits::Flags & ~AlignedBit) | (Options&Aligned ? AlignedBit : 0), Flags = BaseTraits::Flags,
}; };
}; };
@ -102,7 +102,7 @@ struct traits<TensorRef<PlainObjectType> >
static const int Layout = BaseTraits::Layout; static const int Layout = BaseTraits::Layout;
enum { enum {
Options = BaseTraits::Options, Options = BaseTraits::Options,
Flags = (BaseTraits::Flags & ~AlignedBit) | (Options&Aligned ? AlignedBit : 0), Flags = BaseTraits::Flags,
}; };
}; };