Fix compilation warnings and errors with clang in TensorBlockV2 code and tests

This commit is contained in:
Eugene Zhulenev
2019-10-04 10:15:33 -07:00
parent 60ae24ee1a
commit 98bdd7252e
4 changed files with 12 additions and 10 deletions

View File

@@ -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());
}
}

View File

@@ -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);