diff options
author | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-07-01 11:32:04 -0700 |
---|---|---|
committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-07-01 11:32:04 -0700 |
commit | 925d0d375a05f09c3e3abb91f29fc2513bb25d0d (patch) | |
tree | c88a75d40e6e005ea6b6c0630c74a2707a8d7455 /unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h | |
parent | 44eedd89159d75b319bc714775b58bb54eb92927 (diff) |
Enabled the vectorized evaluation of several tensor expressions that was previously disabled by mistake
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h')
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h b/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h index fa1e6931c..15e004ee9 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h @@ -78,7 +78,7 @@ class TensorReshapingOp : public TensorBase<TensorReshapingOp<NewDimensions, Xpr { typedef TensorAssignOp<TensorReshapingOp, const TensorReshapingOp> Assign; Assign assign(*this, other); - internal::TensorExecutor<const Assign, DefaultDevice, false>::run(assign, DefaultDevice()); + internal::TensorExecutor<const Assign, DefaultDevice>::run(assign, DefaultDevice()); return *this; } @@ -88,7 +88,7 @@ class TensorReshapingOp : public TensorBase<TensorReshapingOp<NewDimensions, Xpr { typedef TensorAssignOp<TensorReshapingOp, const OtherDerived> Assign; Assign assign(*this, other); - internal::TensorExecutor<const Assign, DefaultDevice, false>::run(assign, DefaultDevice()); + internal::TensorExecutor<const Assign, DefaultDevice>::run(assign, DefaultDevice()); return *this; } @@ -262,7 +262,7 @@ class TensorSlicingOp : public TensorBase<TensorSlicingOp<StartIndices, Sizes, X { typedef TensorAssignOp<TensorSlicingOp, const OtherDerived> Assign; Assign assign(*this, other); - internal::TensorExecutor<const Assign, DefaultDevice, false>::run(assign, DefaultDevice()); + internal::TensorExecutor<const Assign, DefaultDevice>::run(assign, DefaultDevice()); return *this; } @@ -271,7 +271,7 @@ class TensorSlicingOp : public TensorBase<TensorSlicingOp<StartIndices, Sizes, X { typedef TensorAssignOp<TensorSlicingOp, const TensorSlicingOp> Assign; Assign assign(*this, other); - internal::TensorExecutor<const Assign, DefaultDevice, false>::run(assign, DefaultDevice()); + internal::TensorExecutor<const Assign, DefaultDevice>::run(assign, DefaultDevice()); return *this; } @@ -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 < dimensions().TotalSize()); + eigen_assert(index+packetSize-1 < array_prod(dimensions())); Index inputIndices[] = {0, 0}; Index indices[] = {index, index + packetSize - 1}; |