diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-05-26 13:39:39 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-05-26 13:39:39 -0700 |
| commit | 36369ab63c2acfbff111b20db189c6c38bfc15c8 (patch) | |
| tree | 478be6f74bd4555e8ae798703e44469a88364b09 /unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h | |
| parent | 28fcb5ca2af7047b746ae1b628766c907a67d3c5 (diff) | |
Resolved merge conflicts
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h b/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h index 01bccfd26..99a09c058 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h @@ -325,11 +325,7 @@ __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 @@ -624,11 +620,7 @@ 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*); |