Fixed merge conflicts

This commit is contained in:
Benoit Steiner
2016-11-19 19:12:59 -08:00
parent 2d1aec15a7
commit 81151bd474
2 changed files with 4 additions and 4 deletions

View File

@@ -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.