diff options
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorForcedEval.h | 3 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorForcedEval.h b/unsupported/Eigen/CXX11/src/Tensor/TensorForcedEval.h index bd32249b6..a68d1398e 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorForcedEval.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorForcedEval.h @@ -116,7 +116,8 @@ struct TensorEvaluator<const TensorForcedEvalOp<ArgType>, Device> } typedef TensorEvalToOp<const ArgType> EvalTo; EvalTo evalToTmp(m_buffer, m_op); - internal::TensorExecutor<const EvalTo, Device>::run(evalToTmp, m_device); + static const bool PacketAccess = TensorEvaluator<ArgType, Device>::PacketAccess; + internal::TensorExecutor<const EvalTo, Device, PacketAccess>::run(evalToTmp, m_device); m_impl.cleanup(); return true; } diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h b/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h index 15e004ee9..34be9b908 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h @@ -411,7 +411,7 @@ struct TensorEvaluator<const TensorSlicingOp<StartIndices, Sizes, ArgType>, Devi { const int packetSize = internal::unpacket_traits<PacketReturnType>::size; EIGEN_STATIC_ASSERT(packetSize > 1, YOU_MADE_A_PROGRAMMING_MISTAKE) - eigen_assert(index+packetSize-1 < array_prod(dimensions())); + eigen_assert(index+packetSize-1 < internal::array_prod(dimensions())); Index inputIndices[] = {0, 0}; Index indices[] = {index, index + packetSize - 1}; |