diff options
| author |  Eugene Zhulenev <ezhulenev@google.com> | 2019-10-04 10:15:33 -0700 |
|---|---|---|
| committer | Eugene Zhulenev <ezhulenev@google.com> | 2019-10-04 10:15:33 -0700 |
| commit | 98bdd7252e14441dc2d392c5146496c35d5e6062 (patch) | |
| tree | 96e61318d44c047621b0a40fe496548e93397bd6 /unsupported/Eigen/CXX11/src/Tensor | |
| parent | 60ae24ee1a6c16114de456d77fcfba6f5a1160ca (diff) | |
Fix compilation warnings and errors with clang in TensorBlockV2 code and tests
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorBlockV2.h | 4 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorPadding.h | 4 |
2 files changed, 4 insertions, 4 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); |