diff options
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorBlockV2.h | 4 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorPadding.h | 4 | ||||
| -rw-r--r-- | unsupported/test/cxx11_tensor_block_eval.cpp | 8 | ||||
| -rw-r--r-- | unsupported/test/cxx11_tensor_executor.cpp | 6 |
4 files changed, 12 insertions, 10 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorBlockV2.h b/unsupported/Eigen/CXX11/src/Tensor/TensorBlockV2.h index 4d2145bf3..3880e7ed3 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorBlockV2.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorBlockV2.h @@ -418,7 +418,7 @@ class TensorMaterializedBlock { if (can_use_direct_access) { const Scalar* block_start = data + desc.offset(); - return TensorMaterializedBlock(TensorBlockKind::kView, block_start, + return TensorMaterializedBlock(internal::TensorBlockKind::kView, block_start, desc.dimensions()); } else { @@ -438,7 +438,7 @@ class TensorMaterializedBlock { TensorBlockIO::Copy(dst, src); - return TensorMaterializedBlock(TensorBlockKind::kMaterializedInScratch, + return TensorMaterializedBlock(internal::TensorBlockKind::kMaterializedInScratch, block_buffer, desc.dimensions()); } } diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorPadding.h b/unsupported/Eigen/CXX11/src/Tensor/TensorPadding.h index be2449ebd..489b915ac 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorPadding.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorPadding.h @@ -295,8 +295,8 @@ struct TensorEvaluator<const TensorPaddingOp<PaddingDimensions, ArgType>, Device // Initialize output block iterator state. Dimension in this array are // always in inner_most -> outer_most order (col major layout). array<BlockIteratorState, NumDims - 1> it; - for (Index i = 0; i < NumDims - 1; ++i) { - const Index dim = IsColMajor ? i + 1 : NumDims - i - 2; + for (int i = 0; i < NumDims - 1; ++i) { + const int dim = IsColMajor ? i + 1 : NumDims - i - 2; it[i].count = 0; it[i].size = desc.dimension(dim); diff --git a/unsupported/test/cxx11_tensor_block_eval.cpp b/unsupported/test/cxx11_tensor_block_eval.cpp index ff98e170d..75252362c 100644 --- a/unsupported/test/cxx11_tensor_block_eval.cpp +++ b/unsupported/test/cxx11_tensor_block_eval.cpp @@ -104,13 +104,13 @@ static TensorBlockParams<NumDims> FixedSizeBlock(DSizes<Index, NumDims> dims) { return {offsets, dims, TensorBlockDescriptor<NumDims, Index>(0, dims)}; } -inline Eigen::IndexList<int, Eigen::type2index<1>> NByOne(int n) { - Eigen::IndexList<int, Eigen::type2index<1>> ret; +inline Eigen::IndexList<Index, Eigen::type2index<1>> NByOne(Index n) { + Eigen::IndexList<Index, Eigen::type2index<1>> ret; ret.set(0, n); return ret; } -inline Eigen::IndexList<Eigen::type2index<1>, int> OneByM(int m) { - Eigen::IndexList<Eigen::type2index<1>, int> ret; +inline Eigen::IndexList<Eigen::type2index<1>, Index> OneByM(Index m) { + Eigen::IndexList<Eigen::type2index<1>, Index> ret; ret.set(1, m); return ret; } diff --git a/unsupported/test/cxx11_tensor_executor.cpp b/unsupported/test/cxx11_tensor_executor.cpp index 9094b6507..efae81961 100644 --- a/unsupported/test/cxx11_tensor_executor.cpp +++ b/unsupported/test/cxx11_tensor_executor.cpp @@ -582,10 +582,11 @@ static void test_async_execute_unary_expr(Device d) Eigen::Barrier done(1); auto on_done = [&done]() { done.Notify(); }; + static const bool TilingOn = Tiling == TiledEvaluation::Off ? false : true; using Assign = TensorAssignOp<decltype(dst), const decltype(expr)>; using DoneCallback = decltype(on_done); using Executor = internal::TensorAsyncExecutor<const Assign, Device, DoneCallback, - Vectorizable, Tiling>; + Vectorizable, TilingOn>; Executor::runAsync(Assign(dst, expr), d, on_done); done.Wait(); @@ -618,10 +619,11 @@ static void test_async_execute_binary_expr(Device d) Eigen::Barrier done(1); auto on_done = [&done]() { done.Notify(); }; + static const bool TilingOn = Tiling == TiledEvaluation::Off ? false : true; using Assign = TensorAssignOp<decltype(dst), const decltype(expr)>; using DoneCallback = decltype(on_done); using Executor = internal::TensorAsyncExecutor<const Assign, Device, DoneCallback, - Vectorizable, Tiling>; + Vectorizable, TilingOn>; Executor::runAsync(Assign(dst, expr), d, on_done); done.Wait(); |