diff options
author | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-11-19 19:12:59 -0800 |
---|---|---|
committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-11-19 19:12:59 -0800 |
commit | 81151bd47489f39dedc3e9faa32679740c98bf01 (patch) | |
tree | 6267763cda50098b09da74c0d09d2e07c204d394 /Eigen/Core | |
parent | 2d1aec15a7b95a6369c73fdebcab59603fa6515a (diff) |
Fixed merge conflicts
Diffstat (limited to 'Eigen/Core')
-rw-r--r-- | Eigen/Core | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Eigen/Core b/Eigen/Core index a9a082782..444c1c8d7 100644 --- a/Eigen/Core +++ b/Eigen/Core @@ -47,10 +47,6 @@ #define EIGEN_DEVICE_FUNC #endif -#if defined(EIGEN_USE_SYCL) - #define EIGEN_DONT_VECTORIZE -#endif - // When compiling CUDA device code with NVCC, pull in math functions from the // global namespace. In host mode, and when device doee with clang, use the // std versions. |