Skip to content

Commit

Permalink
Don't run cgs1 functionality tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pelesh
pelesh committed Feb 22, 2024
1 parent f76f40f commit af68ec4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 20 deletions.
2 changes: 0 additions & 2 deletions resolve/SystemSolver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -763,8 +763,6 @@ namespace ReSolve
gs_ = new GramSchmidt(vectorHandler_, GramSchmidt::mgs_two_synch);
} else if (gsMethod == "mgs_pm") {
gs_ = new GramSchmidt(vectorHandler_, GramSchmidt::mgs_pm);
} else if (gsMethod == "cgs1") {
gs_ = new GramSchmidt(vectorHandler_, GramSchmidt::cgs1);
} else {
out::warning() << "Gram-Schmidt variant " << gsMethod_ << " not recognized.\n";
out::warning() << "Using default cgs2 Gram-Schmidt variant.\n";
Expand Down
32 changes: 14 additions & 18 deletions tests/functionality/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ if(RESOLVE_USE_CUDA)
add_executable(rand_gmres_cuda_test.exe testRandGMRES_Cuda.cpp)
target_link_libraries(rand_gmres_cuda_test.exe PRIVATE ReSolve)

# add_executable(sys_rand_gmres_cuda_test.exe testSysRandGMRES.cpp)
# target_link_libraries(sys_rand_gmres_cuda_test.exe PRIVATE ReSolve)

endif(RESOLVE_USE_CUDA)


Expand Down Expand Up @@ -86,9 +83,7 @@ if(RESOLVE_USE_CUDA)
sys_refactor_cuda_test.exe
klu_glu_test.exe
sys_glu_test.exe
rand_gmres_cuda_test.exe
#sys_rand_gmres_cuda_test.exe
)
rand_gmres_cuda_test.exe)
endif(RESOLVE_USE_CUDA)

if(RESOLVE_USE_HIP)
Expand All @@ -112,35 +107,36 @@ if(RESOLVE_USE_KLU)
add_test(NAME klu_klu_test COMMAND $<TARGET_FILE:klu_klu_test.exe> "${test_data_dir}")
endif()

# Krylov solvers tests
add_test(NAME sys_rand_count_gmres_cgs2_test COMMAND $<TARGET_FILE:sys_rand_gmres_test.exe> "-i" "randgmres" "-g" "cgs2" "-s" "count")
add_test(NAME sys_rand_count_gmres_mgs_test COMMAND $<TARGET_FILE:sys_rand_gmres_test.exe> "-i" "randgmres" "-g" "mgs" "-s" "count")
add_test(NAME sys_rand_count_gmres_mgs2sync_test COMMAND $<TARGET_FILE:sys_rand_gmres_test.exe> "-i" "randgmres" "-g" "mgs_two_synch" "-s" "count")
add_test(NAME sys_rand_count_gmres_mgspm_test COMMAND $<TARGET_FILE:sys_rand_gmres_test.exe> "-i" "randgmres" "-g" "mgs_pm" "-s" "count")
#add_test(NAME sys_rand_count_gmres_cgs_test COMMAND $<TARGET_FILE:sys_rand_gmres_test.exe> "-i" "randgmres" "-g" "cgs1" "-s" "count")
add_test(NAME sys_rand_fwht_gmres_cgs2_test COMMAND $<TARGET_FILE:sys_rand_gmres_test.exe> "-i" "randgmres" "-g" "cgs2" "-s" "fwht")
add_test(NAME sys_rand_fwht_gmres_mgs_test COMMAND $<TARGET_FILE:sys_rand_gmres_test.exe> "-i" "randgmres" "-g" "mgs" "-s" "fwht")
add_test(NAME sys_rand_fwht_gmres_mgs2sync_test COMMAND $<TARGET_FILE:sys_rand_gmres_test.exe> "-i" "randgmres" "-g" "mgs_two_synch" "-s" "fwht")
add_test(NAME sys_rand_fwht_gmres_mgspm_test COMMAND $<TARGET_FILE:sys_rand_gmres_test.exe> "-i" "randgmres" "-g" "mgs_pm" "-s" "fwht")
#add_test(NAME sys_rand_fwht_gmres_cgs_test COMMAND $<TARGET_FILE:sys_rand_gmres_test.exe> "-i" "randgmres" "-g" "cgs1" "-s" "fwht")
add_test(NAME sys_fgmres_cgs2_test COMMAND $<TARGET_FILE:sys_rand_gmres_test.exe> "-i" "fgmres" "-g" "cgs2")
add_test(NAME sys_fgmres_mgs_test COMMAND $<TARGET_FILE:sys_rand_gmres_test.exe> "-i" "fgmres" "-g" "mgs")
add_test(NAME sys_fgmres_mgs2sync_test COMMAND $<TARGET_FILE:sys_rand_gmres_test.exe> "-i" "fgmres" "-g" "mgs_two_synch")
add_test(NAME sys_fgmres_mgspm_test COMMAND $<TARGET_FILE:sys_rand_gmres_test.exe> "-i" "fgmres" "-g" "mgs_pm")
#add_test(NAME sys_fgmres_cgs_test COMMAND $<TARGET_FILE:sys_rand_gmres_test.exe> "-i" "fgmres" "-g" "cgs1")

if(RESOLVE_USE_CUDA)
add_test(NAME klu_rf_test COMMAND $<TARGET_FILE:klu_rf_test.exe> "${test_data_dir}")
add_test(NAME klu_rf_fgmres_test COMMAND $<TARGET_FILE:klu_rf_fgmres_test.exe> "${test_data_dir}")
add_test(NAME sys_refactor_cuda_test COMMAND $<TARGET_FILE:sys_refactor_cuda_test.exe> "${test_data_dir}")
add_test(NAME klu_glu_test COMMAND $<TARGET_FILE:klu_glu_test.exe> "${test_data_dir}")
add_test(NAME sys_glu_test COMMAND $<TARGET_FILE:sys_glu_test.exe> "${test_data_dir}")
if(RESOLVE_USE_KLU)
add_test(NAME klu_rf_test COMMAND $<TARGET_FILE:klu_rf_test.exe> "${test_data_dir}")
add_test(NAME klu_rf_fgmres_test COMMAND $<TARGET_FILE:klu_rf_fgmres_test.exe> "${test_data_dir}")
add_test(NAME sys_refactor_cuda_test COMMAND $<TARGET_FILE:sys_refactor_cuda_test.exe> "${test_data_dir}")
add_test(NAME klu_glu_test COMMAND $<TARGET_FILE:klu_glu_test.exe> "${test_data_dir}")
add_test(NAME sys_glu_test COMMAND $<TARGET_FILE:sys_glu_test.exe> "${test_data_dir}")
endif(RESOLVE_USE_KLU)
add_test(NAME rand_gmres_cuda_test COMMAND $<TARGET_FILE:rand_gmres_cuda_test.exe>)
# add_test(NAME sys_rand_gmres_cuda_test COMMAND $<TARGET_FILE:sys_rand_gmres_cuda_test.exe>)
endif(RESOLVE_USE_CUDA)

if(RESOLVE_USE_HIP)
add_test(NAME rocsolver_rf_test COMMAND $<TARGET_FILE:rocsolver_rf_test.exe> "${test_data_dir}")
add_test(NAME rocsolver_rf_fgmres_test COMMAND $<TARGET_FILE:rocsolver_rf_fgmres_test.exe> "${test_data_dir}")
add_test(NAME sys_refactor_hip_test COMMAND $<TARGET_FILE:sys_refactor_hip_test.exe> "${test_data_dir}")
if(RESOLVE_USE_KLU)
add_test(NAME rocsolver_rf_test COMMAND $<TARGET_FILE:rocsolver_rf_test.exe> "${test_data_dir}")
add_test(NAME rocsolver_rf_fgmres_test COMMAND $<TARGET_FILE:rocsolver_rf_fgmres_test.exe> "${test_data_dir}")
add_test(NAME sys_refactor_hip_test COMMAND $<TARGET_FILE:sys_refactor_hip_test.exe> "${test_data_dir}")
endif(RESOLVE_USE_KLU)
add_test(NAME rand_gmres_hip_test COMMAND $<TARGET_FILE:rand_gmres_hip_test.exe>)
endif(RESOLVE_USE_HIP)

0 comments on commit af68ec4

Please sign in to comment.