diff options
author | Gael Guennebaud <g.gael@free.fr> | 2016-01-09 08:37:01 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2016-01-09 08:37:01 +0100 |
commit | b557662e589a76265f73b99d7ca54a988d7bdb59 (patch) | |
tree | ad6a7118992e68f6038fff39898ff7c6e29df2e0 /unsupported/Eigen/CXX11/src/Tensor/TensorReductionCuda.h | |
parent | 8b9dc9f0dfb44c2c4ad6d02fb88ecce0986cd154 (diff) | |
parent | e76904af1b0f6aef80b68492534404f534ce0240 (diff) |
merge
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorReductionCuda.h')
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorReductionCuda.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorReductionCuda.h b/unsupported/Eigen/CXX11/src/Tensor/TensorReductionCuda.h index b046607b9..558d0c83d 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorReductionCuda.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorReductionCuda.h @@ -115,11 +115,11 @@ struct FullReducer<Self, Op, GpuDevice, Vectorizable> { internal::is_same<typename Self::CoeffReturnType, float>::value; template <typename OutputType> - EIGEN_DEVICE_FUNC static void run(const Self& self, Op& reducer, const GpuDevice& device, OutputType* output) { + static void run(const Self& self, Op& reducer, const GpuDevice& device, OutputType* output) { assert(false && "Should only be called on floats"); } - EIGEN_DEVICE_FUNC static void run(const Self& self, Op& reducer, const GpuDevice& device, float* output) { + static void run(const Self& self, Op& reducer, const GpuDevice& device, float* output) { typedef typename Self::Index Index; const Index num_coeffs = array_prod(self.m_impl.dimensions()); |