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/cuda_basic.cu | 3 --- test/main.h | 13 +++++++++++++ unsupported/test/cxx11_tensor_argmax_cuda.cu | 3 --- unsupported/test/cxx11_tensor_cast_float16_cuda.cu | 3 --- unsupported/test/cxx11_tensor_complex_cuda.cu | 3 --- unsupported/test/cxx11_tensor_complex_cwise_ops_cuda.cu | 3 --- unsupported/test/cxx11_tensor_contract_cuda.cu | 3 --- unsupported/test/cxx11_tensor_cuda.cu | 3 --- unsupported/test/cxx11_tensor_device.cu | 3 --- unsupported/test/cxx11_tensor_of_float16_cuda.cu | 3 --- unsupported/test/cxx11_tensor_random_cuda.cu | 3 --- unsupported/test/cxx11_tensor_reduction_cuda.cu | 3 --- unsupported/test/cxx11_tensor_scan_cuda.cu | 3 --- 13 files changed, 13 insertions(+), 36 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 #include -#if EIGEN_CUDACC_VER >= 70500 -#include -#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 +#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 diff --git a/unsupported/test/cxx11_tensor_argmax_cuda.cu b/unsupported/test/cxx11_tensor_argmax_cuda.cu index 0dfd6cfe1..3d73d491a 100644 --- a/unsupported/test/cxx11_tensor_argmax_cuda.cu +++ b/unsupported/test/cxx11_tensor_argmax_cuda.cu @@ -12,9 +12,6 @@ #define EIGEN_TEST_FUNC cxx11_tensor_cuda #define EIGEN_USE_GPU -#if EIGEN_CUDACC_VER >= 70500 -#include -#endif #include "main.h" #include diff --git a/unsupported/test/cxx11_tensor_cast_float16_cuda.cu b/unsupported/test/cxx11_tensor_cast_float16_cuda.cu index 83a740e7a..816e03220 100644 --- a/unsupported/test/cxx11_tensor_cast_float16_cuda.cu +++ b/unsupported/test/cxx11_tensor_cast_float16_cuda.cu @@ -13,9 +13,6 @@ #define EIGEN_DEFAULT_DENSE_INDEX_TYPE int #define EIGEN_USE_GPU -#if EIGEN_CUDACC_VER >= 70500 -#include -#endif #include "main.h" #include diff --git a/unsupported/test/cxx11_tensor_complex_cuda.cu b/unsupported/test/cxx11_tensor_complex_cuda.cu index cbff5a9b2..a52350f85 100644 --- a/unsupported/test/cxx11_tensor_complex_cuda.cu +++ b/unsupported/test/cxx11_tensor_complex_cuda.cu @@ -11,9 +11,6 @@ #define EIGEN_TEST_FUNC cxx11_tensor_complex #define EIGEN_USE_GPU -#if EIGEN_CUDACC_VER >= 70500 -#include -#endif #include "main.h" #include diff --git a/unsupported/test/cxx11_tensor_complex_cwise_ops_cuda.cu b/unsupported/test/cxx11_tensor_complex_cwise_ops_cuda.cu index 9133fce5a..aac780905 100644 --- a/unsupported/test/cxx11_tensor_complex_cwise_ops_cuda.cu +++ b/unsupported/test/cxx11_tensor_complex_cwise_ops_cuda.cu @@ -11,9 +11,6 @@ #define EIGEN_TEST_FUNC cxx11_tensor_complex_cwise_ops #define EIGEN_USE_GPU -#if EIGEN_CUDACC_VER >= 70500 -#include -#endif #include "main.h" #include diff --git a/unsupported/test/cxx11_tensor_contract_cuda.cu b/unsupported/test/cxx11_tensor_contract_cuda.cu index 0b2f3f0f4..e821ccf0c 100644 --- a/unsupported/test/cxx11_tensor_contract_cuda.cu +++ b/unsupported/test/cxx11_tensor_contract_cuda.cu @@ -14,9 +14,6 @@ #define EIGEN_DEFAULT_DENSE_INDEX_TYPE int #define EIGEN_USE_GPU -#if EIGEN_CUDACC_VER >= 70500 -#include -#endif #include "main.h" #include diff --git a/unsupported/test/cxx11_tensor_cuda.cu b/unsupported/test/cxx11_tensor_cuda.cu index ad8c9662f..9584a539f 100644 --- a/unsupported/test/cxx11_tensor_cuda.cu +++ b/unsupported/test/cxx11_tensor_cuda.cu @@ -12,9 +12,6 @@ #define EIGEN_TEST_FUNC cxx11_tensor_cuda #define EIGEN_USE_GPU -#if EIGEN_CUDACC_VER >= 70500 -#include -#endif #include "main.h" #include diff --git a/unsupported/test/cxx11_tensor_device.cu b/unsupported/test/cxx11_tensor_device.cu index ae21f492a..cbb43e210 100644 --- a/unsupported/test/cxx11_tensor_device.cu +++ b/unsupported/test/cxx11_tensor_device.cu @@ -13,9 +13,6 @@ #define EIGEN_DEFAULT_DENSE_INDEX_TYPE int #define EIGEN_USE_GPU -#if EIGEN_CUDACC_VER >= 70500 -#include -#endif #include "main.h" #include diff --git a/unsupported/test/cxx11_tensor_of_float16_cuda.cu b/unsupported/test/cxx11_tensor_of_float16_cuda.cu index 0ba7657b8..b3aab0b9d 100644 --- a/unsupported/test/cxx11_tensor_of_float16_cuda.cu +++ b/unsupported/test/cxx11_tensor_of_float16_cuda.cu @@ -13,9 +13,6 @@ #define EIGEN_DEFAULT_DENSE_INDEX_TYPE int #define EIGEN_USE_GPU -#if EIGEN_CUDACC_VER >= 70500 -#include -#endif #include "main.h" #include diff --git a/unsupported/test/cxx11_tensor_random_cuda.cu b/unsupported/test/cxx11_tensor_random_cuda.cu index 94d5f4e5a..fa1a46732 100644 --- a/unsupported/test/cxx11_tensor_random_cuda.cu +++ b/unsupported/test/cxx11_tensor_random_cuda.cu @@ -13,9 +13,6 @@ #define EIGEN_DEFAULT_DENSE_INDEX_TYPE int #define EIGEN_USE_GPU -#if EIGEN_CUDACC_VER >= 70500 -#include -#endif #include "main.h" #include diff --git a/unsupported/test/cxx11_tensor_reduction_cuda.cu b/unsupported/test/cxx11_tensor_reduction_cuda.cu index fd09d013b..ec0669704 100644 --- a/unsupported/test/cxx11_tensor_reduction_cuda.cu +++ b/unsupported/test/cxx11_tensor_reduction_cuda.cu @@ -12,9 +12,6 @@ #define EIGEN_TEST_FUNC cxx11_tensor_reduction_cuda #define EIGEN_USE_GPU -#if dEIGEN_CUDACC_VER >= 70500 -#include -#endif #include "main.h" #include diff --git a/unsupported/test/cxx11_tensor_scan_cuda.cu b/unsupported/test/cxx11_tensor_scan_cuda.cu index 46571cfea..de1c0ac95 100644 --- a/unsupported/test/cxx11_tensor_scan_cuda.cu +++ b/unsupported/test/cxx11_tensor_scan_cuda.cu @@ -13,9 +13,6 @@ #define EIGEN_DEFAULT_DENSE_INDEX_TYPE int #define EIGEN_USE_GPU -#if EIGEN_CUDACC_VER >= 70500 -#include -#endif #include "main.h" #include -- cgit v1.2.3