Adding asymmetric tests (from the data folder) for KLU, CuSolver, and RocSolver.

examples/CMakeLists.txt

@@ -80,16 +80,22 @@ install(PROGRAMS test.sh DESTINATION ${CONSUMER_PATH})
 # Select consumer app
 if(RESOLVE_USE_KLU)
   if(RESOLVE_USE_CUDA)
-    set(RESOLVE_CONSUMER_APP "testRefactor.cpp")
+    set(RESOLVE_CONSUMER_APP "testSysRefactor.cpp")
   elseif(RESOLVE_USE_HIP)
-    set(RESOLVE_CONSUMER_APP "testRefactor.cpp")
+    set(RESOLVE_CONSUMER_APP "testSysRefactor.cpp")
   else()
     set(RESOLVE_CONSUMER_APP "testKlu.cpp")
   endif()
 else(RESOLVE_USE_KLU)
   set(RESOLVE_CONSUMER_APP "testSysGmres.cpp")
 endif(RESOLVE_USE_KLU)
 
+set(test_data_dir ${CMAKE_SOURCE_DIR}/tests/functionality)
+set(sym_matrix_path /data/matrix_ACTIVSg200_AC_renumbered_add9_)
+set(sym_rhs_path /data/rhs_ACTIVSg200_AC_renumbered_add9_ones_)
+set(asym_matrix_path /data/A_asymmetric)
+set(asym_rhs_path /data/b_asymmetric)
+
 # Install directory with example on how to consume ReSolve
 install(DIRECTORY resolve_consumer DESTINATION share/examples)
 install(FILES ${PROJECT_SOURCE_DIR}/tests/functionality/${RESOLVE_CONSUMER_APP} DESTINATION share/examples/resolve_consumer RENAME consumer.cpp)
@@ -98,4 +104,4 @@ install(FILES ${PROJECT_SOURCE_DIR}/tests/functionality/TestHelper.hpp DESTINATI
 # Shell script argumets:
 #    1. Path to where resolve is installed.
 #    2. Path to data directory
-add_custom_target(test_install COMMAND ${CONSUMER_PATH}/test.sh  ${CMAKE_INSTALL_PREFIX} ${PROJECT_SOURCE_DIR}/tests/functionality/)
+add_custom_target(test_install COMMAND ${CONSUMER_PATH}/test.sh  ${CMAKE_INSTALL_PREFIX} ${test_data_dir} ${sym_matrix_path} ${sym_rhs_path}) 

examples/resolve_consumer/CMakeLists.txt

@@ -17,5 +17,5 @@ target_link_libraries(consume.exe PRIVATE ReSolve::ReSolve)
 # Testing of exported Resolve Configurations
 enable_testing()
 
-# RESOLVE_DATA is set in test.sh and is the file path the matrix data files used in the testKLU_Rf_FGMRES
-add_test(NAME resolve_consumer COMMAND $<TARGET_FILE:consume.exe> "-d" "${RESOLVE_DATA}" "-i")
+# RESOLVE_DATA is set in test.sh and is the file path the matrix data files used in the testKLU_Rf_FGMRES.
+add_test(NAME resolve_consumer COMMAND $<TARGET_FILE:consume.exe> "-d" "${ReSolve_DATA_DIR}" "-i" "-m" "${ReSolve_MATRICES}" "-r" "${ReSolve_RHS}")

examples/test.sh

@@ -10,6 +10,14 @@ echo ${ReSolve_DIR}
 export DATA_DIR=${2}
 echo ${DATA_DIR}
 
+# Defines the input matrices
+export MATRICES=${3}
+echo ${MATRICES}
+
+# Defines the input right hand sides
+export RHS=${4}
+echo ${RHS}
+
 # Locate source of the consumer test app
 export INSTALL_BUILD_CONSUME=${ReSolve_DIR}/share/examples/resolve_consumer
 echo ${INSTALL_BUILD_CONSUME}
@@ -18,7 +26,8 @@ mkdir -p ${INSTALL_BUILD_CONSUME}/build
 
 rm -rf ${INSTALL_BUILD_CONSUME}/build/* &&
 
-cmake -B ${INSTALL_BUILD_CONSUME}/build -S ${INSTALL_BUILD_CONSUME} -DRESOLVE_DATA=${DATA_DIR} -DReSolve_DIR=${ReSolve_DIR} &&
+cmake -B ${INSTALL_BUILD_CONSUME}/build -S ${INSTALL_BUILD_CONSUME} -DReSolve_DATA_DIR=${DATA_DIR} \
+  -DReSolve_MATRICES=${MATRICES} -DReSolve_RHS=${RHS} -DReSolve_DIR=${ReSolve_DIR} &&
 
 cmake --build ${INSTALL_BUILD_CONSUME}/build -- -j 12 &&
 

resolve/LinSolverIterativeFGMRES.cpp

@@ -141,7 +141,6 @@ namespace ReSolve
     initial_residual_norm_ = rnorm;
     while (outer_flag)
     {
-      // check if maybe residual is already small enough?
       if (it == 0)
       {
         tolrel = tol_ * rnorm;

resolve/LinSolverIterativeFGMRES.hpp

@@ -83,7 +83,7 @@ namespace ReSolve
     };
 
     index_type restart_{10};    ///< GMRES restart
-    index_type conv_cond_{0};   ///< GMRES convergence condition
+    index_type conv_cond_{2};   ///< GMRES convergence condition
     bool       flexible_{true}; ///< If using flexible GMRES (FGMRES) algorithm
 
   private:

resolve/LinSolverIterativeRandFGMRES.cpp

@@ -31,7 +31,7 @@ namespace ReSolve
     tol_       = 1e-14; // default
     maxit_     = 100;   // default
     restart_   = 10;
-    conv_cond_ = 0; // default
+    conv_cond_ = 2; // default
     flexible_  = true;
 
     matrix_handler_   = matrix_handler;
@@ -180,10 +180,10 @@ namespace ReSolve
     io::Logger::misc() << "it 0: norm of residual "
                        << std::scientific << std::setprecision(16)
                        << rnorm << " Norm of rhs: " << bnorm << "\n";
+
     initial_residual_norm_ = rnorm;
     while (outer_flag)
     {
-      // check if maybe residual is already small enough?
       if (it == 0)
       {
         tolrel = tol_ * rnorm;

resolve/LinSolverIterativeRandFGMRES.hpp

@@ -98,7 +98,7 @@ namespace ReSolve
     };
 
     index_type restart_{10};    ///< GMRES restart
-    index_type conv_cond_{0};   ///< GMRES convergence condition
+    index_type conv_cond_{2};   ///< GMRES convergence condition
     bool       flexible_{true}; ///< If using flexible GMRES (FGMRES) algorithm
 
   private:

resolve/SystemSolver.cpp

@@ -13,7 +13,6 @@
 #ifdef RESOLVE_USE_KLU
 #include <resolve/LinSolverDirectKLU.hpp>
 #endif
-
 #include <resolve/LinSolverIterativeRandFGMRES.hpp>
 
 #ifdef RESOLVE_USE_CUDA
@@ -563,7 +562,6 @@ namespace ReSolve
   {
     int status = 0;
 
-    status += iterativeSolver_->resetMatrix(A_);
     status += iterativeSolver_->solve(rhs, x);
 
     return status;

resolve/lusol/README.md

@@ -0,0 +1,2 @@
+# LUSOL disclaimer
+LUSOL code is experimental and not actively maintained or supported.

tests/functionality/CMakeLists.txt

@@ -36,9 +36,6 @@ if(RESOLVE_USE_KLU)
     add_executable(sys_glu_test.exe testSysGLU.cpp)
     target_link_libraries(sys_glu_test.exe PRIVATE ReSolve)
 
-    add_executable(sys_glu_asym_test.exe testSysGLUAsym.cpp)
-    target_link_libraries(sys_glu_asym_test.exe PRIVATE ReSolve)
-
   endif(RESOLVE_USE_CUDA)
 endif(RESOLVE_USE_KLU)
 
@@ -62,7 +59,6 @@ if(RESOLVE_USE_KLU)
 
   if(RESOLVE_USE_CUDA)
     list(APPEND installable_tests sys_glu_test.exe)
-    list(APPEND installable_tests sys_glu_asym_test.exe)
   endif(RESOLVE_USE_CUDA)
 endif()
 
@@ -76,7 +72,13 @@ install(TARGETS ${installable_tests}
 # Install directory with data files
 install(DIRECTORY data DESTINATION bin/resolve/tests/functionality)
 
-set(test_data_dir ${CMAKE_SOURCE_DIR}/tests/functionality/)
+# Set the matrices for the tests.
+set(test_data_dir ${CMAKE_SOURCE_DIR}/tests/functionality)
+set(sym_matrix_path /data/matrix_ACTIVSg200_AC_renumbered_add9_)
+set(sym_rhs_path /data/rhs_ACTIVSg200_AC_renumbered_add9_ones_)
+set(asym_matrix_path /data/A_asymmetric)
+set(asym_rhs_path /data/b_asymmetric)
+
 
 add_test(NAME version COMMAND $<TARGET_FILE:version.exe>)
 
@@ -117,17 +119,20 @@ add_test(NAME rand_gmres_test    COMMAND $<TARGET_FILE:rand_gmres_test.exe>)
 
 if(RESOLVE_USE_KLU)
   # Using KLU as refactorization solver
-  add_test(NAME klu_klu_test    COMMAND $<TARGET_FILE:klu_klu_test.exe> "-d" "${test_data_dir}")
-  add_test(NAME klu_klu_ir_test COMMAND $<TARGET_FILE:klu_klu_test.exe> "-d" "${test_data_dir}" "-i")
+  add_test(NAME klu_klu_test    COMMAND $<TARGET_FILE:klu_klu_test.exe> "-d" "${test_data_dir}" "-m" "${sym_matrix_path}" "-r" "${sym_rhs_path}") 
+  add_test(NAME klu_klu_ir_test COMMAND $<TARGET_FILE:klu_klu_test.exe> "-d" "${test_data_dir}" "-m" "${sym_matrix_path}" "-r" "${sym_rhs_path}" "-i")
+  add_test(NAME klu_klu_asym_test COMMAND $<TARGET_FILE:klu_klu_test.exe> "-d" "${test_data_dir}" "-m" "${asym_matrix_path}" "-r" "${asym_rhs_path}")
+  add_test(NAME klu_klu_asym_ir_test COMMAND $<TARGET_FILE:klu_klu_test.exe> "-d" "${test_data_dir}" "-m" "${asym_matrix_path}" "-r" "${asym_rhs_path}" "-i") 
 
   # CUDA-SDK specific tests
   if(RESOLVE_USE_CUDA)
     add_test(NAME klu_rf_cuda_test    COMMAND $<TARGET_FILE:klu_rf_test.exe> "-d" "${test_data_dir}")
     add_test(NAME klu_rf_ir_cuda_test COMMAND $<TARGET_FILE:klu_rf_test.exe> "-d" "${test_data_dir}" "-i")
     add_test(NAME klu_glu_cuda_test   COMMAND $<TARGET_FILE:klu_rf_test.exe> "-d" "${test_data_dir}" "-s" "glu")
-    add_test(NAME sys_refactor_cuda_test COMMAND $<TARGET_FILE:sys_refactor_test.exe> "${test_data_dir}")
-    add_test(NAME sys_glu_test COMMAND $<TARGET_FILE:sys_glu_test.exe> "${test_data_dir}")
-    add_test(NAME sys_glu_asym_test COMMAND $<TARGET_FILE:sys_glu_asym_test.exe> "${test_data_dir}")
+    add_test(NAME sys_refactor_cuda_test COMMAND $<TARGET_FILE:sys_refactor_test.exe> "${test_data_dir}" "-d" "${test_data_dir}" "-m" "${sym_matrix_path}" "-r" "${sym_rhs_path}")
+    add_test(NAME sys_refactor_cuda_asym_test COMMAND $<TARGET_FILE:sys_refactor_test.exe> "${test_data_dir}" "-d" "${test_data_dir}" "-m" "${asym_matrix_path}" "-r" "${asym_rhs_path}") 
+    add_test(NAME sys_glu_test COMMAND $<TARGET_FILE:sys_glu_test.exe> "${test_data_dir}" "-d" "${test_data_dir}" "-m" "${sym_matrix_path}" "-r" "${sym_rhs_path}")
+    add_test(NAME sys_glu_asym_test COMMAND $<TARGET_FILE:sys_glu_test.exe> "${test_data_dir}" "-d" "${test_data_dir}" "-m" "${asym_matrix_path}" "-r" "${asym_rhs_path}") 
   endif(RESOLVE_USE_CUDA)
 
   # ROCm specific tests
@@ -136,6 +141,7 @@ if(RESOLVE_USE_KLU)
     add_test(NAME rocsolver_rf_m1_test    COMMAND $<TARGET_FILE:klu_rf_test.exe> "-d" "${test_data_dir}" "-m" "rocsparse_trisolve")
     add_test(NAME rocsolver_rf_ir_test    COMMAND $<TARGET_FILE:klu_rf_test.exe> "-d" "${test_data_dir}" "-i")
     add_test(NAME rocsolver_rf_ir_m1_test COMMAND $<TARGET_FILE:klu_rf_test.exe> "-d" "${test_data_dir}" "-i" "-m" "rocsparse_trisolve")
-    add_test(NAME sys_refactor_hip_test  COMMAND $<TARGET_FILE:sys_refactor_test.exe>  "${test_data_dir}")
+    add_test(NAME sys_refactor_hip_test COMMAND $<TARGET_FILE:sys_refactor_test.exe> "${test_data_dir}" "-d" "${test_data_dir}" "-m" "${sym_matrix_path}" "-r" "${sym_rhs_path}")
+    add_test(NAME sys_refactor_hip_asym_test COMMAND $<TARGET_FILE:sys_refactor_test.exe> "${test_data_dir}" "-d" "${test_data_dir}" "-m" "${asym_matrix_path}" "-r" "${asym_rhs_path}")
   endif(RESOLVE_USE_HIP)
 endif(RESOLVE_USE_KLU)

tests/functionality/TestHelper.hpp

@@ -269,7 +269,6 @@ class TestHelper
   {
     int                error_sum = 0;
     ReSolve::real_type norm      = norm_res_ / norm_rhs_;
-
     if (!std::isfinite(norm))
     {
       std::cout << "Result is not a finite number!\n";