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/Eigen/CXX11/src/Tensor/TensorExecutor.h | |
| parent | f2209d06e428e0691de71f30fc2db4cb29191cd2 (diff) | |
| parent | c8ea39867573b36c72c5342393f4e3ee22ab6406 (diff) | |
Merge with eigen/default
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorExecutor.h | 14 |
1 files changed, 4 insertions, 10 deletions
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()); |