aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2015-07-01 11:32:04 -0700
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2015-07-01 11:32:04 -0700
commit925d0d375a05f09c3e3abb91f29fc2513bb25d0d (patch)
treec88a75d40e6e005ea6b6c0630c74a2707a8d7455 /unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h
parent44eedd89159d75b319bc714775b58bb54eb92927 (diff)
Enabled the vectorized evaluation of several tensor expressions that was previously disabled by mistake
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h')
-rw-r--r--unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h b/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h
index 6979fb4ec..759e8208f 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorConcatenation.h
@@ -88,7 +88,7 @@ class TensorConcatenationOp : public TensorBase<TensorConcatenationOp<Axis, LhsX
{
typedef TensorAssignOp<TensorConcatenationOp, const TensorConcatenationOp> Assign;
Assign assign(*this, other);
- internal::TensorExecutor<const Assign, DefaultDevice, false>::run(assign, DefaultDevice());
+ internal::TensorExecutor<const Assign, DefaultDevice>::run(assign, DefaultDevice());
return *this;
}
@@ -98,7 +98,7 @@ class TensorConcatenationOp : public TensorBase<TensorConcatenationOp<Axis, LhsX
{
typedef TensorAssignOp<TensorConcatenationOp, 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;
}
@@ -334,7 +334,7 @@ template<typename Axis, typename LeftArgType, typename RightArgType, typename De
eigen_assert(index + packetSize - 1 < this->dimensions().TotalSize());
EIGEN_ALIGN_DEFAULT CoeffReturnType values[packetSize];
- PacketReturnType rslt = internal::pstore<PacketReturnType>(values, x);
+ internal::pstore<CoeffReturnType, PacketReturnType>(values, x);
for (int i = 0; i < packetSize; ++i) {
coeffRef(index+i) = values[i];
}