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

Fixed a compilation warning triggered by nvcc

Browse Source
This commit is contained in:
Benoit Steiner 2015-11-12 20:10:52 -08:00
parent ed4b37de02
commit 10a91930cc
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
unsupported/Eigen/CXX11/src/Tensor/TensorArgMax.h
View File

@ -216,9 +216,10 @@ struct TensorEvaluator<const TensorTupleReducerOp<ReduceOp, Dims, ArgType>, Devi
: m_orig_impl(op.expression(), device), : m_orig_impl(op.expression(), device),
m_impl(op.expression().index_tuples().reduce(op.reduce_dims(), op.reduce_op()), device), m_impl(op.expression().index_tuples().reduce(op.reduce_dims(), op.reduce_op()), device),
m_return_dim(op.return_dim()), m_return_dim(op.return_dim()),
m_strides(gen_strides(m_orig_impl.dimensions())),
m_stride_mod(gen_stride_mod(m_orig_impl.dimensions())), m_stride_mod(gen_stride_mod(m_orig_impl.dimensions())),
m_stride_div(gen_stride_div()) { } m_stride_div(gen_stride_div()) {
gen_strides(m_orig_impl.dimensions(), m_strides);
}
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Dimensions& dimensions() const { EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Dimensions& dimensions() const {
return m_impl.dimensions(); return m_impl.dimensions();
@ -240,9 +241,10 @@ struct TensorEvaluator<const TensorTupleReducerOp<ReduceOp, Dims, ArgType>, Devi
EIGEN_DEVICE_FUNC Scalar* data() const { return NULL; } EIGEN_DEVICE_FUNC Scalar* data() const { return NULL; }
private: private:
EIGEN_DEVICE_FUNC StrideDims gen_strides(const InputDimensions& dims) { EIGEN_DEVICE_FUNC void gen_strides(const InputDimensions& dims, StrideDims& strides) {
StrideDims strides; if (m_return_dim < 0) {
if (m_return_dim < 0) return strides; // Won't be using these. return; // Won't be using the strides.
}
eigen_assert(m_return_dim < NumDims && eigen_assert(m_return_dim < NumDims &&
"Asking to convert index to a dimension outside of the rank"); "Asking to convert index to a dimension outside of the rank");
@ -259,7 +261,6 @@ struct TensorEvaluator<const TensorTupleReducerOp<ReduceOp, Dims, ArgType>, Devi
strides[i] = strides[i+1] * dims[i+1]; strides[i] = strides[i+1] * dims[i+1];
} }
} }
return strides;
} }
EIGEN_DEVICE_FUNC Index gen_stride_mod(const InputDimensions& dims) { EIGEN_DEVICE_FUNC Index gen_stride_mod(const InputDimensions& dims) {
@ -278,7 +279,7 @@ struct TensorEvaluator<const TensorTupleReducerOp<ReduceOp, Dims, ArgType>, Devi
TensorEvaluator<const TensorIndexTupleOp<ArgType>, Device> m_orig_impl; TensorEvaluator<const TensorIndexTupleOp<ArgType>, Device> m_orig_impl;
TensorEvaluator<const TensorReductionOp<ReduceOp, Dims, const TensorIndexTupleOp<ArgType> >, Device> m_impl; TensorEvaluator<const TensorReductionOp<ReduceOp, Dims, const TensorIndexTupleOp<ArgType> >, Device> m_impl;
const int m_return_dim; const int m_return_dim;
const StrideDims m_strides; StrideDims m_strides;
const Index m_stride_mod; const Index m_stride_mod;
const Index m_stride_div; const Index m_stride_div;
}; };