diff options
| author |  Rasmus Munk Larsen <rmlarsen@google.com> | 2020-01-09 21:23:09 +0000 |
|---|---|---|
| committer | Rasmus Munk Larsen <rmlarsen@google.com> | 2020-01-09 21:23:09 +0000 |
| commit | 9254974115b6d4db305a1c7a2ef23ebc8a4a819a (patch) | |
| tree | 2c097de6525b336d4148606d91ba3616d895f39c /Eigen/src/Core/MathFunctions.h | |
| parent | a3ec89b5bd46bca1c5f445ea63520a2910673072 (diff) | |
Don't add EIGEN_DEVICE_FUNC to random() since ::rand is not available in Cuda.
Diffstat (limited to 'Eigen/src/Core/MathFunctions.h')
| -rw-r--r-- | Eigen/src/Core/MathFunctions.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Eigen/src/Core/MathFunctions.h b/Eigen/src/Core/MathFunctions.h index cca968d2e..a681a3eb3 100644 --- a/Eigen/src/Core/MathFunctions.h +++ b/Eigen/src/Core/MathFunctions.h @@ -700,18 +700,16 @@ struct random_retval typedef Scalar type; }; -template<typename Scalar> EIGEN_DEVICE_FUNC inline EIGEN_MATHFUNC_RETVAL(random, Scalar) random(const Scalar& x, const Scalar& y); -template<typename Scalar> EIGEN_DEVICE_FUNC inline EIGEN_MATHFUNC_RETVAL(random, Scalar) random(); +template<typename Scalar> inline EIGEN_MATHFUNC_RETVAL(random, Scalar) random(const Scalar& x, const Scalar& y); +template<typename Scalar> inline EIGEN_MATHFUNC_RETVAL(random, Scalar) random(); template<typename Scalar> struct random_default_impl<Scalar, false, false> { - EIGEN_DEVICE_FUNC static inline Scalar run(const Scalar& x, const Scalar& y) { return x + (y-x) * Scalar(std::rand()) / Scalar(RAND_MAX); } - EIGEN_DEVICE_FUNC static inline Scalar run() { return run(Scalar(NumTraits<Scalar>::IsSigned ? -1 : 0), Scalar(1)); @@ -768,7 +766,6 @@ struct meta_floor_log2<n, lower, upper, meta_floor_log2_bogus> template<typename Scalar> struct random_default_impl<Scalar, false, true> { - EIGEN_DEVICE_FUNC static inline Scalar run(const Scalar& x, const Scalar& y) { if (y <= x) @@ -796,7 +793,6 @@ struct random_default_impl<Scalar, false, true> return Scalar(ScalarX(x) + offset); } - EIGEN_DEVICE_FUNC static inline Scalar run() { #ifdef EIGEN_MAKING_DOCS @@ -815,13 +811,11 @@ struct random_default_impl<Scalar, false, true> template<typename Scalar> struct random_default_impl<Scalar, true, false> { - EIGEN_DEVICE_FUNC static inline Scalar run(const Scalar& x, const Scalar& y) { return Scalar(random(x.real(), y.real()), random(x.imag(), y.imag())); } - EIGEN_DEVICE_FUNC static inline Scalar run() { typedef typename NumTraits<Scalar>::Real RealScalar; @@ -830,14 +824,12 @@ struct random_default_impl<Scalar, true, false> }; template<typename Scalar> -EIGEN_DEVICE_FUNC inline EIGEN_MATHFUNC_RETVAL(random, Scalar) random(const Scalar& x, const Scalar& y) { return EIGEN_MATHFUNC_IMPL(random, Scalar)::run(x, y); } template<typename Scalar> -EIGEN_DEVICE_FUNC inline EIGEN_MATHFUNC_RETVAL(random, Scalar) random() { return EIGEN_MATHFUNC_IMPL(random, Scalar)::run(); @@ -1814,7 +1806,6 @@ inline bool isApproxOrLessThan(const Scalar& x, const Scalar& y, template<> struct random_impl<bool> { - EIGEN_DEVICE_FUNC static inline bool run() { return random<int>(0,1)==0 ? false : true; |