mirror of
https://gitlab.com/libeigen/eigen.git
synced 2025-07-11 15:41:49 +08:00
Fix a couple of remaining warnings (missing newlines, inline-noinline, meaningless type qualifiers)
This commit is contained in:
parent
87142237b5
commit
b9fe79153b
@ -26,4 +26,4 @@
|
|||||||
|
|
||||||
#include "src/Core/util/ReenableStupidWarnings.h"
|
#include "src/Core/util/ReenableStupidWarnings.h"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -85,9 +85,7 @@ inline bool DenseBase<Derived>::all() const
|
|||||||
&& SizeAtCompileTime * (CoeffReadCost + NumTraits<Scalar>::AddCost) <= EIGEN_UNROLLING_LIMIT
|
&& SizeAtCompileTime * (CoeffReadCost + NumTraits<Scalar>::AddCost) <= EIGEN_UNROLLING_LIMIT
|
||||||
};
|
};
|
||||||
if(unroll)
|
if(unroll)
|
||||||
return internal::all_unroller<Derived,
|
return internal::all_unroller<Derived, unroll ? int(SizeAtCompileTime) : Dynamic>::run(derived());
|
||||||
unroll ? int(SizeAtCompileTime) : Dynamic
|
|
||||||
>::run(derived());
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
for(Index j = 0; j < cols(); ++j)
|
for(Index j = 0; j < cols(); ++j)
|
||||||
@ -111,9 +109,7 @@ inline bool DenseBase<Derived>::any() const
|
|||||||
&& SizeAtCompileTime * (CoeffReadCost + NumTraits<Scalar>::AddCost) <= EIGEN_UNROLLING_LIMIT
|
&& SizeAtCompileTime * (CoeffReadCost + NumTraits<Scalar>::AddCost) <= EIGEN_UNROLLING_LIMIT
|
||||||
};
|
};
|
||||||
if(unroll)
|
if(unroll)
|
||||||
return internal::any_unroller<Derived,
|
return internal::any_unroller<Derived, unroll ? int(SizeAtCompileTime) : Dynamic>::run(derived());
|
||||||
unroll ? int(SizeAtCompileTime) : Dynamic
|
|
||||||
>::run(derived());
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
for(Index j = 0; j < cols(); ++j)
|
for(Index j = 0; j < cols(); ++j)
|
||||||
|
@ -103,8 +103,8 @@ class PartialReduxExpr : internal::no_assignment_operator,
|
|||||||
|
|
||||||
#define EIGEN_MEMBER_FUNCTOR(MEMBER,COST) \
|
#define EIGEN_MEMBER_FUNCTOR(MEMBER,COST) \
|
||||||
template <typename ResultType> \
|
template <typename ResultType> \
|
||||||
struct member_##MEMBER { \
|
struct member_##MEMBER { \
|
||||||
EIGEN_EMPTY_STRUCT_CTOR(member_##MEMBER) \
|
EIGEN_EMPTY_STRUCT_CTOR(member_##MEMBER) \
|
||||||
typedef ResultType result_type; \
|
typedef ResultType result_type; \
|
||||||
template<typename Scalar, int Size> struct Cost \
|
template<typename Scalar, int Size> struct Cost \
|
||||||
{ enum { value = COST }; }; \
|
{ enum { value = COST }; }; \
|
||||||
|
@ -71,7 +71,7 @@ EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF_VECTORIZABLE_FIXED_SIZE(_Scalar,_AmbientDim)
|
|||||||
template<typename Derived>
|
template<typename Derived>
|
||||||
inline explicit AlignedBox(const MatrixBase<Derived>& a_p)
|
inline explicit AlignedBox(const MatrixBase<Derived>& a_p)
|
||||||
{
|
{
|
||||||
const typename internal::nested<Derived,2>::type p(a_p.derived());
|
typename internal::nested<Derived,2>::type p(a_p.derived());
|
||||||
m_min = p;
|
m_min = p;
|
||||||
m_max = p;
|
m_max = p;
|
||||||
}
|
}
|
||||||
@ -296,7 +296,7 @@ template<typename Scalar,int AmbientDim>
|
|||||||
template<typename Derived>
|
template<typename Derived>
|
||||||
inline Scalar AlignedBox<Scalar,AmbientDim>::squaredExteriorDistance(const MatrixBase<Derived>& a_p) const
|
inline Scalar AlignedBox<Scalar,AmbientDim>::squaredExteriorDistance(const MatrixBase<Derived>& a_p) const
|
||||||
{
|
{
|
||||||
const typename internal::nested<Derived,2*AmbientDim>::type p(a_p.derived());
|
typename internal::nested<Derived,2*AmbientDim>::type p(a_p.derived());
|
||||||
Scalar dist2(0);
|
Scalar dist2(0);
|
||||||
Scalar aux;
|
Scalar aux;
|
||||||
for (Index k=0; k<dim(); ++k)
|
for (Index k=0; k<dim(); ++k)
|
||||||
|
@ -31,88 +31,99 @@ namespace internal {
|
|||||||
template <int SegSizeAtCompileTime> struct LU_kernel_bmod
|
template <int SegSizeAtCompileTime> struct LU_kernel_bmod
|
||||||
{
|
{
|
||||||
template <typename BlockScalarVector, typename ScalarVector, typename IndexVector, typename Index>
|
template <typename BlockScalarVector, typename ScalarVector, typename IndexVector, typename Index>
|
||||||
EIGEN_DONT_INLINE static void run(const int segsize, BlockScalarVector& dense, ScalarVector& tempv, ScalarVector& lusup, Index& luptr, const Index lda, const Index nrow, IndexVector& lsub, const Index lptr, const Index no_zeros)
|
static EIGEN_DONT_INLINE void run(const int segsize, BlockScalarVector& dense, ScalarVector& tempv, ScalarVector& lusup, Index& luptr, const Index lda,
|
||||||
{
|
const Index nrow, IndexVector& lsub, const Index lptr, const Index no_zeros);
|
||||||
typedef typename ScalarVector::Scalar Scalar;
|
|
||||||
// First, copy U[*,j] segment from dense(*) to tempv(*)
|
|
||||||
// The result of triangular solve is in tempv[*];
|
|
||||||
// The result of matric-vector update is in dense[*]
|
|
||||||
Index isub = lptr + no_zeros;
|
|
||||||
int i;
|
|
||||||
Index irow;
|
|
||||||
for (i = 0; i < ((SegSizeAtCompileTime==Dynamic)?segsize:SegSizeAtCompileTime); i++)
|
|
||||||
{
|
|
||||||
irow = lsub(isub);
|
|
||||||
tempv(i) = dense(irow);
|
|
||||||
++isub;
|
|
||||||
}
|
|
||||||
// Dense triangular solve -- start effective triangle
|
|
||||||
luptr += lda * no_zeros + no_zeros;
|
|
||||||
// Form Eigen matrix and vector
|
|
||||||
Map<Matrix<Scalar,SegSizeAtCompileTime,SegSizeAtCompileTime>, 0, OuterStride<> > A( &(lusup.data()[luptr]), segsize, segsize, OuterStride<>(lda) );
|
|
||||||
Map<Matrix<Scalar,SegSizeAtCompileTime,1> > u(tempv.data(), segsize);
|
|
||||||
|
|
||||||
u = A.template triangularView<UnitLower>().solve(u);
|
|
||||||
|
|
||||||
// Dense matrix-vector product y <-- B*x
|
|
||||||
luptr += segsize;
|
|
||||||
const Index PacketSize = internal::packet_traits<Scalar>::size;
|
|
||||||
Index ldl = internal::first_multiple(nrow, PacketSize);
|
|
||||||
Map<Matrix<Scalar,Dynamic,SegSizeAtCompileTime>, 0, OuterStride<> > B( &(lusup.data()[luptr]), nrow, segsize, OuterStride<>(lda) );
|
|
||||||
Index aligned_offset = internal::first_aligned(tempv.data()+segsize, PacketSize);
|
|
||||||
Index aligned_with_B_offset = (PacketSize-internal::first_aligned(B.data(), PacketSize))%PacketSize;
|
|
||||||
Map<Matrix<Scalar,Dynamic,1>, 0, OuterStride<> > l(tempv.data()+segsize+aligned_offset+aligned_with_B_offset, nrow, OuterStride<>(ldl) );
|
|
||||||
|
|
||||||
l.setZero();
|
|
||||||
internal::sparselu_gemm<Scalar>(l.rows(), l.cols(), B.cols(), B.data(), B.outerStride(), u.data(), u.outerStride(), l.data(), l.outerStride());
|
|
||||||
|
|
||||||
// Scatter tempv[] into SPA dense[] as a temporary storage
|
|
||||||
isub = lptr + no_zeros;
|
|
||||||
for (i = 0; i < ((SegSizeAtCompileTime==Dynamic)?segsize:SegSizeAtCompileTime); i++)
|
|
||||||
{
|
|
||||||
irow = lsub(isub++);
|
|
||||||
dense(irow) = tempv(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Scatter l into SPA dense[]
|
|
||||||
for (i = 0; i < nrow; i++)
|
|
||||||
{
|
|
||||||
irow = lsub(isub++);
|
|
||||||
dense(irow) -= l(i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
template <int SegSizeAtCompileTime>
|
||||||
|
template <typename BlockScalarVector, typename ScalarVector, typename IndexVector, typename Index>
|
||||||
|
EIGEN_DONT_INLINE void LU_kernel_bmod<SegSizeAtCompileTime>::run(const int segsize, BlockScalarVector& dense, ScalarVector& tempv, ScalarVector& lusup, Index& luptr, const Index lda,
|
||||||
|
const Index nrow, IndexVector& lsub, const Index lptr, const Index no_zeros)
|
||||||
|
{
|
||||||
|
typedef typename ScalarVector::Scalar Scalar;
|
||||||
|
// First, copy U[*,j] segment from dense(*) to tempv(*)
|
||||||
|
// The result of triangular solve is in tempv[*];
|
||||||
|
// The result of matric-vector update is in dense[*]
|
||||||
|
Index isub = lptr + no_zeros;
|
||||||
|
int i;
|
||||||
|
Index irow;
|
||||||
|
for (i = 0; i < ((SegSizeAtCompileTime==Dynamic)?segsize:SegSizeAtCompileTime); i++)
|
||||||
|
{
|
||||||
|
irow = lsub(isub);
|
||||||
|
tempv(i) = dense(irow);
|
||||||
|
++isub;
|
||||||
|
}
|
||||||
|
// Dense triangular solve -- start effective triangle
|
||||||
|
luptr += lda * no_zeros + no_zeros;
|
||||||
|
// Form Eigen matrix and vector
|
||||||
|
Map<Matrix<Scalar,SegSizeAtCompileTime,SegSizeAtCompileTime>, 0, OuterStride<> > A( &(lusup.data()[luptr]), segsize, segsize, OuterStride<>(lda) );
|
||||||
|
Map<Matrix<Scalar,SegSizeAtCompileTime,1> > u(tempv.data(), segsize);
|
||||||
|
|
||||||
|
u = A.template triangularView<UnitLower>().solve(u);
|
||||||
|
|
||||||
|
// Dense matrix-vector product y <-- B*x
|
||||||
|
luptr += segsize;
|
||||||
|
const Index PacketSize = internal::packet_traits<Scalar>::size;
|
||||||
|
Index ldl = internal::first_multiple(nrow, PacketSize);
|
||||||
|
Map<Matrix<Scalar,Dynamic,SegSizeAtCompileTime>, 0, OuterStride<> > B( &(lusup.data()[luptr]), nrow, segsize, OuterStride<>(lda) );
|
||||||
|
Index aligned_offset = internal::first_aligned(tempv.data()+segsize, PacketSize);
|
||||||
|
Index aligned_with_B_offset = (PacketSize-internal::first_aligned(B.data(), PacketSize))%PacketSize;
|
||||||
|
Map<Matrix<Scalar,Dynamic,1>, 0, OuterStride<> > l(tempv.data()+segsize+aligned_offset+aligned_with_B_offset, nrow, OuterStride<>(ldl) );
|
||||||
|
|
||||||
|
l.setZero();
|
||||||
|
internal::sparselu_gemm<Scalar>(l.rows(), l.cols(), B.cols(), B.data(), B.outerStride(), u.data(), u.outerStride(), l.data(), l.outerStride());
|
||||||
|
|
||||||
|
// Scatter tempv[] into SPA dense[] as a temporary storage
|
||||||
|
isub = lptr + no_zeros;
|
||||||
|
for (i = 0; i < ((SegSizeAtCompileTime==Dynamic)?segsize:SegSizeAtCompileTime); i++)
|
||||||
|
{
|
||||||
|
irow = lsub(isub++);
|
||||||
|
dense(irow) = tempv(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Scatter l into SPA dense[]
|
||||||
|
for (i = 0; i < nrow; i++)
|
||||||
|
{
|
||||||
|
irow = lsub(isub++);
|
||||||
|
dense(irow) -= l(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
template <> struct LU_kernel_bmod<1>
|
template <> struct LU_kernel_bmod<1>
|
||||||
{
|
{
|
||||||
template <typename BlockScalarVector, typename ScalarVector, typename IndexVector, typename Index>
|
template <typename BlockScalarVector, typename ScalarVector, typename IndexVector, typename Index>
|
||||||
EIGEN_DONT_INLINE static void run(const int /*segsize*/, BlockScalarVector& dense, ScalarVector& /*tempv*/, ScalarVector& lusup, Index& luptr, const Index lda, const Index nrow,
|
static EIGEN_DONT_INLINE void run(const int /*segsize*/, BlockScalarVector& dense, ScalarVector& /*tempv*/, ScalarVector& lusup, Index& luptr,
|
||||||
IndexVector& lsub, const Index lptr, const Index no_zeros)
|
const Index lda, const Index nrow, IndexVector& lsub, const Index lptr, const Index no_zeros);
|
||||||
{
|
|
||||||
typedef typename ScalarVector::Scalar Scalar;
|
|
||||||
Scalar f = dense(lsub(lptr + no_zeros));
|
|
||||||
luptr += lda * no_zeros + no_zeros + 1;
|
|
||||||
const Scalar* a(lusup.data() + luptr);
|
|
||||||
const /*typename IndexVector::Scalar*/Index* irow(lsub.data()+lptr + no_zeros + 1);
|
|
||||||
Index i = 0;
|
|
||||||
for (; i+1 < nrow; i+=2)
|
|
||||||
{
|
|
||||||
Index i0 = *(irow++);
|
|
||||||
Index i1 = *(irow++);
|
|
||||||
Scalar a0 = *(a++);
|
|
||||||
Scalar a1 = *(a++);
|
|
||||||
Scalar d0 = dense.coeff(i0);
|
|
||||||
Scalar d1 = dense.coeff(i1);
|
|
||||||
d0 -= f*a0;
|
|
||||||
d1 -= f*a1;
|
|
||||||
dense.coeffRef(i0) = d0;
|
|
||||||
dense.coeffRef(i1) = d1;
|
|
||||||
}
|
|
||||||
if(i<nrow)
|
|
||||||
dense.coeffRef(*(irow++)) -= f * *(a++);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
template <typename BlockScalarVector, typename ScalarVector, typename IndexVector, typename Index>
|
||||||
|
EIGEN_DONT_INLINE void LU_kernel_bmod<1>::run(const int /*segsize*/, BlockScalarVector& dense, ScalarVector& /*tempv*/, ScalarVector& lusup, Index& luptr,
|
||||||
|
const Index lda, const Index nrow, IndexVector& lsub, const Index lptr, const Index no_zeros)
|
||||||
|
{
|
||||||
|
typedef typename ScalarVector::Scalar Scalar;
|
||||||
|
Scalar f = dense(lsub(lptr + no_zeros));
|
||||||
|
luptr += lda * no_zeros + no_zeros + 1;
|
||||||
|
const Scalar* a(lusup.data() + luptr);
|
||||||
|
const /*typename IndexVector::Scalar*/Index* irow(lsub.data()+lptr + no_zeros + 1);
|
||||||
|
Index i = 0;
|
||||||
|
for (; i+1 < nrow; i+=2)
|
||||||
|
{
|
||||||
|
Index i0 = *(irow++);
|
||||||
|
Index i1 = *(irow++);
|
||||||
|
Scalar a0 = *(a++);
|
||||||
|
Scalar a1 = *(a++);
|
||||||
|
Scalar d0 = dense.coeff(i0);
|
||||||
|
Scalar d1 = dense.coeff(i1);
|
||||||
|
d0 -= f*a0;
|
||||||
|
d1 -= f*a1;
|
||||||
|
dense.coeffRef(i0) = d0;
|
||||||
|
dense.coeffRef(i1) = d1;
|
||||||
|
}
|
||||||
|
if(i<nrow)
|
||||||
|
dense.coeffRef(*(irow++)) -= f * *(a++);
|
||||||
|
}
|
||||||
|
|
||||||
} // end namespace internal
|
} // end namespace internal
|
||||||
|
|
||||||
} // end namespace Eigen
|
} // end namespace Eigen
|
||||||
|
@ -275,4 +275,4 @@ struct solve_retval<IncompleteCholesky<_Scalar, _UpLo, OrderingType>, Rhs>
|
|||||||
|
|
||||||
} // end namespace Eigen
|
} // end namespace Eigen
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -200,4 +200,4 @@ LevenbergMarquardt<FunctorType>::minimizeOneStep(FVectorType &x)
|
|||||||
|
|
||||||
} // end namespace Eigen
|
} // end namespace Eigen
|
||||||
|
|
||||||
#endif // EIGEN_LMONESTEP_H
|
#endif // EIGEN_LMONESTEP_H
|
||||||
|
Loading…
x
Reference in New Issue
Block a user