diff options
author | Rasmus Munk Larsen <rmlarsen@google.com> | 2019-10-18 16:42:00 -0700 |
---|---|---|
committer | Rasmus Munk Larsen <rmlarsen@google.com> | 2019-10-18 16:42:00 -0700 |
commit | 668ab3fc474e54c7919eda4fbaf11f3a99246494 (patch) | |
tree | 3f2b80538739d85ebae042b0f9cafe163d8287e1 /unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h | |
parent | df0e8b81370f741c734e4f4187d029d6a8cb18f2 (diff) |
Drop support for c++03 in Eigen tensor. Get rid of some code used to emulate c++11 functionality with older compilers.
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h')
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h b/unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h index 802cf21d8..5549cbdb2 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorForwardDeclarations.h @@ -155,19 +155,11 @@ struct IsVectorizable<GpuDevice, Expression> { }; // Tiled evaluation strategy. -#if !EIGEN_HAS_CXX11 -// To be able to use `TiledEvaluation::Off` in C++03 we need a namespace. -// (Use of enumeration in a nested name specifier is a c++11 extension). -namespace TiledEvaluation { -#endif enum TiledEvaluation { Off = 0, // tiled evaluation is not supported On = 1, // still work in progress (see TensorBlockV2.h) Legacy = 2 // soon to be deprecated (see TensorBock.h) }; -#if !EIGEN_HAS_CXX11 -} // namespace TiledEvaluation -#endif template <typename Device, typename Expression> struct IsTileable { @@ -182,30 +174,16 @@ struct IsTileable { TensorEvaluator<Expression, Device>::BlockAccessV2 && TensorEvaluator<Expression, Device>::PreferBlockAccess; -#if EIGEN_HAS_CXX11 static const TiledEvaluation value = BlockAccessV2 ? TiledEvaluation::On : (BlockAccess ? TiledEvaluation::Legacy : TiledEvaluation::Off); -#else - static const TiledEvaluation::TiledEvaluation value = - BlockAccessV2 - ? TiledEvaluation::On - : (BlockAccess ? TiledEvaluation::Legacy : TiledEvaluation::Off); -#endif }; -#if EIGEN_HAS_CXX11 template <typename Expression, typename Device, bool Vectorizable = IsVectorizable<Device, Expression>::value, TiledEvaluation Tiling = IsTileable<Device, Expression>::value> class TensorExecutor; -#else -template <typename Expression, typename Device, - bool Vectorizable = IsVectorizable<Device, Expression>::value, - TiledEvaluation::TiledEvaluation Tiling = IsTileable<Device, Expression>::value> -class TensorExecutor; -#endif // TODO(ezhulenev): Add TiledEvaluation support to async executor. template <typename Expression, typename Device, typename DoneCallback, |