diff options
| author |  Eugene Zhulenev <ezhulenev@google.com> | 2018-08-10 17:18:42 -0700 |
|---|---|---|
| committer | Eugene Zhulenev <ezhulenev@google.com> | 2018-08-10 17:18:42 -0700 |
| commit | 855b68896be3c72a1dbfa9ee78433a7c326ecdfb (patch) | |
| tree | c3419925dca4796108a6ddacebd244a0d7682c7b /unsupported | |
| parent | f2209d06e428e0691de71f30fc2db4cb29191cd2 (diff) | |
| parent | c8ea39867573b36c72c5342393f4e3ee22ab6406 (diff) | |
Merge with eigen/default
Diffstat (limited to 'unsupported')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h | 2 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h | 14 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h | 6 |
3 files changed, 7 insertions, 15 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h b/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h index 4a3e1ac17..f111964dd 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, }; diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h b/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h index 4bc18bd97..d9b61dc70 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h @@ -113,12 +113,9 @@ class TensorExecutor<Expression, DefaultDevice, Vectorizable, EIGEN_DEVICE_FUNC static EIGEN_STRONG_INLINE void run(const Expression& expr, const DefaultDevice& device = DefaultDevice()) { - typedef TensorBlock<ScalarNoConst, StorageIndex, NumDims, Evaluator::Layout> - TensorBlock; + typedef TensorBlock<ScalarNoConst, StorageIndex, NumDims, Evaluator::Layout> TensorBlock; + typedef TensorBlockMapper<ScalarNoConst, StorageIndex, NumDims, Evaluator::Layout> TensorBlockMapper; typedef typename TensorBlock::Dimensions TensorBlockDimensions; - typedef TensorBlockMapper<ScalarNoConst, StorageIndex, NumDims, - Evaluator::Layout> - TensorBlockMapper; Evaluator evaluator(expr, device); Index total_size = array_prod(evaluator.dimensions()); @@ -262,11 +259,8 @@ class TensorExecutor<Expression, ThreadPoolDevice, Vectorizable, /*Tileable*/ tr static EIGEN_STRONG_INLINE void run(const Expression& expr, const ThreadPoolDevice& device) { - typedef TensorBlock<ScalarNoConst, StorageIndex, NumDims, Evaluator::Layout> - TensorBlock; - typedef TensorBlockMapper<ScalarNoConst, StorageIndex, NumDims, - Evaluator::Layout> - TensorBlockMapper; + 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()); diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h b/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h index 6f9294ccf..a32743677 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorMorphing.h @@ -521,8 +521,7 @@ struct TensorEvaluator<const TensorSlicingOp<StartIndices, Sizes, ArgType>, Devi typedef typename internal::remove_const<Scalar>::type ScalarNoConst; - typedef internal::TensorBlock<ScalarNoConst, Index, NumDims, Layout> - TensorBlock; + typedef internal::TensorBlock<ScalarNoConst, Index, NumDims, Layout> TensorBlock; typedef typename TensorBlock::Dimensions TensorBlockDimensions; EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorEvaluator(const XprType& op, const Device& device) @@ -799,8 +798,7 @@ struct TensorEvaluator<TensorSlicingOp<StartIndices, Sizes, ArgType>, Device> typedef typename internal::remove_const<Scalar>::type ScalarNoConst; - typedef internal::TensorBlock<ScalarNoConst, Index, NumDims, Layout> - TensorBlock; + typedef internal::TensorBlock<ScalarNoConst, Index, NumDims, Layout> TensorBlock; typedef typename TensorBlock::Dimensions TensorBlockDimensions; EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorEvaluator(const XprType& op, const Device& device) |