Fixed a couple of mistakes in the previous commit.

This commit is contained in:
Benoit Steiner 2015-07-01 12:40:27 -07:00
parent 925d0d375a
commit 56e155dd60
2 changed files with 3 additions and 2 deletions

View File

@ -116,7 +116,8 @@ struct TensorEvaluator<const TensorForcedEvalOp<ArgType>, Device>
} }
typedef TensorEvalToOp<const ArgType> EvalTo; typedef TensorEvalToOp<const ArgType> EvalTo;
EvalTo evalToTmp(m_buffer, m_op); 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(); m_impl.cleanup();
return true; return true;
} }

View File

@ -411,7 +411,7 @@ struct TensorEvaluator<const TensorSlicingOp<StartIndices, Sizes, ArgType>, Devi
{ {
const int packetSize = internal::unpacket_traits<PacketReturnType>::size; const int packetSize = internal::unpacket_traits<PacketReturnType>::size;
EIGEN_STATIC_ASSERT(packetSize > 1, YOU_MADE_A_PROGRAMMING_MISTAKE) 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 inputIndices[] = {0, 0};
Index indices[] = {index, index + packetSize - 1}; Index indices[] = {index, index + packetSize - 1};