diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2010-07-07 11:06:31 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2010-07-07 11:06:31 +0200 |
| commit | d5e0efaf6930a588dbc6a3f4e047a9d4977eab34 (patch) | |
| tree | 73c98c860e6cf55d6c2f242d600ada4bdec73041 /Eigen/src | |
| parent | c851044eae0b0c4be639f6b4fd09825c8ed64d16 (diff) | |
fix vectorization rule of diagonal-product
Diffstat (limited to 'Eigen/src')
| -rw-r--r-- | Eigen/src/Core/DiagonalProduct.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/DiagonalProduct.h b/Eigen/src/Core/DiagonalProduct.h index 248b2db9a..610d13dc8 100644 --- a/Eigen/src/Core/DiagonalProduct.h +++ b/Eigen/src/Core/DiagonalProduct.h @@ -42,8 +42,8 @@ struct ei_traits<DiagonalProduct<MatrixType, DiagonalType, ProductOrder> > ||(int(_StorageOrder) == ColMajor && int(ProductOrder) == OnTheRight)), _SameTypes = ei_is_same_type<typename MatrixType::Scalar, typename DiagonalType::Scalar>::ret, // FIXME currently we need same types, but in the future the next rule should be the one - //_Vectorizable = bool(int(MatrixType::Flags)&PacketAccessBit) && ((!_PacketOnDiag) || _SameTypes), - _Vectorizable = bool(int(MatrixType::Flags)&PacketAccessBit) && _SameTypes, + //_Vectorizable = bool(int(MatrixType::Flags)&PacketAccessBit) && ((!_PacketOnDiag) || (_SameTypes && bool(int(DiagonalType::Flags)&PacketAccessBit))), + _Vectorizable = bool(int(MatrixType::Flags)&PacketAccessBit) && _SameTypes && ((!_PacketOnDiag) || (bool(int(DiagonalType::Flags)&PacketAccessBit))), Flags = (HereditaryBits & (unsigned int)(MatrixType::Flags)) | (_Vectorizable ? PacketAccessBit : 0), CoeffReadCost = NumTraits<Scalar>::MulCost + MatrixType::CoeffReadCost + DiagonalType::DiagonalVectorType::CoeffReadCost |