diff options
author | Rasmus Munk Larsen <rmlarsen@google.com> | 2019-05-15 13:32:15 -0700 |
---|---|---|
committer | Rasmus Munk Larsen <rmlarsen@google.com> | 2019-05-15 13:32:15 -0700 |
commit | ab0a30e4292f109326b444dabb1e9e0c1dc29881 (patch) | |
tree | 352aad7d121a118aeba018ca146ade1e84860eb5 /Eigen/src/Core/util/Macros.h | |
parent | c8d8d5c0fcfe31eb43005245e36627e104ad2e5f (diff) |
Make Eigen build with cuda 10 and clang.
Diffstat (limited to 'Eigen/src/Core/util/Macros.h')
-rw-r--r-- | Eigen/src/Core/util/Macros.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h index ce3633388..564b4d09f 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -395,11 +395,8 @@ #define EIGEN_CUDA_ARCH __CUDA_ARCH__ #endif -// Starting with CUDA 9 the composite __CUDACC_VER__ is not available. -#if defined(__CUDACC_VER_MAJOR__) && (__CUDACC_VER_MAJOR__ >= 9) - #define EIGEN_CUDACC_VER ((__CUDACC_VER_MAJOR__ * 10000) + (__CUDACC_VER_MINOR__ * 100)) -#elif defined(__CUDACC_VER__) - #define EIGEN_CUDACC_VER __CUDACC_VER__ +#if defined(CUDA_VERSION) + #define EIGEN_CUDACC_VER (CUDA_VERSION*10) #else #define EIGEN_CUDACC_VER 0 #endif |