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

Fix a number of MSAN failures in SVD tests.

Browse Source
This commit is contained in:
Rasmus Munk Larsen 2023-02-23 18:44:53 +00:00
parent c3f67063ed
commit 00844e3865
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/bdcsvd.cpp
View File

@ -95,9 +95,7 @@ void compare_bdc_jacobi_instance(bool structure_as_m, int algoswap = 16)
template <typename MatrixType> template <typename MatrixType>
void bdcsvd_all_options(const MatrixType& input = MatrixType()) { void bdcsvd_all_options(const MatrixType& input = MatrixType()) {
MatrixType m(input.rows(), input.cols()); svd_option_checks<MatrixType, 0>(input);
svd_fill_random(m);
svd_option_checks<MatrixType, 0>(m);
} }
template <typename MatrixType> template <typename MatrixType>

4
test/jacobisvd.cpp
View File

@ -75,9 +75,11 @@ void jacobisvd_verify_assert(const MatrixType& input = MatrixType()) {
} }
template <typename MatrixType> template <typename MatrixType>
void jacobisvd_verify_inputs(const MatrixType& m = MatrixType()) { void jacobisvd_verify_inputs(const MatrixType& input = MatrixType()) {
// check defaults // check defaults
typedef JacobiSVD<MatrixType> DefaultSVD; typedef JacobiSVD<MatrixType> DefaultSVD;
MatrixType m(input.rows(), input.cols());
svd_fill_random(m);
DefaultSVD defaultSvd(m); DefaultSVD defaultSvd(m);
VERIFY((int)DefaultSVD::QRPreconditioner == (int)ColPivHouseholderQRPreconditioner); VERIFY((int)DefaultSVD::QRPreconditioner == (int)ColPivHouseholderQRPreconditioner);
VERIFY(!defaultSvd.computeU()); VERIFY(!defaultSvd.computeU());

28
test/svd_common.h
View File

@ -392,12 +392,14 @@ void svd_preallocate()
} }
template <typename MatrixType, int QRPreconditioner = 0> template <typename MatrixType, int QRPreconditioner = 0>
void svd_verify_assert_full_only(const MatrixType& m = MatrixType()) { void svd_verify_assert_full_only(const MatrixType& input = MatrixType()) {
enum { RowsAtCompileTime = MatrixType::RowsAtCompileTime }; enum { RowsAtCompileTime = MatrixType::RowsAtCompileTime };
typedef Matrix<typename MatrixType::Scalar, RowsAtCompileTime, 1> RhsType; typedef Matrix<typename MatrixType::Scalar, RowsAtCompileTime, 1> RhsType;
RhsType rhs = RhsType::Zero(m.rows()); RhsType rhs = RhsType::Zero(input.rows());
MatrixType m(input.rows(), input.cols());
svd_fill_random(m);
SVD_STATIC_OPTIONS(MatrixType, QRPreconditioner) svd0; SVD_STATIC_OPTIONS(MatrixType, QRPreconditioner) svd0;
VERIFY_RAISES_ASSERT((svd0.matrixU())); VERIFY_RAISES_ASSERT((svd0.matrixU()));
VERIFY_RAISES_ASSERT((svd0.singularValues())); VERIFY_RAISES_ASSERT((svd0.singularValues()));
@ -420,11 +422,12 @@ void svd_verify_assert_full_only(const MatrixType& m = MatrixType()) {
} }
template <typename MatrixType, int QRPreconditioner = 0> template <typename MatrixType, int QRPreconditioner = 0>
void svd_verify_assert(const MatrixType& m = MatrixType()) { void svd_verify_assert(const MatrixType& input = MatrixType()) {
enum { RowsAtCompileTime = MatrixType::RowsAtCompileTime }; enum { RowsAtCompileTime = MatrixType::RowsAtCompileTime };
typedef Matrix<typename MatrixType::Scalar, RowsAtCompileTime, 1> RhsType; typedef Matrix<typename MatrixType::Scalar, RowsAtCompileTime, 1> RhsType;
RhsType rhs = RhsType::Zero(m.rows()); RhsType rhs = RhsType::Zero(input.rows());
MatrixType m(input.rows(), input.cols());
svd_fill_random(m);
SVD_STATIC_OPTIONS(MatrixType, QRPreconditioner | ComputeThinU) svdThinU(m); SVD_STATIC_OPTIONS(MatrixType, QRPreconditioner | ComputeThinU) svdThinU(m);
VERIFY_RAISES_ASSERT((svdThinU.matrixV())); VERIFY_RAISES_ASSERT((svdThinU.matrixV()));
@ -509,7 +512,9 @@ void svd_check_runtime_options(const MatrixType& m, unsigned int computationOpti
} }
template <typename MatrixType, int QRPreconditioner = 0> template <typename MatrixType, int QRPreconditioner = 0>
void svd_option_checks(const MatrixType& m) { void svd_option_checks(const MatrixType& input) {
MatrixType m(input.rows(), input.cols());
svd_fill_random(m);
svd_compute_checks<MatrixType, QRPreconditioner>(m); svd_compute_checks<MatrixType, QRPreconditioner>(m);
svd_compute_checks<MatrixType, QRPreconditioner | ComputeThinU>(m); svd_compute_checks<MatrixType, QRPreconditioner | ComputeThinU>(m);
svd_compute_checks<MatrixType, QRPreconditioner | ComputeThinV>(m); svd_compute_checks<MatrixType, QRPreconditioner | ComputeThinV>(m);
@ -543,7 +548,9 @@ void svd_option_checks(const MatrixType& m) {
} }
template <typename MatrixType, int QRPreconditioner = 0> template <typename MatrixType, int QRPreconditioner = 0>
void svd_option_checks_full_only(const MatrixType& m) { void svd_option_checks_full_only(const MatrixType& input) {
MatrixType m(input.rows(), input.cols());
svd_fill_random(m);
svd_compute_checks<MatrixType, QRPreconditioner | ComputeFullU>(m); svd_compute_checks<MatrixType, QRPreconditioner | ComputeFullU>(m);
svd_compute_checks<MatrixType, QRPreconditioner | ComputeFullV>(m); svd_compute_checks<MatrixType, QRPreconditioner | ComputeFullV>(m);
svd_compute_checks<MatrixType, QRPreconditioner | ComputeFullU | ComputeFullV>(m); svd_compute_checks<MatrixType, QRPreconditioner | ComputeFullU | ComputeFullV>(m);
@ -563,12 +570,14 @@ void svd_check_max_size_matrix(int initialRows, int initialCols) {
int cols = MaxColsAtCompileTime == Dynamic ? initialCols : (std::min)(initialCols, (int)MaxColsAtCompileTime); int cols = MaxColsAtCompileTime == Dynamic ? initialCols : (std::min)(initialCols, (int)MaxColsAtCompileTime);
MatrixType m(rows, cols); MatrixType m(rows, cols);
svd_fill_random(m);
SVD_STATIC_OPTIONS(MatrixType, QRPreconditioner | ComputeThinU | ComputeThinV) thinSvd(m); SVD_STATIC_OPTIONS(MatrixType, QRPreconditioner | ComputeThinU | ComputeThinV) thinSvd(m);
SVD_STATIC_OPTIONS(MatrixType, QRPreconditioner | ComputeThinU | ComputeFullV) mixedSvd1(m); SVD_STATIC_OPTIONS(MatrixType, QRPreconditioner | ComputeThinU | ComputeFullV) mixedSvd1(m);
SVD_STATIC_OPTIONS(MatrixType, QRPreconditioner | ComputeFullU | ComputeThinV) mixedSvd2(m); SVD_STATIC_OPTIONS(MatrixType, QRPreconditioner | ComputeFullU | ComputeThinV) mixedSvd2(m);
SVD_STATIC_OPTIONS(MatrixType, QRPreconditioner | ComputeFullU | ComputeFullV) fullSvd(m); SVD_STATIC_OPTIONS(MatrixType, QRPreconditioner | ComputeFullU | ComputeFullV) fullSvd(m);
MatrixType n(MaxRowsAtCompileTime, MaxColsAtCompileTime); MatrixType n(MaxRowsAtCompileTime, MaxColsAtCompileTime);
svd_fill_random(n);
thinSvd.compute(n); thinSvd.compute(n);
mixedSvd1.compute(n); mixedSvd1.compute(n);
mixedSvd2.compute(n); mixedSvd2.compute(n);
@ -595,6 +604,7 @@ void svd_verify_constructor_options_assert(const MatrixType& m, bool fullOnly =
typedef Matrix<Scalar, RowsAtCompileTime, 1> RhsType; typedef Matrix<Scalar, RowsAtCompileTime, 1> RhsType;
RhsType rhs(rows); RhsType rhs(rows);
svd_fill_random(rhs);
SvdType svd; SvdType svd;
VERIFY_RAISES_ASSERT(svd.matrixU()) VERIFY_RAISES_ASSERT(svd.matrixU())
VERIFY_RAISES_ASSERT(svd.singularValues()) VERIFY_RAISES_ASSERT(svd.singularValues())