diff options
author | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-02-17 09:54:40 -0800 |
---|---|---|
committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-02-17 09:54:40 -0800 |
commit | 00f048d44f7dd40a0a4e80e40787a930db0f18f0 (patch) | |
tree | 69c121d695e0b5f261648528bb24fc8e140b0f18 /unsupported/Eigen/CXX11/src/Tensor/TensorBase.h | |
parent | 159fb181c222afb3634006f0a620dd5b5419e924 (diff) |
Added support for tensor concatenation as lvalue
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorBase.h')
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorBase.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h b/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h index e08ac6aa1..cfcf18e8e 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorBase.h @@ -524,6 +524,11 @@ class TensorBase<Derived, WriteAccessors> : public TensorBase<Derived, ReadOnlyA swap_layout() const { return TensorLayoutSwapOp<Derived>(derived()); } + template <typename Axis, typename OtherDerived> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE + TensorConcatenationOp<const Axis, Derived, OtherDerived> + concatenate(const OtherDerived& other, const Axis& axis) const { + return TensorConcatenationOp<const Axis, Derived, OtherDerived>(derived(), other.derived(), axis); + } template <typename NewDimensions> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorReshapingOp<const NewDimensions, Derived> reshape(const NewDimensions& newDimensions) const { |