diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-05-26 12:19:33 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-05-26 12:19:33 -0700 |
| commit | 28fcb5ca2af7047b746ae1b628766c907a67d3c5 (patch) | |
| tree | c783deedd317b1868a0305e1b1836a5387d6a1bd /unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h | |
| parent | b24cf21235b4c743dc134ee57f29eccd5e201641 (diff) | |
| parent | a910bcee4309ed19616c6e653d7b0a2d65a2d5ea (diff) | |
Merged latest reduction improvements
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h b/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h index 99a09c058..01bccfd26 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h @@ -325,7 +325,11 @@ __global__ void ReductionInitFullReduxKernelHalfFloat(R, const S, I, half2*); template <int B, int N, typename S, typename R, typename I> __global__ void FullReductionKernelHalfFloat(R, const S, I, half*, half2*); template <int NPT, typename S, typename R, typename I> +<<<<<<< local __global__ void InnerReductionKernelHalfFloat(R, const S, I, I, half*); +======= +__global__ void InnerReductionKernelHalfFloat(R, const S, I, I, half*, half2*); +>>>>>>> other #endif @@ -620,7 +624,11 @@ struct TensorEvaluator<const TensorReductionOp<Op, Dims, ArgType>, Device> #ifdef EIGEN_HAS_CUDA_FP16 template <typename S, typename R, typename I> friend void internal::ReductionInitFullReduxKernelHalfFloat(R, const S, I, half2*); template <int B, int N, typename S, typename R, typename I> friend void internal::FullReductionKernelHalfFloat(R, const S, I, half*, half2*); +<<<<<<< local template <int NPT, typename S, typename R, typename I> friend void internal::InnerReductionKernelHalfFloat(R, const S, I, I, half*); +======= + template <int NPT, typename S, typename R, typename I> friend void internal::InnerReductionKernelHalfFloat(R, const S, I, I, half*, half2*); +>>>>>>> other #endif template <int NPT, typename S, typename R, typename I> friend void internal::InnerReductionKernel(R, const S, I, I, typename S::CoeffReturnType*); |