diff options
author | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-03-02 09:41:36 -0800 |
---|---|---|
committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-03-02 09:41:36 -0800 |
commit | d9cb604a5deda96ae0643debbf9d90705ced2187 (patch) | |
tree | df7c472236f75f9c1bc34711178cc18f931d238b /unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h | |
parent | 4fd7f47692ca689559999f05def578bfe4e9f545 (diff) |
Disabled the use of aligned memory loads when converting a tensor from float to doubles since alignment can't always be guaranteed.
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h')
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h b/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h index 29f536cf9..f594725a8 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorConversion.h @@ -94,7 +94,8 @@ struct PacketConverter<TensorEvaluator, SrcPacket, TgtPacket, 1, 2> { EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TgtPacket packet(Index index) const { const int SrcPacketSize = internal::unpacket_traits<SrcPacket>::size; if (index + SrcPacketSize < m_maxIndex) { - return internal::pcast<SrcPacket, TgtPacket>(m_impl.template packet<LoadMode>(index)); + // Force unaligned memory loads since we can't ensure alignment anymore + return internal::pcast<SrcPacket, TgtPacket>(m_impl.template packet<Unaligned>(index)); } else { const int TgtPacketSize = internal::unpacket_traits<TgtPacket>::size; EIGEN_ALIGN_DEFAULT typename internal::unpacket_traits<TgtPacket>::type values[TgtPacketSize]; |