Skip to content

Commit

Permalink
minor formatting changes, removed comment
Browse files Browse the repository at this point in the history
  • Loading branch information
Harry Hughes committed Oct 17, 2024
1 parent a988879 commit a6d8414
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
6 changes: 3 additions & 3 deletions tests/functionality/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
]]

# Create functionality test helper
add_library( FunctionalityTestHelper SHARED FunctionalityTestHelper.cpp )
target_link_libraries( FunctionalityTestHelper PRIVATE ReSolve )
add_library(FunctionalityTestHelper SHARED FunctionalityTestHelper.cpp)
target_link_libraries(FunctionalityTestHelper PRIVATE ReSolve)

# Build basic version test
add_executable(version.exe testVersion.cpp)
Expand Down Expand Up @@ -42,7 +42,7 @@ if(RESOLVE_USE_CUDA)

# System solver test with cusolver rf and iterative refinement
add_executable(sys_refactor_cuda_test.exe testSysRefactor.cpp)
target_link_libraries(sys_refactor_cuda_test.exe PRIVATE ReSolve FunctionalityTestHelper )
target_link_libraries(sys_refactor_cuda_test.exe PRIVATE ReSolve FunctionalityTestHelper)

# Build KLU+GLU test
add_executable(klu_glu_test.exe testKLU_GLU.cpp)
Expand Down
6 changes: 3 additions & 3 deletions tests/functionality/FunctionalityTestHelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
#include <resolve/matrix/Csc.hpp>
#include <resolve/matrix/MatrixHandler.hpp>
#include <resolve/vector/VectorHandler.hpp>
#if defined RESOLVE_USE_KLU
#include <resolve/LinSolverDirectKLU.hpp>
#endif
#include "resolve/Common.hpp"
#include <resolve/LinSolverIterativeFGMRES.hpp>
#include <resolve/workspace/LinAlgWorkspace.hpp>
#include <resolve/SystemSolver.hpp>
#if defined RESOLVE_USE_KLU
#include <resolve/LinSolverDirectKLU.hpp>
#endif
#if defined (RESOLVE_USE_CUDA)
#include <resolve/LinSolverDirectCuSolverRf.hpp>
using workspace_type = ReSolve::LinAlgWorkspaceCUDA;
Expand Down
6 changes: 1 addition & 5 deletions tests/functionality/testSysRefactor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ int main(int argc, char *argv[])

workspace.initializeHandles();

// Create linear algebra handlers

ReSolve::MatrixHandler matrix_handler(&workspace);
ReSolve::VectorHandler vector_handler(&workspace);

// Create system solver
ReSolve::SystemSolver solver(&workspace);

Expand Down Expand Up @@ -141,6 +136,7 @@ int main(int argc, char *argv[])
status = solver.solve(vec_rhs, vec_x);
error_sum += status;

// larger tolerance than default 1e-17 because iterative refinement is not applied here
ReSolve::tests::FunctionalityTestHelper testhelper( 1e-12 );

error_sum +=
Expand Down

0 comments on commit a6d8414

Please sign in to comment.