From 304ef2957134be386e50592ad7120177c5f3a7c0 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Thu, 24 Aug 2017 11:26:41 +0200 Subject: Handle min/max/inf/etc issue in cuda_fp16.h directly in test/main.h --- test/main.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'test/main.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 +#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 -- cgit v1.2.3