GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-04 18:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Silence more compiler warnings.

Browse Source
This commit is contained in:
Rasmus Munk Larsen 2018-09-19 11:50:27 -07:00
parent febd09dcc0
commit db9c9df59a
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
unsupported/Eigen/CXX11/src/Tensor/TensorBlock.h
View File

@ -188,7 +188,7 @@ class TensorBlockIO {
StorageIndex input_span; StorageIndex input_span;
StorageIndex output_span; StorageIndex output_span;
StorageIndex size; StorageIndex size;
StorageIndex count; StorageIndex count = 0;
}; };
static EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void Copy( static EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE void Copy(
@ -257,7 +257,7 @@ class TensorBlockIO {
array<BlockIteratorState, at_least_1_dim> block_iter_state; array<BlockIteratorState, at_least_1_dim> block_iter_state;
// Initialize block iterator state. Squeeze away any dimension of size 1. // 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) { for (Index i = num_size_one_inner_dims; i < NumDims - 1; ++i) {
const Index dim = cond<Layout>()(i + 1, NumDims - i - 2); const Index dim = cond<Layout>()(i + 1, NumDims - i - 2);
const StorageIndex size = block.block_sizes()[tensor_to_block_dim_map[dim]]; 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_span =
block_iter_state[num_squeezed_dims].output_stride * block_iter_state[num_squeezed_dims].output_stride *
(block_iter_state[num_squeezed_dims].size - 1); (block_iter_state[num_squeezed_dims].size - 1);
block_iter_state[num_squeezed_dims].count = 0;
++num_squeezed_dims; ++num_squeezed_dims;
} }

10
unsupported/Eigen/CXX11/src/Tensor/TensorReduction.h
View File

@ -884,11 +884,11 @@ struct TensorEvaluator<const TensorReductionOp<Op, Dims, ArgType, MakePointer_>,
const Index first_preserved_dim_input_index = const Index first_preserved_dim_input_index =
m_output_to_input_dim_map[first_preserved_dim_output_index]; m_output_to_input_dim_map[first_preserved_dim_output_index];
const bool inner_most_dim_preserved = const bool inner_most_dim_preserved =
first_preserved_dim_input_index == PreservingInnerMostDims ||
(static_cast<int>(Layout) == static_cast<int>(ColMajor) (first_preserved_dim_input_index ==
? 0 (static_cast<int>(Layout) == static_cast<int>(ColMajor)
: NumInputDims - 1) | ? 0
PreservingInnerMostDims; : NumInputDims - 1));
// Calculate output block inner/outer dimension sizes. // Calculate output block inner/outer dimension sizes.
const Index output_block_inner_dim_size = const Index output_block_inner_dim_size =