diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index c1893ed5f..6480680b2 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -104,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} ${test_data_dir} -m ${sym_matrix_path} -r ${sym_rhs_path}) +add_custom_target(test_install COMMAND ${CONSUMER_PATH}/test.sh ${CMAKE_INSTALL_PREFIX} ${test_data_dir} ${sym_matrix_path} ${sym_rhs_path}) diff --git a/examples/resolve_consumer/CMakeLists.txt b/examples/resolve_consumer/CMakeLists.txt index 45aae031d..1f0afdef5 100644 --- a/examples/resolve_consumer/CMakeLists.txt +++ b/examples/resolve_consumer/CMakeLists.txt @@ -18,4 +18,4 @@ target_link_libraries(consume.exe PRIVATE ReSolve::ReSolve) 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 $ "-d" "${RESOLVE_DATA}" "-i") +add_test(NAME resolve_consumer COMMAND $ "-d" "${ReSolve_DATA_DIR}" "-i" "-m" "${ReSolve_MATRICES}" "-r" "${ReSolve_RHS}") diff --git a/examples/test.sh b/examples/test.sh index 391010573..4ac55a0e2 100644 --- a/examples/test.sh +++ b/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 && diff --git a/tests/functionality/CMakeLists.txt b/tests/functionality/CMakeLists.txt index da38b5e20..03207feb4 100644 --- a/tests/functionality/CMakeLists.txt +++ b/tests/functionality/CMakeLists.txt @@ -140,7 +140,7 @@ if(RESOLVE_USE_KLU) add_test(NAME rocsolver_rf_m1_test COMMAND $ "-d" "${test_data_dir}" "-m" "rocsparse_trisolve") add_test(NAME rocsolver_rf_ir_test COMMAND $ "-d" "${test_data_dir}" "-i") add_test(NAME rocsolver_rf_ir_m1_test COMMAND $ "-d" "${test_data_dir}" "-i" "-m" "rocsparse_trisolve") - add_test(NAME sys_refactor_cuda_test COMMAND $ "${test_data_dir}" "-d" "${test_data_dir}" "-m" "${sym_matrix_path}" "-r" "${sym_rhs_path}") - add_test(NAME sys_refactor_cuda_asym_test COMMAND $ "${test_data_dir}" "-d" "${test_data_dir}" "-m" "${asym_matrix_path}" "-r" "${asym_rhs_path}") + add_test(NAME sys_refactor_hip_test COMMAND $ "${test_data_dir}" "-d" "${test_data_dir}" "-m" "${sym_matrix_path}" "-r" "${sym_rhs_path}") + add_test(NAME sys_refactor_hip_asym_test COMMAND $ "${test_data_dir}" "-d" "${test_data_dir}" "-m" "${asym_matrix_path}" "-r" "${asym_rhs_path}") endif(RESOLVE_USE_HIP) endif(RESOLVE_USE_KLU)