Commit e9ec047d authored by Kirill Terekhov's avatar Kirill Terekhov

adjust inner solver tests, add multi-level solver to test

parent df09a1b6
......@@ -45,13 +45,10 @@ endif()
add_test(NAME solver_test000_serial_inner_ilu2 COMMAND $<TARGET_FILE:solver_test000> 0 inner_ilu2)
add_test(NAME solver_test000_serial_inner_ddpqiluc COMMAND $<TARGET_FILE:solver_test000> 0 inner_ddpqiluc2)
if( HAVE_SOLVER_MPTILUC2 )
add_test(NAME solver_test000_serial_inner_mptiluc COMMAND $<TARGET_FILE:solver_test000> 0 inner_mptiluc)
endif()
add_test(NAME solver_test000_serial_inner_mlmptiluc COMMAND $<TARGET_FILE:solver_test000> 0 inner_mlmptiluc)
if( HAVE_SOLVER_MPTILU2 )
add_test(NAME solver_test000_serial_inner_mptilu2 COMMAND $<TARGET_FILE:solver_test000> 0 inner_mptilu2)
endif()
if(USE_SOLVER_PETSC)
......@@ -89,6 +86,10 @@ add_test(NAME solver_test000_parallel_normal_inner_mptiluc COMMAND ${MPIEXE
add_test(NAME solver_test000_parallel_permute1_inner_mptiluc COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test000> 1 inner_mptiluc)
add_test(NAME solver_test000_parallel_permute2_inner_mptiluc COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test000> 2 inner_mptiluc)
add_test(NAME solver_test000_parallel_normal_inner_mlmptiluc COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test000> 0 inner_mlmptiluc)
add_test(NAME solver_test000_parallel_permute1_inner_mlmptiluc COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test000> 1 inner_mlmptiluc)
add_test(NAME solver_test000_parallel_permute2_inner_mlmptiluc COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test000> 2 inner_mlmptiluc)
add_test(NAME solver_test000_parallel_normal_inner_mptilu2 COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test000> 0 inner_mptilu2)
add_test(NAME solver_test000_parallel_permute1_inner_mptilu2 COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test000> 1 inner_mptilu2)
add_test(NAME solver_test000_parallel_permute2_inner_mptilu2 COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test000> 2 inner_mptilu2)
......
......@@ -45,12 +45,9 @@ endif()
add_test(NAME solver_test002_serial_inner_ilu2 COMMAND $<TARGET_FILE:solver_test002> inner_ilu2 20)
add_test(NAME solver_test002_serial_inner_ddpqiluc COMMAND $<TARGET_FILE:solver_test002> inner_ddpqiluc2 20)
if(HAVE_SOLVER_MPTILUC2)
add_test(NAME solver_test002_serial_inner_mptiluc COMMAND $<TARGET_FILE:solver_test002> inner_mptiluc 20)
endif()
if(HAVE_SOLVER_MPTILU2)
add_test(NAME solver_test002_serial_inner_mlmptiluc COMMAND $<TARGET_FILE:solver_test002> inner_mlmptiluc 20)
add_test(NAME solver_test002_serial_inner_mptilu2 COMMAND $<TARGET_FILE:solver_test002> inner_mptilu2 20)
endif()
if(SOLVER_DEFINITIONS MATCHES "^.*HAVE_SOLVER_FCBIILU2.*$")
add_test(NAME solver_test002_serial_fcbiilu2 COMMAND $<TARGET_FILE:solver_test002> fcbiilu2 20)
endif()
......@@ -80,6 +77,7 @@ if( EXISTS ${MPIEXEC} )
add_test(NAME solver_test002_parallel_inner_ilu2 COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test002> inner_ilu2 20)
add_test(NAME solver_test002_parallel_inner_ddpqiluc COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test002> inner_ddpqiluc2 20)
add_test(NAME solver_test002_parallel_inner_mptiluc COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test002> inner_mptiluc 20)
add_test(NAME solver_test002_parallel_inner_mlmptiluc COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test002> inner_mlmptiluc 20)
add_test(NAME solver_test002_parallel_inner_mptilu2 COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test002> inner_mptilu2 20)
if(USE_SOLVER_TRILINOS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment