diff options
author | mehdi-goli <mehdi.goli@codeplay.com> | 2020-05-11 16:10:33 +0100 |
---|---|---|
committer | mehdi-goli <mehdi.goli@codeplay.com> | 2020-05-11 16:10:33 +0100 |
commit | d3e81db6c517e8c531cf9b32b818c838b5398e83 (patch) | |
tree | f282788cfa31c3cefb788c008e4f6019b3968f20 | |
parent | c1d944dd913d05180b7d2d1229072c9c52a11f29 (diff) |
Eigen moved the `scanLauncehr` function inside the internal namespace.
This commit applies the following changes:
- Moving the `scamLauncher` specialization inside internal namespace to fix compiler crash on TensorScan for SYCL backend.
- Replacing `SYCL/sycl.hpp` to `CL/sycl.hpp` in order to follow SYCL 1.2.1 standard.
- minor fixes: commenting out an unused variable to avoid compiler warnings.
-rw-r--r-- | Eigen/Core | 2 | ||||
-rw-r--r-- | bench/tensors/tensor_benchmarks_sycl.cc | 2 | ||||
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h | 2 | ||||
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorScanSycl.h | 7 |
4 files changed, 7 insertions, 6 deletions
diff --git a/Eigen/Core b/Eigen/Core index 688361d46..426f9cbc0 100644 --- a/Eigen/Core +++ b/Eigen/Core @@ -108,7 +108,7 @@ #undef isnan #undef isinf #undef isfinite - #include <SYCL/sycl.hpp> + #include <CL/sycl.hpp> #include <map> #include <memory> #include <utility> diff --git a/bench/tensors/tensor_benchmarks_sycl.cc b/bench/tensors/tensor_benchmarks_sycl.cc index b8a096684..6f9f87179 100644 --- a/bench/tensors/tensor_benchmarks_sycl.cc +++ b/bench/tensors/tensor_benchmarks_sycl.cc @@ -1,6 +1,6 @@ #ifdef EIGEN_USE_SYCL -#include <SYCL/sycl.hpp> +#include <CL/sycl.hpp> #include <iostream> #include "tensor_benchmarks.h" diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h b/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h index f107d1b19..b4bcb54be 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h @@ -564,7 +564,7 @@ struct TensorEvaluator<const TensorSlicingOp<StartIndices, Sizes, ArgType>, Devi #ifdef EIGEN_USE_THREADS template <typename EvalSubExprsCallback> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void evalSubExprsIfNeededAsync( - EvaluatorPointerType data, EvalSubExprsCallback done) { + EvaluatorPointerType /*data*/, EvalSubExprsCallback done) { m_impl.evalSubExprsIfNeededAsync(nullptr, [done](bool) { done(true); }); } #endif // EIGEN_USE_THREADS diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorScanSycl.h b/unsupported/Eigen/CXX11/src/Tensor/TensorScanSycl.h index 0078692cd..7f68ecb6a 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorScanSycl.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorScanSycl.h @@ -464,9 +464,9 @@ struct ScanLauncher_impl { } // namespace internal } // namespace TensorSycl - -template <typename Self, typename Reducer> -struct ScanLauncher<Self, Reducer, Eigen::SyclDevice> { +namespace internal { +template <typename Self, typename Reducer, bool vectorize> +struct ScanLauncher<Self, Reducer, Eigen::SyclDevice, vectorize> { typedef typename Self::Index Index; typedef typename Self::CoeffReturnType CoeffReturnType; typedef typename Self::Storage Storage; @@ -507,6 +507,7 @@ struct ScanLauncher<Self, Reducer, Eigen::SyclDevice> { inclusive, dev); } }; +} // namespace internal } // namespace Eigen #endif // UNSUPPORTED_EIGEN_CXX11_SRC_TENSOR_TENSOR_SYCL_SYCL_HPP |