aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/Core
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2016-10-20 09:42:05 -0700
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2016-10-20 09:42:05 -0700
commitcf20b30d657e2d206f134c4b27b20c14afd6f743 (patch)
tree1a808ad9e6ac4973c472cb20ae5e7c683491ea51 /Eigen/Core
parent03b63e182c02f85d50007a20c1b319ad3dda999b (diff)
parentd3943cd50c99d7169c3d5a1ea4aa4d8660190e2d (diff)
Merge latest updates from trunk
Diffstat (limited to 'Eigen/Core')
-rw-r--r--Eigen/Core5
1 files changed, 4 insertions, 1 deletions
diff --git a/Eigen/Core b/Eigen/Core
index df67fb22b..c82cddc5c 100644
--- a/Eigen/Core
+++ b/Eigen/Core
@@ -47,10 +47,13 @@
// All functions callable from CUDA code must be qualified with __device__
#ifdef __CUDACC__
#define EIGEN_DEVICE_FUNC __host__ __device__
- // For Sycl we dont need that
+ // We need math_functions.hpp to ensure that that EIGEN_USING_STD_MATH macro
+ // works properly on the device side
+ #include <math_functions.hpp>
#else
#define EIGEN_DEVICE_FUNC
#endif
+
#else
#define EIGEN_DEVICE_FUNC