From 2eae2d149dd7f0c1a1ec9ee8196f664caec942c4 Mon Sep 17 00:00:00 2001 From: conrad Date: Sun, 21 Mar 2021 23:46:16 +1000 Subject: [PATCH] layout fix --- include/armadillo_bits/auxlib_meat.hpp | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/include/armadillo_bits/auxlib_meat.hpp b/include/armadillo_bits/auxlib_meat.hpp index ff3d1ce4..885c70f3 100644 --- a/include/armadillo_bits/auxlib_meat.hpp +++ b/include/armadillo_bits/auxlib_meat.hpp @@ -3020,14 +3020,14 @@ auxlib::svd(Col& S, Mat& A) char jobu = 'N'; char jobvt = 'N'; - blas_int m = blas_int(A.n_rows); - blas_int n = blas_int(A.n_cols); - blas_int min_mn = (std::min)(m,n); - blas_int lda = blas_int(A.n_rows); - blas_int ldu = blas_int(U.n_rows); - blas_int ldvt = blas_int(V.n_rows); - blas_int lwork_min = (std::max)( blas_int(1), (std::max)( (3*min_mn + (std::max)(m,n)), 5*min_mn ) ); - blas_int info = 0; + blas_int m = blas_int(A.n_rows); + blas_int n = blas_int(A.n_cols); + blas_int min_mn = (std::min)(m,n); + blas_int lda = blas_int(A.n_rows); + blas_int ldu = blas_int(U.n_rows); + blas_int ldvt = blas_int(V.n_rows); + blas_int lwork_min = (std::max)( blas_int(1), (std::max)( (3*min_mn + (std::max)(m,n)), 5*min_mn ) ); + blas_int info = 0; S.set_size( static_cast(min_mn) ); @@ -3162,14 +3162,14 @@ auxlib::svd(Mat& U, Col& S, Mat& V, Mat& A) char jobu = 'A'; char jobvt = 'A'; - blas_int m = blas_int(A.n_rows); - blas_int n = blas_int(A.n_cols); - blas_int min_mn = (std::min)(m,n); - blas_int lda = blas_int(A.n_rows); - blas_int ldu = blas_int(U.n_rows); - blas_int ldvt = blas_int(V.n_rows); - blas_int lwork_min = (std::max)( blas_int(1), (std::max)( (3*min_mn + (std::max)(m,n)), 5*min_mn ) ); - blas_int info = 0; + blas_int m = blas_int(A.n_rows); + blas_int n = blas_int(A.n_cols); + blas_int min_mn = (std::min)(m,n); + blas_int lda = blas_int(A.n_rows); + blas_int ldu = blas_int(U.n_rows); + blas_int ldvt = blas_int(V.n_rows); + blas_int lwork_min = (std::max)( blas_int(1), (std::max)( (3*min_mn + (std::max)(m,n)), 5*min_mn ) ); + blas_int info = 0; S.set_size( static_cast(min_mn) );