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

Fixed a few more compilation warnings

Browse Source
This commit is contained in:
Benoit Steiner 2015-02-10 12:36:26 -08:00
parent 057cfd2f02
commit c21e45fbc5
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,7 @@ struct TensorEvaluator<const TensorConcatenationOp<Axis, LeftArgType, RightArgTy
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorEvaluator(const XprType& op, const Device& device) EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE TensorEvaluator(const XprType& op, const Device& device)
: m_leftImpl(op.lhsExpression(), device), m_rightImpl(op.rhsExpression(), device), m_axis(op.axis()) : m_leftImpl(op.lhsExpression(), device), m_rightImpl(op.rhsExpression(), device), m_axis(op.axis())
{ {
EIGEN_STATIC_ASSERT((TensorEvaluator<LeftArgType, Device>::Layout == TensorEvaluator<RightArgType, Device>::Layout || NumDims == 1), YOU_MADE_A_PROGRAMMING_MISTAKE); EIGEN_STATIC_ASSERT((static_cast<int>(TensorEvaluator<LeftArgType, Device>::Layout) == static_cast<int>(TensorEvaluator<RightArgType, Device>::Layout) || NumDims == 1), YOU_MADE_A_PROGRAMMING_MISTAKE);
EIGEN_STATIC_ASSERT(NumDims == RightNumDims, YOU_MADE_A_PROGRAMMING_MISTAKE) EIGEN_STATIC_ASSERT(NumDims == RightNumDims, YOU_MADE_A_PROGRAMMING_MISTAKE)
eigen_assert(0 <= m_axis && m_axis < NumDims); eigen_assert(0 <= m_axis && m_axis < NumDims);
const Dimensions& lhs_dims = m_leftImpl.dimensions(); const Dimensions& lhs_dims = m_leftImpl.dimensions();
@ -131,7 +131,7 @@ struct TensorEvaluator<const TensorConcatenationOp<Axis, LeftArgType, RightArgTy
m_dimensions[i] = lhs_dims[i]; m_dimensions[i] = lhs_dims[i];
} }
if (Layout == ColMajor) { if (static_cast<int>(Layout) == static_cast<int>(ColMajor)) {
m_leftStrides[0] = 1; m_leftStrides[0] = 1;
m_rightStrides[0] = 1; m_rightStrides[0] = 1;
m_outputStrides[0] = 1; m_outputStrides[0] = 1;
@ -176,7 +176,7 @@ struct TensorEvaluator<const TensorConcatenationOp<Axis, LeftArgType, RightArgTy
{ {
// Collect dimension-wise indices (subs). // Collect dimension-wise indices (subs).
array<Index, NumDims> subs; array<Index, NumDims> subs;
if (Layout == ColMajor) { if (static_cast<int>(Layout) == static_cast<int>(ColMajor)) {
for (int i = NumDims - 1; i > 0; --i) { for (int i = NumDims - 1; i > 0; --i) {
subs[i] = index / m_outputStrides[i]; subs[i] = index / m_outputStrides[i];
index -= subs[i] * m_outputStrides[i]; index -= subs[i] * m_outputStrides[i];
@ -193,7 +193,7 @@ struct TensorEvaluator<const TensorConcatenationOp<Axis, LeftArgType, RightArgTy
const Dimensions& left_dims = m_leftImpl.dimensions(); const Dimensions& left_dims = m_leftImpl.dimensions();
if (subs[m_axis] < left_dims[m_axis]) { if (subs[m_axis] < left_dims[m_axis]) {
Index left_index; Index left_index;
if (Layout == ColMajor) { if (static_cast<int>(Layout) == static_cast<int>(ColMajor)) {
left_index = subs[0]; left_index = subs[0];
for (int i = 1; i < NumDims; ++i) { for (int i = 1; i < NumDims; ++i) {
left_index += (subs[i] % left_dims[i]) * m_leftStrides[i]; left_index += (subs[i] % left_dims[i]) * m_leftStrides[i];
@ -209,7 +209,7 @@ struct TensorEvaluator<const TensorConcatenationOp<Axis, LeftArgType, RightArgTy
subs[m_axis] -= left_dims[m_axis]; subs[m_axis] -= left_dims[m_axis];
const Dimensions& right_dims = m_rightImpl.dimensions(); const Dimensions& right_dims = m_rightImpl.dimensions();
Index right_index; Index right_index;
if (Layout == ColMajor) { if (static_cast<int>(Layout) == static_cast<int>(ColMajor)) {
right_index = subs[0]; right_index = subs[0];
for (int i = 1; i < NumDims; ++i) { for (int i = 1; i < NumDims; ++i) {
right_index += (subs[i] % right_dims[i]) * m_rightStrides[i]; right_index += (subs[i] % right_dims[i]) * m_rightStrides[i];

6
unsupported/Eigen/CXX11/src/Tensor/TensorShuffling.h
View File

@ -126,7 +126,7 @@ struct TensorEvaluator<const TensorShufflingOp<Shuffle, ArgType>, Device>
array<Index, NumDims> inputStrides; array<Index, NumDims> inputStrides;
if (Layout == ColMajor) { if (static_cast<int>(Layout) == static_cast<int>(ColMajor)) {
inputStrides[0] = 1; inputStrides[0] = 1;
m_outputStrides[0] = 1; m_outputStrides[0] = 1;
for (int i = 1; i < NumDims; ++i) { for (int i = 1; i < NumDims; ++i) {
@ -180,12 +180,12 @@ struct TensorEvaluator<const TensorShufflingOp<Shuffle, ArgType>, Device>
return rslt; return rslt;
} }
Scalar* data() const { return NULL; } EIGEN_DEVICE_FUNC Scalar* data() const { return NULL; }
protected: protected:
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Index srcCoeff(Index index) const { EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Index srcCoeff(Index index) const {
Index inputIndex = 0; Index inputIndex = 0;
if (Layout == ColMajor) { if (static_cast<int>(Layout) == static_cast<int>(ColMajor)) {
for (int i = NumDims - 1; i > 0; --i) { for (int i = NumDims - 1; i > 0; --i) {
const Index idx = index / m_outputStrides[i]; const Index idx = index / m_outputStrides[i];
inputIndex += idx * m_inputStrides[i]; inputIndex += idx * m_inputStrides[i];

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

@ -123,7 +123,7 @@ struct TensorEvaluator<const TensorStridingOp<Strides, ArgType>, Device>
} }
const typename TensorEvaluator<ArgType, Device>::Dimensions& input_dims = m_impl.dimensions(); const typename TensorEvaluator<ArgType, Device>::Dimensions& input_dims = m_impl.dimensions();
if (Layout == ColMajor) { if (static_cast<int>(Layout) == static_cast<int>(ColMajor)) {
m_outputStrides[0] = 1; m_outputStrides[0] = 1;
m_inputStrides[0] = 1; m_inputStrides[0] = 1;
for (int i = 1; i < NumDims; ++i) { for (int i = 1; i < NumDims; ++i) {
@ -172,7 +172,7 @@ struct TensorEvaluator<const TensorStridingOp<Strides, ArgType>, Device>
Index inputIndices[] = {0, 0}; Index inputIndices[] = {0, 0};
Index indices[] = {index, index + packetSize - 1}; Index indices[] = {index, index + packetSize - 1};
if (Layout == ColMajor) { if (static_cast<int>(Layout) == static_cast<int>(ColMajor)) {
for (int i = NumDims - 1; i > 0; --i) { for (int i = NumDims - 1; i > 0; --i) {
const Index idx0 = indices[0] / m_outputStrides[i]; const Index idx0 = indices[0] / m_outputStrides[i];
const Index idx1 = indices[1] / m_outputStrides[i]; const Index idx1 = indices[1] / m_outputStrides[i];
@ -211,13 +211,13 @@ struct TensorEvaluator<const TensorStridingOp<Strides, ArgType>, Device>
} }
} }
Scalar* data() const { return NULL; } EIGEN_DEVICE_FUNC Scalar* data() const { return NULL; }
protected: protected:
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Index srcCoeff(Index index) const EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE Index srcCoeff(Index index) const
{ {
Index inputIndex = 0; Index inputIndex = 0;
if (Layout == ColMajor) { if (static_cast<int>(Layout) == static_cast<int>(ColMajor)) {
for (int i = NumDims - 1; i > 0; --i) { for (int i = NumDims - 1; i > 0; --i) {
const Index idx = index / m_outputStrides[i]; const Index idx = index / m_outputStrides[i];
inputIndex += idx * m_inputStrides[i]; inputIndex += idx * m_inputStrides[i];
@ -281,7 +281,7 @@ struct TensorEvaluator<TensorStridingOp<Strides, ArgType>, Device>
Index inputIndices[] = {0, 0}; Index inputIndices[] = {0, 0};
Index indices[] = {index, index + packetSize - 1}; Index indices[] = {index, index + packetSize - 1};
if (Layout == ColMajor) { if (static_cast<int>(Layout) == static_cast<int>(ColMajor)) {
for (int i = NumDims - 1; i > 0; --i) { for (int i = NumDims - 1; i > 0; --i) {
const Index idx0 = indices[0] / this->m_outputStrides[i]; const Index idx0 = indices[0] / this->m_outputStrides[i];
const Index idx1 = indices[1] / this->m_outputStrides[i]; const Index idx1 = indices[1] / this->m_outputStrides[i];