#210: Belos: replace hb reader tpetra #214

tlamonthezie · 2023-09-25T12:30:26Z

Fixes #210

IMPORTANT : Prerequities before requesting PR to trilinos/trilinos:develop

Because this PR is modifying previous PR's - and some are still i review on trilinos/trilinos:develop:

All Tpetra tests & examples developed for Belos must be first merged into trilinos/trilinos:develop
Then NexGenAnalytics/trilinos must be synced

github-actions · 2023-09-25T22:28:19Z

⚡ Code quality check ⚡

🔴 clang-tidy found 37 issues! Click here to see details.

Trilinos/packages/belos/tpetra/example/BlockCG/BlockCGTpetraExFile.cpp

Lines 117 to 122 in 6b8ca47

 cmdp.setOption("filename",&filename,"Filename for Harwell-Boeing test matrix."); 

 cmdp.setOption("tol",&tol,"Relative residual tolerance used by CG solver."); 

 cmdp.setOption("num-rhs",&numrhs,"Number of right-hand sides to be solved for."); 

 cmdp.setOption("block-size",&blockSize,"Block size used by CG."); 

 cmdp.setOption("max-iters",&maxIters,"Maximum number of iterations per linear system (-1 = adapted to problem/block size)."); 

 if (cmdp.parse(argc,argv) != Teuchos::CommandLineProcessor::PARSE_SUCCESSFUL) {

!Line: 117 - warning: calling a function that uses a default argument is disallowed [fuchsia-default-arguments-calls]

Trilinos/packages/belos/tpetra/example/BlockCG/PseudoBlockCGTpetraExFile.cpp

Lines 117 to 122 in 6b8ca47

 cmdp.setOption("filename",&filename,"Filename for Harwell-Boeing test matrix."); 

 cmdp.setOption("tol",&tol,"Relative residual tolerance used by CG solver."); 

 cmdp.setOption("num-rhs",&numrhs,"Number of right-hand sides to be solved for."); 

 cmdp.setOption("block-size",&blockSize,"Block size used by CG."); 

 cmdp.setOption("max-iters",&maxIters,"Maximum number of iterations per linear system (-1 = adapted to problem/block size)."); 

 if (cmdp.parse(argc,argv) != Teuchos::CommandLineProcessor::PARSE_SUCCESSFUL) {

!Line: 117 - warning: calling a function that uses a default argument is disallowed [fuchsia-default-arguments-calls]

Trilinos/packages/belos/tpetra/example/BlockCG/PseudoBlockCGTpetraExFile.cpp

Lines 133 to 138 in 6b8ca47

 RCP<const tmap_t> map = A->getDomainMap(); 

 // Create initial vectors 

 RCP<MV> B, X; 

 X = rcp( new MV(map,numrhs) );

!Line: 133 - warning: variable 'map' is not initialized [cppcoreguidelines-init-variables]
!Line: 282 - note: +1
!Line: 155 - note: +1, including nesting penalty of 0, nesting level increased to 1
!Line: 159 - note: +1, including nesting penalty of 0, nesting level increased to 1
!Line: 167 - note: +1, nesting level increased to 1
!Line: 216 - note: +3, including nesting penalty of 2, nesting level increased to 3

Trilinos/packages/belos/tpetra/test/TFQMR/test_tfqmr_hb.cpp

Lines 124 to 129 in 6b8ca47

 cmdp.setOption("max-iters", &maxiters, 

 "Maximum number of iterations per linear system (-1 := adapted to problem/block size)."); 

 if (cmdp.parse(argc, argv) != Teuchos::CommandLineProcessor::PARSE_SUCCESSFUL) { 

 return -1; 

 } 

 if (!verbose)

!Line: 124 - warning: calling a function that uses a default argument is disallowed [fuchsia-default-arguments-calls]

Trilinos/packages/belos/tpetra/test/TFQMR/test_tfqmr_hb.cpp

Lines 133 to 138 in 6b8ca47

 RCP<tcrsmatrix_t> A; 

 Tpetra::Utils::readHBMatrix(filename, comm, A); 

 RCP<const Tpetra::Map<>> map = A->getDomainMap(); 

 // Create initial vectors 

 RCP<MV> B, X;

!Line: 133 - warning: variable 'A' is not initialized [cppcoreguidelines-init-variables]

Trilinos/packages/belos/tpetra/test/TFQMR/test_tfqmr_hb.cpp

Lines 133 to 138 in 6b8ca47

 RCP<tcrsmatrix_t> A; 

 Tpetra::Utils::readHBMatrix(filename, comm, A); 

 RCP<const Tpetra::Map<>> map = A->getDomainMap(); 

 // Create initial vectors 

 RCP<MV> B, X;

!Line: 133 - warning: variable name 'A' is too short, expected at least 3 characters [readability-identifier-length]

Trilinos/packages/belos/tpetra/test/TFQMR/test_tfqmr_hb.cpp

Lines 167 to 172 in 6b8ca47

 } else 

 belosList.set("Verbosity", Belos::Errors + Belos::Warnings); 

 // Construct an unpreconditioned linear problem instance. 

 Belos::LinearProblem<ST, MV, OP> problem(A, X, B); 

 bool set = problem.setProblem();

!Line: 167 - warning: statement should be inside braces [google-readability-braces-around-statements,hicpp-braces-around-statements,readability-braces-around-statements]

Trilinos/packages/belos/tpetra/test/TFQMR/test_tfqmr_hb.cpp

Lines 216 to 221 in 6b8ca47

 if (actRes > tol) 

 badRes = true; 

 } 

 } 

 success = ret == Belos::Converged && !badRes;

!Line: 216 - warning: statement should be inside braces [google-readability-braces-around-statements,hicpp-braces-around-statements,readability-braces-around-statements]

Trilinos/packages/belos/tpetra/example/BlockGmres/BlockGmresTpetraExFile.cpp

Lines 122 to 127 in 6b8ca47

 cmdp.setOption("filename",&filename,"Filename for Harwell-Boeing test matrix."); 

 cmdp.setOption("tol",&tol,"Relative residual tolerance used by GMRES solver."); 

 cmdp.setOption("num-rhs",&numrhs,"Number of right-hand sides to be solved for."); 

 cmdp.setOption("block-size",&blockSize,"Block size used by GMRES."); 

 cmdp.setOption("max-iters",&maxIters,"Maximum number of iterations per linear system (-1 = adapted to problem/block size)."); 

 cmdp.setOption("max-subspace",&maxsubspace,"Maximum number of blocks the solver can use for the subspace.");

!Line: 122 - warning: calling a function that uses a default argument is disallowed [fuchsia-default-arguments-calls]

Trilinos/packages/belos/tpetra/example/BlockGmres/BlockGmresTpetraExFile.cpp

Lines 143 to 148 in 6b8ca47

 RCP<tcrsmatrix_t> A; 

 Tpetra::Utils::readHBMatrix(filename, comm, A); 

 RCP<const tmap_t> map = A->getDomainMap(); 

 // Create initial vectors 

 RCP<MV> B, X;

!Line: 143 - warning: variable 'A' is not initialized [cppcoreguidelines-init-variables]

Trilinos/packages/belos/tpetra/example/BlockGmres/BlockGmresTpetraExFile.cpp

Lines 143 to 148 in 6b8ca47

 RCP<tcrsmatrix_t> A; 

 Tpetra::Utils::readHBMatrix(filename, comm, A); 

 RCP<const tmap_t> map = A->getDomainMap(); 

 // Create initial vectors 

 RCP<MV> B, X;

!Line: 143 - warning: variable name 'A' is too short, expected at least 3 characters [readability-identifier-length]

Trilinos/packages/belos/tpetra/example/BlockGmres/BlockGmresTpetraExFile.cpp

Lines 145 to 150 in 6b8ca47

 RCP<const tmap_t> map = A->getDomainMap(); 

 // Create initial vectors 

 RCP<MV> B, X; 

 X = rcp( new MV(map,numrhs) ); 

 MVT::MvRandom( *X );

!Line: 145 - warning: variable 'map' is not initialized [cppcoreguidelines-init-variables]

Trilinos/packages/belos/tpetra/example/BlockGmres/BlockGmresTpetraExFile.cpp

Lines 222 to 227 in 6b8ca47

 MV resid(map, numrhs); 

 OPT::Apply( *A, *X, resid ); 

 MVT::MvAddMv( -1.0, resid, 1.0, *B, resid ); 

 MVT::MvNorm( resid, actualResids ); 

 MVT::MvNorm( *B, rhsNorm ); 

 if (procVerbose) {

!Line: 222 - warning: variable 'resid' is not initialized [cppcoreguidelines-init-variables]

Trilinos/packages/belos/tpetra/test/GCRODR/test_gcrodr_hb.cpp

Lines 131 to 136 in 6b8ca47

 RCP<tcrsmatrix_t> A; 

 Tpetra::Utils::readHBMatrix(filename, comm, A); 

 RCP<const Tpetra::Map<>> map = A->getDomainMap(); 

 // Create initial vectors 

 RCP<MV> B, X;

!Line: 131 - warning: variable 'A' is not initialized [cppcoreguidelines-init-variables]

Trilinos/packages/belos/tpetra/test/GCRODR/test_gcrodr_hb.cpp

Lines 131 to 136 in 6b8ca47

 RCP<tcrsmatrix_t> A; 

 Tpetra::Utils::readHBMatrix(filename, comm, A); 

 RCP<const Tpetra::Map<>> map = A->getDomainMap(); 

 // Create initial vectors 

 RCP<MV> B, X;

!Line: 131 - warning: variable name 'A' is too short, expected at least 3 characters [readability-identifier-length]

Trilinos/packages/belos/tpetra/test/BiCGStab/test_bicgstab_hb.cpp

Lines 123 to 128 in 6b8ca47

 RCP<Tpetra::CrsMatrix<ST>> A; 

 Tpetra::Utils::readHBMatrix(filename, comm, A); 

 RCP<const Tpetra::Map<>> map = A->getDomainMap(); 

 // Create initial vectors 

 RCP<MV> B, X;

!Line: 123 - warning: variable 'A' is not initialized [cppcoreguidelines-init-variables]

Trilinos/packages/belos/tpetra/test/BiCGStab/test_bicgstab_hb.cpp

Lines 123 to 128 in 6b8ca47

 RCP<Tpetra::CrsMatrix<ST>> A; 

 Tpetra::Utils::readHBMatrix(filename, comm, A); 

 RCP<const Tpetra::Map<>> map = A->getDomainMap(); 

 // Create initial vectors 

 RCP<MV> B, X;

!Line: 123 - warning: variable name 'A' is too short, expected at least 3 characters [readability-identifier-length]

Trilinos/packages/belos/tpetra/example/GCRODR/GCRODRTpetraExFile.cpp

Lines 121 to 126 in 6b8ca47

 cmdp.setOption("filename",&filename,"Filename for Harwell-Boeing test matrix."); 

 cmdp.setOption("tol",&tol,"Relative residual tolerance used by GMRES solver."); 

 cmdp.setOption("num-rhs",&numrhs,"Number of right-hand sides to be solved for."); 

 cmdp.setOption("max-iters",&maxiters,"Maximum number of iterations per linear system (-1 = adapted to problem/block size)."); 

 cmdp.setOption("max-subspace",&maxsubspace,"Maximum number of vectors in search space (including recycle space)."); 

 cmdp.setOption("recycle",&recycle,"Number of vectors in recycle space.");

!Line: 121 - warning: calling a function that uses a default argument is disallowed [fuchsia-default-arguments-calls]

Trilinos/packages/belos/tpetra/example/GCRODR/GCRODRTpetraExFile.cpp

Lines 142 to 147 in 6b8ca47

 RCP<tcrsmatrix_t> A; 

 Tpetra::Utils::readHBMatrix(filename, Comm, A); 

 RCP<const tmap_t> map = A->getDomainMap(); 

 // Create initial vectors 

 RCP<MV> B, X;

!Line: 142 - warning: variable 'A' is not initialized [cppcoreguidelines-init-variables]

Trilinos/packages/belos/tpetra/example/GCRODR/GCRODRTpetraExFile.cpp

Lines 142 to 147 in 6b8ca47

 RCP<tcrsmatrix_t> A; 

 Tpetra::Utils::readHBMatrix(filename, Comm, A); 

 RCP<const tmap_t> map = A->getDomainMap(); 

 // Create initial vectors 

 RCP<MV> B, X;

!Line: 142 - warning: variable name 'A' is too short, expected at least 3 characters [readability-identifier-length]

Trilinos/packages/belos/tpetra/example/GCRODR/GCRODRTpetraExFile.cpp

Lines 144 to 149 in 6b8ca47

 RCP<const tmap_t> map = A->getDomainMap(); 

 // Create initial vectors 

 RCP<MV> B, X; 

 X = rcp( new MV(map,numrhs) ); 

 MVT::MvRandom( *X );

!Line: 144 - warning: variable 'map' is not initialized [cppcoreguidelines-init-variables]

Trilinos/packages/belos/tpetra/example/BlockGmres/PseudoBlockGmresTpetraExFile.cpp

Lines 119 to 124 in 6b8ca47

 cmdp.setOption("filename",&filename,"Filename for Harwell-Boeing test matrix."); 

 cmdp.setOption("tol",&tol,"Relative residual tolerance used by GMRES solver."); 

 cmdp.setOption("num-rhs",&numrhs,"Number of right-hand sides to be solved for."); 

 cmdp.setOption("block-size",&blockSize,"Block size used by GMRES."); 

 cmdp.setOption("max-iters",&maxIters,"Maximum number of iterations per linear system (-1 = adapted to problem/block size)."); 

 cmdp.setOption("max-subspace",&maxSubspace,"Maximum number of blocks the solver can use for the subspace.");

!Line: 119 - warning: calling a function that uses a default argument is disallowed [fuchsia-default-arguments-calls]

Trilinos/packages/belos/tpetra/example/BlockGmres/PseudoBlockGmresTpetraExFile.cpp

Lines 139 to 144 in 6b8ca47

 RCP<tcrsmatrix_t> A; 

 Tpetra::Utils::readHBMatrix(filename, comm, A); 

 RCP<const tmap_t> map = A->getDomainMap(); 

 // Create initial vectors 

 RCP<MV> B, X;

!Line: 139 - warning: variable 'A' is not initialized [cppcoreguidelines-init-variables]

Trilinos/packages/belos/tpetra/example/BlockGmres/PseudoBlockGmresTpetraExFile.cpp

Lines 139 to 144 in 6b8ca47

 RCP<tcrsmatrix_t> A; 

 Tpetra::Utils::readHBMatrix(filename, comm, A); 

 RCP<const tmap_t> map = A->getDomainMap(); 

 // Create initial vectors 

 RCP<MV> B, X;

!Line: 139 - warning: variable name 'A' is too short, expected at least 3 characters [readability-identifier-length]

Trilinos/packages/belos/tpetra/example/BlockGmres/PseudoBlockGmresTpetraExFile.cpp

Lines 141 to 146 in 6b8ca47

 RCP<const tmap_t> map = A->getDomainMap(); 

 // Create initial vectors 

 RCP<MV> B, X; 

 X = rcp( new MV(map,numrhs) ); 

 MVT::MvRandom( *X );

!Line: 141 - warning: variable 'map' is not initialized [cppcoreguidelines-init-variables]

Trilinos/packages/belos/tpetra/example/BlockGmres/PseudoBlockGmresTpetraExFile.cpp

Lines 210 to 215 in 6b8ca47

 MV resid(map, numrhs); 

 OPT::Apply( *A, *X, resid ); 

 MVT::MvAddMv( -1.0, resid, 1.0, *B, resid ); 

 MVT::MvNorm( resid, actualResids ); 

 MVT::MvNorm( *B, rhsNorm ); 

 if (procVerbose) {

!Line: 210 - warning: variable 'resid' is not initialized [cppcoreguidelines-init-variables]

Trilinos/packages/belos/tpetra/test/OrthoManager/belos_orthomanager_tpetra.cpp

Lines 90 to 95 in 6b8ca47

 static void getCmdLineArgs(const Teuchos::Comm<int>& comm, int argc, char* argv[]) { 

 using Teuchos::CommandLineProcessor; 

 typedef Tpetra::MultiVector<>::scalar_type ST; 

 // Define a OrthoManagerFactory to use to get the names of valid 

 // orthogonalization manager types. We won't use this factory to

!Line: 90 - warning: function 'getCmdLineArgs' declared 'static', move to anonymous namespace instead [misc-use-anonymous-namespace]

Trilinos/packages/belos/tpetra/test/OrthoManager/belos_orthomanager_tpetra.cpp

Lines 90 to 95 in 6b8ca47

 static void getCmdLineArgs(const Teuchos::Comm<int>& comm, int argc, char* argv[]) { 

 using Teuchos::CommandLineProcessor; 

 typedef Tpetra::MultiVector<>::scalar_type ST; 

 // Define a OrthoManagerFactory to use to get the names of valid 

 // orthogonalization manager types. We won't use this factory to

!Line: 90 - warning: do not declare C-style arrays, use std::array<> instead [cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays]

Trilinos/packages/belos/tpetra/test/OrthoManager/belos_orthomanager_tpetra.cpp

Lines 167 to 172 in 6b8ca47

 cmdp.setOption("sizeS", &sizeS, 

 "Controls the number of columns of the " 

 "input multivector."); 

 cmdp.setOption("sizeX1", &sizeX1, 

 "Controls the number of columns of the " 

 "first basis.");

!Line: 167 - warning: calling a function that uses a default argument is disallowed [fuchsia-default-arguments-calls]

Trilinos/packages/belos/tpetra/test/OrthoManager/belos_orthomanager_tpetra.cpp

Lines 170 to 175 in 6b8ca47

 cmdp.setOption("sizeX1", &sizeX1, 

 "Controls the number of columns of the " 

 "first basis."); 

 cmdp.setOption("sizeX2", &sizeX2, 

 "Controls the number of columns of the " 

 "second basis. We require for simplicity of testing (the "

!Line: 170 - warning: calling a function that uses a default argument is disallowed [fuchsia-default-arguments-calls]

Trilinos/packages/belos/tpetra/test/OrthoManager/belos_orthomanager_tpetra.cpp

Lines 173 to 178 in 6b8ca47

 cmdp.setOption("sizeX2", &sizeX2, 

 "Controls the number of columns of the " 

 "second basis. We require for simplicity of testing (the " 

 "routines do not require it) that sizeX1 >= sizeX2."); 

 // Parse the command-line arguments. 

 {

!Line: 173 - warning: calling a function that uses a default argument is disallowed [fuchsia-default-arguments-calls]

Trilinos/packages/belos/tpetra/test/OrthoManager/belos_orthomanager_tpetra.cpp

Lines 179 to 184 in 6b8ca47

 const CommandLineProcessor::EParseCommandLineReturn parseResult = cmdp.parse(argc, argv); 

 // If the caller asks us to print the documentation, or does not 

 // provide the name of an OrthoManager subclass, we just keep 

 // going. Otherwise, we throw an exception. 

 TEUCHOS_TEST_FOR_EXCEPTION(parseResult != CommandLineProcessor::PARSE_SUCCESSFUL, std::invalid_argument, 

 "Failed to parse command-line arguments");

!Line: 179 - warning: calling a function that uses a default argument is disallowed [fuchsia-default-arguments-calls]

Trilinos/packages/belos/tpetra/test/OrthoManager/belos_orthomanager_tpetra.cpp

Lines 208 to 213 in 6b8ca47

 static void load(Teuchos::RCP<map_type>& map, Teuchos::RCP<matrix_type>& M, 

 const Teuchos::RCP<const Teuchos::Comm<int> >& comm, std::ostream& debugOut) { 

 TEUCHOS_TEST_FOR_EXCEPTION(filename != "", std::logic_error, 

 "Sorry, reading in a Harwell-Boeing " 

 "sparse matrix file for ScalarType=" 

 << Teuchos::TypeNameTraits<ScalarType>::name()

!Line: 208 - warning: parameter name 'M' is too short, expected at least 3 characters [readability-identifier-length]

Trilinos/packages/belos/tpetra/test/OrthoManager/belos_orthomanager_tpetra.cpp

Lines 209 to 214 in 6b8ca47

 const Teuchos::RCP<const Teuchos::Comm<int> >& comm, std::ostream& debugOut) { 

 TEUCHOS_TEST_FOR_EXCEPTION(filename != "", std::logic_error, 

 "Sorry, reading in a Harwell-Boeing " 

 "sparse matrix file for ScalarType=" 

 << Teuchos::TypeNameTraits<ScalarType>::name() 

 << " is not yet "

!Line: 209 - warning: parameter 'debugOut' is unused [misc-unused-parameters]

Trilinos/packages/belos/tpetra/test/OrthoManager/belos_orthomanager_tpetra.cpp

Lines 229 to 234 in 6b8ca47

 static void load(Teuchos::RCP<map_type>& map, Teuchos::RCP<matrix_type>& M, 

 const Teuchos::RCP<const Teuchos::Comm<int> >& comm, std::ostream& debugOut) { 

 // If the sparse matrix is loaded successfully, this call will 

 // modify numRows to be the number of rows in the sparse matrix. 

 // Otherwise, it will leave numRows alone. 

 std::pair<Teuchos::RCP<map_type>, Teuchos::RCP<matrix_type> > results =

!Line: 229 - warning: parameter name 'M' is too short, expected at least 3 characters [readability-identifier-length]

Trilinos/packages/belos/tpetra/example/LSQR/LSQRTpetraExFile.cpp

Lines 154 to 159 in 6b8ca47

 RCP<MAT> A; 

 Tpetra::Utils::readHBMatrix(filename, comm, A); 

 RCP<const MAP> map = A->getDomainMap(); 

 // Initialize vectors 

 RCP<MV> vecB = rcp(new MV(map, numRHS));

!Line: 154 - warning: variable 'A' is not initialized [cppcoreguidelines-init-variables]

Trilinos/packages/belos/tpetra/example/LSQR/LSQRTpetraExFile.cpp

Lines 154 to 159 in 6b8ca47

 RCP<MAT> A; 

 Tpetra::Utils::readHBMatrix(filename, comm, A); 

 RCP<const MAP> map = A->getDomainMap(); 

 // Initialize vectors 

 RCP<MV> vecB = rcp(new MV(map, numRHS));

!Line: 154 - warning: variable name 'A' is too short, expected at least 3 characters [readability-identifier-length]

tlamonthezie added 6 commits September 25, 2023 14:28

#210: remove usage of Belos Harwell-Being reader

04f2b33

#210: fix remaining usage of old Belos HB reader

bc7c2c3

#210: fix bad variable name

a02a87a

#210: fix some build error and clean some code

364368c

#210: remove unused data files

65e8918

#210: try fix orthomanager

2e9b37f

tlamonthezie self-assigned this Sep 25, 2023

cwschilly mentioned this pull request Sep 25, 2023

List of PRs to Trilinos/develop and fork development #77

Open

tlamonthezie added 3 commits September 25, 2023 17:36

#210: try fix compile problem

6b06866

#210: try another fix

b211bd0

#210: try fix type

b196013

tlamonthezie added 7 commits September 26, 2023 10:32

#210: fix bad variable name

d73f2eb

#210: add missing includes and update orthomanager method signatures

cf96b9e

#210: formatting and consistency across examples

9d82978

#210: restore variable names

dd85f8a

#210: restore Map variable name

b3529ef

#210: restore space

a647b1a

#210: add missing include

581077a

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#210: Belos: replace hb reader tpetra #214

#210: Belos: replace hb reader tpetra #214

tlamonthezie commented Sep 25, 2023 •

edited

Loading

github-actions bot commented Sep 25, 2023 •

edited

Loading

#210: Belos: replace hb reader tpetra #214

Are you sure you want to change the base?

#210: Belos: replace hb reader tpetra #214

Conversation

tlamonthezie commented Sep 25, 2023 • edited Loading

IMPORTANT : Prerequities before requesting PR to trilinos/trilinos:develop

github-actions bot commented Sep 25, 2023 • edited Loading

⚡ Code quality check ⚡

tlamonthezie commented Sep 25, 2023 •

edited

Loading

github-actions bot commented Sep 25, 2023 •

edited

Loading