From b08527b0c1ffdbd44347ca3a7869f10b0cb3cbb6 Mon Sep 17 00:00:00 2001 From: Rasmus Munk Larsen Date: Fri, 31 May 2019 15:26:06 -0700 Subject: Clean up CUDA/NVCC version macros and their use in Eigen, and a few other CUDA build failures. --- test/gpu_common.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'test/gpu_common.h') diff --git a/test/gpu_common.h b/test/gpu_common.h index 79d4ea694..fd8278f67 100644 --- a/test/gpu_common.h +++ b/test/gpu_common.h @@ -1,4 +1,3 @@ - #ifndef EIGEN_TEST_GPU_COMMON_H #define EIGEN_TEST_GPU_COMMON_H @@ -130,10 +129,14 @@ void ei_test_init_gpu() std::cout << " EIGEN_CUDACC: " << int(EIGEN_CUDACC) << "\n"; #endif - #ifdef EIGEN_CUDACC_VER - std::cout << " EIGEN_CUDACC_VER: " << int(EIGEN_CUDACC_VER) << "\n"; + #ifdef EIGEN_CUDA_SDK_VER + std::cout << " EIGEN_CUDA_SDK_VER: " << int(EIGEN_CUDA_SDK_VER) << "\n"; #endif + #ifdef EIGEN_COMP_NVCC + std::cout << " EIGEN_COMP_NVCC: " << int(EIGEN_COMP_NVCC) << "\n"; + #endif + #ifdef EIGEN_HIPCC std::cout << " EIGEN_HIPCC: " << int(EIGEN_HIPCC) << "\n"; #endif -- cgit v1.2.3