diff options
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h | 5 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h b/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h index ee70d1d76..aa2e5bcc6 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h @@ -188,7 +188,7 @@ class TensorBlockIO { StorageIndex input_span; StorageIndex output_span; StorageIndex size; - StorageIndex count; + StorageIndex count = 0; }; static EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void Copy( @@ -257,7 +257,7 @@ class TensorBlockIO { array<BlockIteratorState, at_least_1_dim> block_iter_state; // Initialize block iterator state. Squeeze away any dimension of size 1. - int num_squeezed_dims = 0; + Index num_squeezed_dims = 0; for (Index i = num_size_one_inner_dims; i < NumDims - 1; ++i) { const Index dim = cond<Layout>()(i + 1, NumDims - i - 2); const StorageIndex size = block.block_sizes()[tensor_to_block_dim_map[dim]]; @@ -280,7 +280,6 @@ class TensorBlockIO { block_iter_state[num_squeezed_dims].output_span = block_iter_state[num_squeezed_dims].output_stride * (block_iter_state[num_squeezed_dims].size - 1); - block_iter_state[num_squeezed_dims].count = 0; ++num_squeezed_dims; } diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h b/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h index 4263f11a6..949764f3a 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h @@ -884,11 +884,11 @@ struct TensorEvaluator<const TensorReductionOp<Op, Dims, ArgType, MakePointer_>, const Index first_preserved_dim_input_index = m_output_to_input_dim_map[first_preserved_dim_output_index]; const bool inner_most_dim_preserved = - first_preserved_dim_input_index == - (static_cast<int>(Layout) == static_cast<int>(ColMajor) - ? 0 - : NumInputDims - 1) | - PreservingInnerMostDims; + PreservingInnerMostDims || + (first_preserved_dim_input_index == + (static_cast<int>(Layout) == static_cast<int>(ColMajor) + ? 0 + : NumInputDims - 1)); // Calculate output block inner/outer dimension sizes. const Index output_block_inner_dim_size = |