diff options
| author |  Mehdi Goli <mehdi.goli@codeplay.com> | 2016-11-04 18:18:19 +0000 |
|---|---|---|
| committer | Mehdi Goli <mehdi.goli@codeplay.com> | 2016-11-04 18:18:19 +0000 |
| commit | 0ebe3808ca8b2c96d9d77024ba8d4d0bdfb7e23c (patch) | |
| tree | 1358b27b6a27cb89b3665016ec651f6081babfef /unsupported/Eigen/CXX11/Tensor | |
| parent | 0585b2965d06cc2c57be35844bd2d0d56e6334ac (diff) | |
Removed the sycl include from Eigen/Core and moved it to Unsupported/Eigen/CXX11/Tensor; added TensorReduction for sycl (full reduction and partial reduction); added TensorReduction test case for sycl (full reduction and partial reduction); fixed the tile size on TensorSyclRun.h based on the device max work group size;
Diffstat (limited to 'unsupported/Eigen/CXX11/Tensor')
| -rw-r--r-- | unsupported/Eigen/CXX11/Tensor | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/unsupported/Eigen/CXX11/Tensor b/unsupported/Eigen/CXX11/Tensor index 388976d2e..1cf19d6c1 100644 --- a/unsupported/Eigen/CXX11/Tensor +++ b/unsupported/Eigen/CXX11/Tensor @@ -13,6 +13,15 @@ #include "../../../Eigen/Core" +#ifdef EIGEN_USE_SYCL +#undef min +#undef max +#undef isnan +#undef isinf +#undef isfinite +#include <SYCL/sycl.hpp> +#endif + #include <Eigen/src/Core/util/DisableStupidWarnings.h> #include "../SpecialFunctions" @@ -69,10 +78,6 @@ typedef unsigned __int64 uint64_t; #endif #endif -#ifdef EIGEN_USE_SYCL -#include <SYCL/sycl.hpp> -#endif - #include "src/Tensor/TensorMacros.h" #include "src/Tensor/TensorForwardDeclarations.h" #include "src/Tensor/TensorMeta.h" @@ -81,7 +86,6 @@ typedef unsigned __int64 uint64_t; #include "src/Tensor/TensorDeviceDefault.h" #include "src/Tensor/TensorDeviceThreadPool.h" #include "src/Tensor/TensorDeviceCuda.h" -#include "src/Tensor/TensorSycl.h" #include "src/Tensor/TensorDeviceSycl.h" #include "src/Tensor/TensorIndexList.h" #include "src/Tensor/TensorDimensionList.h" @@ -128,6 +132,7 @@ typedef unsigned __int64 uint64_t; #include "src/Tensor/TensorAssign.h" #include "src/Tensor/TensorScan.h" +#include "src/Tensor/TensorSycl.h" #include "src/Tensor/TensorExecutor.h" #include "src/Tensor/TensorDevice.h" |