diff options
| author |  Rasmus Larsen <rmlarsen@google.com> | 2019-05-20 17:02:39 +0000 |
|---|---|---|
| committer | Rasmus Larsen <rmlarsen@google.com> | 2019-05-20 17:02:39 +0000 |
| commit | e92486b8c34272f6eae563665fc89b7f0abb902f (patch) | |
| tree | 3e5554b3ec06ff8dcee8519ff6c5e824854deb89 /Eigen/src/Core/util/Macros.h | |
| parent | cc7ecbb1241cdc16b0b0f27631c556d8eda5aa4b (diff) | |
| parent | fd595d42a76437cc9df0fcfbc49c5372e416c8d6 (diff) | |
Merged in rmlarsen/eigen (pull request PR-643)
Make Eigen build with cuda 10 and clang.
Approved-by: Justin Lebar <justin.lebar@gmail.com>
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 caed4c792..29be2a74f 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -408,11 +408,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 |