Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dense Matrix Unit Test Refactoring #170

Merged
merged 16 commits into from
Dec 28, 2020
Merged

Dense Matrix Unit Test Refactoring #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cefb502
Removed unused funciton globalToLocalMap in matrixTests.hpp
Dec 16, 2020
12db66c
Implemented template testing function for all matrix tests.
Dec 17, 2020
4015103
Adding myself as an author in modified files.
Dec 18, 2020
6508a72
Added some documentation to matrixTests.hpp
Dec 18, 2020
2b93b7c
Removed unecessary casting in matrix test matrixTransAddToSymDenseMat…
Dec 22, 2020
4060b72
Enforcing specific vector type in implementation specific vector tests.
Dec 22, 2020
791db41
Added enforcing of specific matrix type to implementation specific ma…
Dec 22, 2020
19bf163
Removed commented out test that is not needed.
Dec 22, 2020
fe1be4d
removed erroneous #elif in place for #else.
Dec 22, 2020
b35fe1c
Enforced THROW_NULL_DEREF at end of implementation specific test func…
Dec 22, 2020
bccc7b7
Removed warnings, updated comments and cleaned up code.
Dec 24, 2020
ef3892b
Change matrix tests class names to match tested classes.
Dec 24, 2020
1737e66
Modify tests file names to match corresponding src file names.
Dec 24, 2020
beb7f2e
Make dense matrix' getLocalData a const method.
Dec 25, 2020
da866a9
Merge branch 'develop' into rcrutherford-matrix-unit-tests-dev
Dec 26, 2020
205ef6c
Rename testMatrix -> testMatrixDense.
Dec 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,9 @@ if (HIOP_WITH_MAKETEST)
if(HIOP_USE_MPI)
add_test(NAME VectorTest_mpi COMMAND ${MPICMD} -n 2 "$<TARGET_FILE:testVector>")
endif(HIOP_USE_MPI)
add_test(NAME MatrixTest COMMAND ${RUNCMD} "$<TARGET_FILE:testMatrix>")
add_test(NAME MatrixTest COMMAND ${RUNCMD} "$<TARGET_FILE:testMatrixDense>")
if(HIOP_USE_MPI)
add_test(NAME MatrixTest_mpi COMMAND ${MPICMD} -n 2 "$<TARGET_FILE:testMatrix>")
add_test(NAME MatrixTest_mpi COMMAND ${MPICMD} -n 2 "$<TARGET_FILE:testMatrixDense>")
endif(HIOP_USE_MPI)
add_test(NAME SparseMatrixTest COMMAND ${RUNCMD} "$<TARGET_FILE:testMatrixSparse>")
add_test(NAME SymmetricSparseMatrixTest COMMAND ${RUNCMD} "$<TARGET_FILE:testMatrixSymSparse>")
Expand Down
10 changes: 5 additions & 5 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set(testVector_SRC testVector.cpp LinAlg/vectorTestsPar.cpp LinAlg/vectorTestsIntSeq.cpp)

# Set sources for dense matrix tests
set(testMatrix_SRC testMatrix.cpp LinAlg/matrixTestsDense.cpp)
set(testMatrix_SRC testMatrixDense.cpp LinAlg/matrixTestsDenseRowMajor.cpp)

# Set sources for sparse matrix tests
set(testMatrixSparse_SRC testMatrixSparse.cpp LinAlg/matrixTestsSparseTriplet.cpp)
Expand All @@ -21,7 +21,7 @@ endif()
if(HIOP_USE_GPU)
set_source_files_properties(testVector.cpp LinAlg/vectorTestsRajaPar.cpp PROPERTIES LANGUAGE CUDA)
set_source_files_properties(testVector.cpp LinAlg/vectorTestsIntRaja.cpp PROPERTIES LANGUAGE CUDA)
set_source_files_properties(testMatrix.cpp LinAlg/matrixTestsRajaDense.cpp PROPERTIES LANGUAGE CUDA)
set_source_files_properties(testMatrixDense.cpp LinAlg/matrixTestsRajaDense.cpp PROPERTIES LANGUAGE CUDA)
set_source_files_properties(testMatrixSparse.cpp LinAlg/matrixTestsRajaSparseTriplet.cpp PROPERTIES LANGUAGE CUDA)
set_source_files_properties(testMatrixSymSparse.cpp LinAlg/matrixTestsRajaSymSparseTriplet.cpp PROPERTIES LANGUAGE CUDA)
endif()
Expand All @@ -31,8 +31,8 @@ add_executable(testVector ${testVector_SRC})
target_link_libraries(testVector PRIVATE hiop)

# Build matrix test
add_executable(testMatrix ${testMatrix_SRC})
target_link_libraries(testMatrix PRIVATE hiop)
add_executable(testMatrixDense ${testMatrix_SRC})
target_link_libraries(testMatrixDense PRIVATE hiop)

# Build sparse matrix test
add_executable(testMatrixSparse ${testMatrixSparse_SRC})
Expand All @@ -44,7 +44,7 @@ target_link_libraries(testMatrixSymSparse PRIVATE hiop)

if(HIOP_USE_RAJA)
target_link_libraries(testVector PRIVATE umpire RAJA OpenMP::OpenMP_CXX)
target_link_libraries(testMatrix PRIVATE umpire RAJA OpenMP::OpenMP_CXX)
target_link_libraries(testMatrixDense PRIVATE umpire RAJA OpenMP::OpenMP_CXX)
target_link_libraries(testMatrixSparse PRIVATE umpire RAJA OpenMP::OpenMP_CXX)
target_link_libraries(testMatrixSymSparse PRIVATE umpire RAJA OpenMP::OpenMP_CXX)
endif()
Loading