diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2017-07-07 16:27:33 +0000 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2017-07-07 16:27:33 +0000 |
| commit | c5a241ab9b4068dea13449ca6d596b79613df3e1 (patch) | |
| tree | 9309bdd9f327290856a72a1807e9eaaeae2dd7df /unsupported/Eigen/CXX11/src/Tensor/TensorConvolution.h | |
| parent | b7ae4dd9ef28525283e53e6b860d7d0682ef9324 (diff) | |
| parent | 62b4634ebe7cd7d391e91be812e5c18418db705a (diff) | |
Merged in benoitsteiner/opencl (pull request PR-323)
Improved support for OpenCL
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorConvolution.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorConvolution.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorConvolution.h b/unsupported/Eigen/CXX11/src/Tensor/TensorConvolution.h index 378f5cccb..543b4814b 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorConvolution.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorConvolution.h @@ -231,6 +231,8 @@ struct traits<TensorConvolutionOp<Dimensions, InputXprType, KernelXprType> > typedef typename remove_reference<RhsNested>::type _RhsNested; static const int NumDimensions = traits<InputXprType>::NumDimensions; static const int Layout = traits<InputXprType>::Layout; + typedef typename conditional<::Eigen::internal::Pointer_type_promotion<typename InputXprType::Scalar, Scalar>::val, + typename traits<InputXprType>::PointerType, typename traits<KernelXprType>::PointerType>::type PointerType; enum { Flags = 0 @@ -465,7 +467,7 @@ struct TensorEvaluator<const TensorConvolutionOp<Indices, InputArgType, KernelAr PacketSize)); } - EIGEN_DEVICE_FUNC Scalar* data() const { return NULL; } + EIGEN_DEVICE_FUNC typename Eigen::internal::traits<XprType>::PointerType data() const { return NULL; } private: EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Index firstInput(Index index) const { |