diff options
| author |  Rasmus Larsen <rmlarsen@google.com> | 2016-04-01 17:19:36 -0700 |
|---|---|---|
| committer | Rasmus Larsen <rmlarsen@google.com> | 2016-04-01 17:19:36 -0700 |
| commit | 30242b75653fa4128181dba364f540184beff5ac (patch) | |
| tree | 047d550e4fd41d9b837d0cd8c22d62ea1ef22a90 /Eigen/Core | |
| parent | 9d51f7c457671bfcbab9a1d62d416e1a83e6ad8a (diff) | |
| parent | 3da495e6b9a9e8def7914b53a8698a09b1998037 (diff) | |
Merged eigen/eigen into default
Diffstat (limited to 'Eigen/Core')
| -rw-r--r-- | Eigen/Core | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Eigen/Core b/Eigen/Core index 0a196c814..d8c5619d9 100644 --- a/Eigen/Core +++ b/Eigen/Core @@ -42,7 +42,10 @@ #endif -#if defined(__CUDA_ARCH__) +// When compiling CUDA device code with NVCC, pull in math functions from the +// global namespace. In host mode, and when device doee with clang, use the +// std versions. +#if defined(__CUDA_ARCH__) && defined(__NVCC__) #define EIGEN_USING_STD_MATH(FUNC) using ::FUNC; #else #define EIGEN_USING_STD_MATH(FUNC) using std::FUNC; |