diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2014-05-06 11:18:37 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2014-05-06 11:18:37 -0700 |
| commit | 0320f7e3a71406b9a03d1bab0d168fd76e63d457 (patch) | |
| tree | fffaaacd58cb5088f66d868bbb172971aacf9b53 /unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h | |
| parent | c0f2cb016e60b7dbde1d5946f42234a709a711f9 (diff) | |
Added support for fixed sized tensors.
Improved support for tensor expressions.
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h b/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h index 53b4ea444..2de698a57 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h @@ -57,6 +57,15 @@ struct traits<Tensor<Scalar_, NumIndices_, Options_> > }; +template<typename Scalar_, typename Dimensions, int Options_> +struct traits<TensorFixedSize<Scalar_, Dimensions, Options_> > +{ + typedef Scalar_ Scalar; + typedef Dense StorageKind; + typedef DenseIndex Index; +}; + + template<typename PlainObjectType> struct traits<TensorMap<PlainObjectType> > : public traits<PlainObjectType> @@ -68,16 +77,28 @@ struct traits<TensorMap<PlainObjectType> > }; -template<typename _Scalar, std::size_t NumIndices_, int Options_> -struct eval<Tensor<_Scalar, NumIndices_, Options_>, Eigen::Dense> +template<typename _Scalar, std::size_t NumIndices_, int Options> +struct eval<Tensor<_Scalar, NumIndices_, Options>, Eigen::Dense> +{ + typedef const Tensor<_Scalar, NumIndices_, Options>& type; +}; + +template<typename _Scalar, std::size_t NumIndices_, int Options> +struct eval<const Tensor<_Scalar, NumIndices_, Options>, Eigen::Dense> { - typedef const Tensor<_Scalar, NumIndices_, Options_>& type; + typedef const Tensor<_Scalar, NumIndices_, Options>& type; }; -template<typename _Scalar, std::size_t NumIndices_, int Options_> -struct eval<const Tensor<_Scalar, NumIndices_, Options_>, Eigen::Dense> +template<typename Scalar_, typename Dimensions, int Options> +struct eval<TensorFixedSize<Scalar_, Dimensions, Options>, Eigen::Dense> { - typedef const Tensor<_Scalar, NumIndices_, Options_>& type; + typedef const TensorFixedSize<Scalar_, Dimensions, Options>& type; +}; + +template<typename Scalar_, typename Dimensions, int Options> +struct eval<const TensorFixedSize<Scalar_, Dimensions, Options>, Eigen::Dense> +{ + typedef const TensorFixedSize<Scalar_, Dimensions, Options>& type; }; template<typename PlainObjectType> @@ -104,6 +125,18 @@ struct nested<const Tensor<Scalar_, NumIndices_, Options_>, 1, typename eval<con typedef const Tensor<Scalar_, NumIndices_, Options_>& type; }; +template <typename Scalar_, typename Dimensions, int Options> +struct nested<TensorFixedSize<Scalar_, Dimensions, Options>, 1, typename eval<TensorFixedSize<Scalar_, Dimensions, Options> >::type> +{ + typedef const TensorFixedSize<Scalar_, Dimensions, Options>& type; +}; + +template <typename Scalar_, typename Dimensions, int Options> +struct nested<const TensorFixedSize<Scalar_, Dimensions, Options>, 1, typename eval<const TensorFixedSize<Scalar_, Dimensions, Options> >::type> +{ + typedef const TensorFixedSize<Scalar_, Dimensions, Options>& type; +}; + template <typename PlainObjectType> struct nested<TensorMap<PlainObjectType>, 1, typename eval<TensorMap<PlainObjectType> >::type> { |