diff options
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor')
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h | 22 | ||||
-rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h | 34 |
2 files changed, 26 insertions, 30 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h b/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h index 45ddfdb39..cbf91013b 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h @@ -60,7 +60,7 @@ struct cond<RowMajor> { * - kSkewedInnerDims: 100 blocks of size 100x1 (or 1x100 depending on a column * or row major layout) */ -enum class TensorBlockShapeType { +enum TensorBlockShapeType { kUniformAllDims, kSkewedInnerDims, }; @@ -152,11 +152,11 @@ struct TensorBlockCopyOp { const Scalar* src_base = &src_data[src_index]; Scalar* dst_base = &dst_data[dst_index]; - using Src = const Eigen::Array<Scalar, Dynamic, 1>; - using Dst = Eigen::Array<Scalar, Dynamic, 1>; + typedef const Eigen::Array<Scalar, Dynamic, 1> Src; + typedef Eigen::Array<Scalar, Dynamic, 1> Dst; - using SrcMap = Eigen::Map<Src, 0, InnerStride<>>; - using DstMap = Eigen::Map<Dst, 0, InnerStride<>>; + typedef Eigen::Map<Src, 0, InnerStride<>> SrcMap; + typedef Eigen::Map<Dst, 0, InnerStride<>> DstMap; const SrcMap src(src_base, num_coeff_to_copy, InnerStride<>(src_stride)); DstMap dst(dst_base, num_coeff_to_copy, InnerStride<>(dst_stride)); @@ -401,13 +401,13 @@ struct TensorBlockCwiseBinaryOp { const StorageIndex left_stride, const LeftScalar* left_data, const StorageIndex right_index, const StorageIndex right_stride, const RightScalar* right_data) { - using Lhs = const Eigen::Array<LeftScalar, Dynamic, 1>; - using Rhs = const Eigen::Array<RightScalar, Dynamic, 1>; - using Out = Eigen::Array<OutputScalar, Dynamic, 1>; + typedef const Eigen::Array<LeftScalar, Dynamic, 1> Lhs; + typedef const Eigen::Array<RightScalar, Dynamic, 1> Rhs; + typedef Eigen::Array<OutputScalar, Dynamic, 1> Out; - using LhsMap = Eigen::Map<Lhs, 0, InnerStride<>>; - using RhsMap = Eigen::Map<Rhs, 0, InnerStride<>>; - using OutMap = Eigen::Map<Out, 0, InnerStride<>>; + typedef Eigen::Map<Lhs, 0, InnerStride<>> LhsMap; + typedef Eigen::Map<Rhs, 0, InnerStride<>> RhsMap; + typedef Eigen::Map<Out, 0, InnerStride<>> OutMap; const LeftScalar* lhs_base = &left_data[left_index]; const RightScalar* rhs_base = &right_data[right_index]; diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h b/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h index 17008917a..3f3b5685d 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h @@ -36,7 +36,7 @@ template <typename Expression, typename Device, bool Vectorizable, bool Tileable> class TensorExecutor { public: - using StorageIndex = typename Expression::Index; + typedef typename Expression::Index StorageIndex; EIGEN_DEVICE_FUNC static EIGEN_STRONG_INLINE void run(const Expression& expr, @@ -60,7 +60,7 @@ template <typename Expression> class TensorExecutor<Expression, DefaultDevice, /*Vectorizable*/ true, /*Tileable*/ false> { public: - using StorageIndex = typename Expression::Index; + typedef typename Expression::Index StorageIndex; EIGEN_DEVICE_FUNC static EIGEN_STRONG_INLINE void run(const Expression& expr, @@ -102,21 +102,19 @@ template <typename Expression, bool Vectorizable> class TensorExecutor<Expression, DefaultDevice, Vectorizable, /*Tileable*/ true> { public: - using Scalar = typename traits<Expression>::Scalar; - using ScalarNoConst = typename remove_const<Scalar>::type; + typedef typename traits<Expression>::Scalar Scalar; + typedef typename remove_const<Scalar>::type ScalarNoConst; - using Evaluator = TensorEvaluator<Expression, DefaultDevice>; - using StorageIndex = typename traits<Expression>::Index; + typedef TensorEvaluator<Expression, DefaultDevice> Evaluator; + typedef typename traits<Expression>::Index StorageIndex; static const int NumDims = traits<Expression>::NumDimensions; EIGEN_DEVICE_FUNC static EIGEN_STRONG_INLINE void run(const Expression& expr, const DefaultDevice& device = DefaultDevice()) { - using TensorBlock = - TensorBlock<ScalarNoConst, StorageIndex, NumDims, Evaluator::Layout>; - using TensorBlockMapper = TensorBlockMapper<ScalarNoConst, StorageIndex, - NumDims, Evaluator::Layout>; + typedef TensorBlock<ScalarNoConst, StorageIndex, NumDims, Evaluator::Layout> TensorBlock; + typedef TensorBlockMapper<ScalarNoConst, StorageIndex, NumDims, Evaluator::Layout> TensorBlockMapper; Evaluator evaluator(expr, device); Index total_size = array_prod(evaluator.dimensions()); @@ -221,7 +219,7 @@ struct EvalRange<Evaluator, StorageIndex, /*Vectorizable*/ true> { template <typename Expression, bool Vectorizable, bool Tileable> class TensorExecutor<Expression, ThreadPoolDevice, Vectorizable, Tileable> { public: - using StorageIndex = typename Expression::Index; + typedef typename Expression::Index StorageIndex; static EIGEN_STRONG_INLINE void run(const Expression& expr, const ThreadPoolDevice& device) { @@ -249,20 +247,18 @@ class TensorExecutor<Expression, ThreadPoolDevice, Vectorizable, Tileable> { template <typename Expression, bool Vectorizable> class TensorExecutor<Expression, ThreadPoolDevice, Vectorizable, /*Tileable*/ true> { public: - using Scalar = typename traits<Expression>::Scalar; - using ScalarNoConst = typename remove_const<Scalar>::type; + typedef typename traits<Expression>::Scalar Scalar; + typedef typename remove_const<Scalar>::type ScalarNoConst; - using Evaluator = TensorEvaluator<Expression, ThreadPoolDevice>; - using StorageIndex = typename traits<Expression>::Index; + typedef TensorEvaluator<Expression, ThreadPoolDevice> Evaluator; + typedef typename traits<Expression>::Index StorageIndex; static const int NumDims = traits<Expression>::NumDimensions; static EIGEN_STRONG_INLINE void run(const Expression& expr, const ThreadPoolDevice& device) { - using TensorBlock = - TensorBlock<ScalarNoConst, StorageIndex, NumDims, Evaluator::Layout>; - using TensorBlockMapper = - TensorBlockMapper<ScalarNoConst, StorageIndex, NumDims, Evaluator::Layout>; + typedef TensorBlock<ScalarNoConst, StorageIndex, NumDims, Evaluator::Layout> TensorBlock; + typedef TensorBlockMapper<ScalarNoConst, StorageIndex, NumDims, Evaluator::Layout> TensorBlockMapper; Evaluator evaluator(expr, device); StorageIndex total_size = array_prod(evaluator.dimensions()); |