Address PR 120 comments.

ORNL · Dec 20, 2023 · fbeae5e · fbeae5e
1 parent a003d82
commit fbeae5e
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 26 deletions.
diff --git a/resolve/LinSolverDirectRocSolverRf.hpp b/resolve/LinSolverDirectRocSolverRf.hpp
@@ -40,7 +40,7 @@ namespace ReSolve
 
       int refactorize();
       int solve(vector_type* rhs, vector_type* x);
-      int solve(vector_type* rhs);// the solutuon is returned IN RHS (rhs is overwritten)
+      int solve(vector_type* rhs);// the solution is returned IN RHS (rhs is overwritten)
 
       int setSolveMode(int mode); // should probably be enum 
       int getSolveMode(); //should be enum too

diff --git a/resolve/LinSolverDirectRocSparseILU0.hpp b/resolve/LinSolverDirectRocSparseILU0.hpp
@@ -41,7 +41,7 @@ namespace ReSolve
       int reset(matrix::Sparse* A);
 
       int solve(vector_type* rhs, vector_type* x) override;
-      int solve(vector_type* rhs) override; // the solutuon is returned IN RHS (rhs is overwritten)
+      int solve(vector_type* rhs) override; // the solution is returned IN RHS (rhs is overwritten)
 
 
     private:

diff --git a/resolve/SystemSolver.cpp b/resolve/SystemSolver.cpp
@@ -341,7 +341,7 @@ namespace ReSolve
     Q_ = factorizationSolver_->getQOrdering();
 
     if (L_ == nullptr) {
-      out::warning() << "Factorization failed, cannot extract factors ...\n";
+      out::error() << "Factorization failed, cannot extract factors ...\n";
       status += 1;
     }
 

diff --git a/tests/functionality/testKLU.cpp b/tests/functionality/testKLU.cpp
@@ -202,9 +202,9 @@ int main(int argc, char *argv[])
     error_sum++;
   }
   if (error_sum == 0) {
-    std::cout<<"Test 1 (KLU with KLU refactorization) PASSED"<<std::endl;
+    std::cout<<"Test KLU with KLU refactorization PASSED"<<std::endl;
   } else {
-    std::cout<<"Test 1 (KLU with KLU refactorization) FAILED, error sum: "<<error_sum<<std::endl;
+    std::cout<<"Test KLU with KLU refactorization FAILED, error sum: "<<error_sum<<std::endl;
   }
 
   //now DELETE

diff --git a/tests/functionality/testKLU_GLU.cpp b/tests/functionality/testKLU_GLU.cpp
@@ -221,9 +221,9 @@ int main(int argc, char *argv[])
     error_sum++;
   }
   if (error_sum == 0) {
-    std::cout<<"Test 3 (KLU with cuSolverGLU refactorization) PASSED"<<std::endl;
+    std::cout<<"Test KLU with cuSolverGLU refactorization PASSED"<<std::endl;
   } else {
-    std::cout<<"Test 3 (KLU with cuSolverGLU refactorization) FAILED, error sum: "<<error_sum<<std::endl;
+    std::cout<<"Test KLU with cuSolverGLU refactorization FAILED, error sum: "<<error_sum<<std::endl;
   }
 
   //now DELETE

diff --git a/tests/functionality/testKLU_Rf.cpp b/tests/functionality/testKLU_Rf.cpp
@@ -219,9 +219,9 @@ int main(int argc, char *argv[])
     error_sum++;
   }
   if (error_sum == 0) {
-    std::cout<<"Test 2 (KLU with cuSolverRf refactorization) PASSED"<<std::endl;
+    std::cout<<"Test KLU with cuSolverRf refactorization PASSED"<<std::endl;
   } else {
-    std::cout<<"Test 2 (KLU with cuSolverRf refactorization) FAILED, error sum: "<<error_sum<<std::endl;
+    std::cout<<"Test KLU with cuSolverRf refactorization FAILED, error sum: "<<error_sum<<std::endl;
   }
 
   //now DELETE

diff --git a/tests/functionality/testKLU_Rf_FGMRES.cpp b/tests/functionality/testKLU_Rf_FGMRES.cpp
@@ -267,9 +267,9 @@ int main(int argc, char *argv[])
     error_sum++;
   }
   if (error_sum == 0) {
-    std::cout<<"Test 4 (KLU with cuSolverRf refactorization + IR) PASSED"<<std::endl;
+    std::cout<<"Test KLU with cuSolverRf refactorization + IR PASSED"<<std::endl;
   } else {
-    std::cout<<"Test 4 (KLU with cuSolverRf refactorization + IR) FAILED, error sum: "<<error_sum<<std::endl;
+    std::cout<<"Test KLU with cuSolverRf refactorization + IR FAILED, error sum: "<<error_sum<<std::endl;
   }
 
   delete A;

diff --git a/tests/functionality/testKLU_RocSolver.cpp b/tests/functionality/testKLU_RocSolver.cpp
@@ -228,10 +228,10 @@ int main(int argc, char *argv[])
     error_sum++;
   }
   if (error_sum == 0) {
-    std::cout<<"Test 3 (KLU with rocSolverRf refactorization) PASSED"<<std::endl;
+    std::cout<<"Test KLU with rocSolverRf refactorization PASSED"<<std::endl;
   } else {
 
-    std::cout<<"Test 3 (KLU with rocSolverRF refactorization) FAILED, error sum: "<<error_sum<<std::endl;
+    std::cout<<"Test KLU with rocSolverRF refactorization FAILED, error sum: "<<error_sum<<std::endl;
   }
 
   //now DELETE

diff --git a/tests/functionality/testKLU_RocSolver_FGMRES.cpp b/tests/functionality/testKLU_RocSolver_FGMRES.cpp
@@ -262,9 +262,9 @@ int main(int argc, char *argv[])
     error_sum++;
   }
   if (error_sum == 0) {
-    std::cout<<"Test 4 (KLU with rocsolverrf refactorization + IR) PASSED"<<std::endl<<std::endl;;
+    std::cout<<"Test KLU with rocsolverrf refactorization + IR PASSED"<<std::endl<<std::endl;;
   } else {
-    std::cout<<"Test 4 (KLU with rocsolverrf refactorization + IR) FAILED, error sum: "<<error_sum<<std::endl<<std::endl;;
+    std::cout<<"Test KLU with rocsolverrf refactorization + IR FAILED, error sum: "<<error_sum<<std::endl<<std::endl;;
   }
 
   delete A;

diff --git a/tests/functionality/testRandGMRES_Cuda.cpp b/tests/functionality/testRandGMRES_Cuda.cpp
@@ -137,9 +137,9 @@ int main(int argc, char *argv[])
     error_sum++;
   }
   if (error_sum == 0) {
-    std::cout<<"Test 5 (randomized GMRES) PASSED"<<std::endl<<std::endl;;
+    std::cout<<"Test randomized GMRES PASSED"<<std::endl<<std::endl;;
   } else {
-    std::cout<<"Test 5 (randomized GMRES) FAILED, error sum: "<<error_sum<<std::endl<<std::endl;;
+    std::cout<<"Test randomized GMRES FAILED, error sum: "<<error_sum<<std::endl<<std::endl;;
   }
   delete A;
   delete Rf;

diff --git a/tests/functionality/testRandGMRES_Rocm.cpp b/tests/functionality/testRandGMRES_Rocm.cpp
@@ -137,9 +137,9 @@ int main(int argc, char *argv[])
     error_sum++;
   }
   if (error_sum == 0) {
-    std::cout<<"Test 5 (randomized GMRES) PASSED"<<std::endl<<std::endl;;
+    std::cout<<"Test randomized GMRES PASSED"<<std::endl<<std::endl;;
   } else {
-    std::cout<<"Test 5 (randomized GMRES) FAILED, error sum: "<<error_sum<<std::endl<<std::endl;;
+    std::cout<<"Test randomized GMRES FAILED, error sum: "<<error_sum<<std::endl<<std::endl;;
   }
   delete A;
   delete Rf;

diff --git a/tests/functionality/testSysGLU.cpp b/tests/functionality/testSysGLU.cpp
@@ -289,9 +289,9 @@ int main(int argc, char *argv[])
     error_sum++;
   }
   if (error_sum == 0) {
-    std::cout<<"Test 3 (KLU with cuSolverGLU refactorization) PASSED"<<std::endl;
+    std::cout<<"Test KLU with cuSolverGLU refactorization PASSED"<<std::endl;
   } else {
-    std::cout<<"Test 3 (KLU with cuSolverGLU refactorization) FAILED, error sum: "<<error_sum<<std::endl;
+    std::cout<<"Test KLU with cuSolverGLU refactorization FAILED, error sum: "<<error_sum<<std::endl;
   }
 
   //now DELETE

diff --git a/tests/functionality/testSysRandGMRES.cpp b/tests/functionality/testSysRandGMRES.cpp
@@ -168,9 +168,9 @@ int main(int argc, char *argv[])
     error_sum++;
   }
   if (error_sum == 0) {
-    std::cout<<"Test 5 (randomized GMRES) PASSED"<<std::endl<<std::endl;;
+    std::cout<<"Test randomized GMRES PASSED"<<std::endl<<std::endl;;
   } else {
-    std::cout<<"Test 5 (randomized GMRES) FAILED, error sum: "<<error_sum<<std::endl<<std::endl;;
+    std::cout<<"Test randomized GMRES FAILED, error sum: "<<error_sum<<std::endl<<std::endl;;
   }
 
   delete A;

diff --git a/tests/functionality/testSysRefactor.cpp b/tests/functionality/testSysRefactor.cpp
@@ -322,9 +322,9 @@ int main(int argc, char *argv[])
     error_sum++;
   }
   if (error_sum == 0) {
-    std::cout<<"Test 4 (KLU with rocsolverrf refactorization + IR) PASSED"<<std::endl<<std::endl;;
+    std::cout<<"Test KLU with rocsolverrf refactorization + IR PASSED"<<std::endl<<std::endl;;
   } else {
-    std::cout<<"Test 4 (KLU with rocsolverrf refactorization + IR) FAILED, error sum: "<<error_sum<<std::endl<<std::endl;;
+    std::cout<<"Test KLU with rocsolverrf refactorization + IR FAILED, error sum: "<<error_sum<<std::endl<<std::endl;;
   }
 
   delete A;

diff --git a/tests/functionality/testVersion.cpp b/tests/functionality/testVersion.cpp
@@ -24,9 +24,10 @@ int main()
   std::cout << "ReSolveVersionGetVersionStr Test: " << versionstr << std::endl << std::endl;
 
   if (versionstr != answer) {
-    std::cout << "ReSolve version set incorrectly!\n";
+    std::cout << "ReSolve version set incorrectly. Test FAILED\n";
     return 1;
   }
+  std::cout << "ReSolve version test PASSED\n";
 
   return 0;
 }