aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/Core
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2013-11-05 15:41:45 +0100
committerGravatar Gael Guennebaud <g.gael@free.fr>2013-11-05 15:41:45 +0100
commit4f572e4c14445158bd9e58c2ba651528847053d6 (patch)
treec351dc6516ae753f3c2ad74efd70e5432d37b27c /Eigen/Core
parent87aee5fda1d42f5e6fdbce3c5c91f28e291147cd (diff)
Add minimalistic unit tests for NVCC support
Diffstat (limited to 'Eigen/Core')
-rw-r--r--Eigen/Core9
1 files changed, 8 insertions, 1 deletions
diff --git a/Eigen/Core b/Eigen/Core
index d0f0adbe4..4c9c3d297 100644
--- a/Eigen/Core
+++ b/Eigen/Core
@@ -17,7 +17,14 @@
// Handle NVCC/CUDA
#ifdef __CUDACC__
// Do not try asserts on CUDA!
+ #ifndef EIGEN_NO_DEBUG
#define EIGEN_NO_DEBUG
+ #endif
+
+ #ifdef EIGEN_INTERNAL_DEBUGGING
+ #undef EIGEN_INTERNAL_DEBUGGING
+ #endif
+
// Do not try to vectorize on CUDA!
#define EIGEN_DONT_VECTORIZE
@@ -190,7 +197,7 @@
#include <intrin.h>
#endif
-#if defined(_CPPUNWIND) || defined(__EXCEPTIONS)
+#if (defined(_CPPUNWIND) || defined(__EXCEPTIONS)) && !defined(__CUDA_ARCH__)
#define EIGEN_EXCEPTIONS
#endif