diff options
| author |  Mehdi Goli <mehdi.goli@codeplay.com> | 2018-08-03 16:59:15 +0100 |
|---|---|---|
| committer | Mehdi Goli <mehdi.goli@codeplay.com> | 2018-08-03 16:59:15 +0100 |
| commit | 01358300d581f94c842bcdf35266b50f2795ded3 (patch) | |
| tree | 7fa0714ebafc01c946bc18e3bf09a794d01f91db /unsupported/Eigen/CXX11 | |
| parent | 62169419aba9048c6c66c71ce4910241e594cbe1 (diff) | |
Creating separate SYCL required PR for uncontroversial files.
Diffstat (limited to 'unsupported/Eigen/CXX11')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorTrace.h | 4 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorTrace.h b/unsupported/Eigen/CXX11/src/Tensor/TensorTrace.h index c8b2fad1e..ea53bb04b 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorTrace.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorTrace.h @@ -273,11 +273,11 @@ struct TensorEvaluator<const TensorTraceOp<Dims, ArgType>, Device> Dimensions m_dimensions; TensorEvaluator<ArgType, Device> m_impl; + // Initialize the size of the trace dimension + Index m_traceDim; const Device& m_device; array<bool, NumInputDims> m_reduced; array<Index, NumReducedDims> m_reducedDims; - // Initialize the size of the trace dimension - Index m_traceDim; array<Index, NumOutputDims> m_outputStrides; array<Index, NumReducedDims> m_reducedStrides; array<Index, NumOutputDims> m_preservedStrides; diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h b/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h index 006b37921..0a394c88d 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h @@ -59,6 +59,7 @@ struct traits<Tensor<Scalar_, NumIndices_, Options_, IndexType_> > template <typename T> struct MakePointer { typedef T* Type; typedef T& RefType; + typedef T ScalarType; }; typedef typename MakePointer<Scalar>::Type PointerType; @@ -80,6 +81,7 @@ struct traits<TensorFixedSize<Scalar_, Dimensions, Options_, IndexType_> > template <typename T> struct MakePointer { typedef T* Type; typedef T& RefType; + typedef T ScalarType; }; typedef typename MakePointer<Scalar>::Type PointerType; @@ -105,6 +107,8 @@ struct traits<TensorMap<PlainObjectType, Options_, MakePointer_> > typedef MakePointer_<T> MakePointerT; typedef typename MakePointerT::Type Type; typedef typename MakePointerT::RefType RefType; + typedef typename MakePointerT::ScalarType ScalarType; + }; typedef typename MakePointer<Scalar>::Type PointerType; |