diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/cuda_basic.cu | 3 | ||||
-rw-r--r-- | test/main.h | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/test/cuda_basic.cu b/test/cuda_basic.cu index 0ff13477d..ce66c2c78 100644 --- a/test/cuda_basic.cu +++ b/test/cuda_basic.cu @@ -20,9 +20,6 @@ #include <math_constants.h> #include <cuda.h> -#if EIGEN_CUDACC_VER >= 70500 -#include <cuda_fp16.h> -#endif #include "main.h" #include "cuda_common.h" diff --git a/test/main.h b/test/main.h index bd5325196..429c44f81 100644 --- a/test/main.h +++ b/test/main.h @@ -50,6 +50,19 @@ #endif #endif +// Same for cuda_fp16.h +#if defined(__CUDACC_VER_MAJOR__) && (__CUDACC_VER_MAJOR__ >= 9) +#define EIGEN_TEST_CUDACC_VER ((__CUDACC_VER_MAJOR__ * 10000) + (__CUDACC_VER_MINOR__ * 100)) +#elif defined(__CUDACC_VER__) +#define EIGEN_TEST_CUDACC_VER __CUDACC_VER__ +#else +#define EIGEN_TEST_CUDACC_VER 0 +#endif + +#if EIGEN_TEST_CUDACC_VER >= 70500 +#include <cuda_fp16.h> +#endif + // To test that all calls from Eigen code to std::min() and std::max() are // protected by parenthesis against macro expansion, the min()/max() macros // are defined here and any not-parenthesized min/max call will cause a |