diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-06-05 15:38:33 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-06-05 15:38:33 +0200 |
| commit | 64054ee3964187853b941fbf4d5e3095c482bebb (patch) | |
| tree | 2382425eb73b9a86ec53f1041c3f1f367546be0c /Eigen/src/Core/util/BlasUtil.h | |
| parent | 9cd2d14005def8e7df0b0bf5fd6eb51f8a6591e9 (diff) | |
Add nvcc support for normalize, initializers, and fuzzy comparisons
Diffstat (limited to 'Eigen/src/Core/util/BlasUtil.h')
| -rw-r--r-- | Eigen/src/Core/util/BlasUtil.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/Core/util/BlasUtil.h b/Eigen/src/Core/util/BlasUtil.h index 91496651c..a4026376e 100644 --- a/Eigen/src/Core/util/BlasUtil.h +++ b/Eigen/src/Core/util/BlasUtil.h @@ -56,8 +56,8 @@ template<> struct conj_if<false> { template<typename Scalar> struct conj_helper<Scalar,Scalar,false,false> { - EIGEN_STRONG_INLINE Scalar pmadd(const Scalar& x, const Scalar& y, const Scalar& c) const { return internal::pmadd(x,y,c); } - EIGEN_STRONG_INLINE Scalar pmul(const Scalar& x, const Scalar& y) const { return internal::pmul(x,y); } + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar pmadd(const Scalar& x, const Scalar& y, const Scalar& c) const { return internal::pmadd(x,y,c); } + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Scalar pmul(const Scalar& x, const Scalar& y) const { return internal::pmul(x,y); } }; template<typename RealScalar> struct conj_helper<std::complex<RealScalar>, std::complex<RealScalar>, false,true> @@ -109,11 +109,11 @@ template<typename RealScalar,bool Conj> struct conj_helper<RealScalar, std::comp }; template<typename From,typename To> struct get_factor { - static EIGEN_STRONG_INLINE To run(const From& x) { return x; } + EIGEN_DEVICE_FUNC static EIGEN_STRONG_INLINE To run(const From& x) { return x; } }; template<typename Scalar> struct get_factor<Scalar,typename NumTraits<Scalar>::Real> { - static EIGEN_STRONG_INLINE typename NumTraits<Scalar>::Real run(const Scalar& x) { return real(x); } + EIGEN_DEVICE_FUNC static EIGEN_STRONG_INLINE typename NumTraits<Scalar>::Real run(const Scalar& x) { return real(x); } }; // Lightweight helper class to access matrix coefficients. |