scnc
/
qmcpack
mirror of https://github.com/QMCPACK/qmcpack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lock gpu resource when offlaod is enabled.

This commit is contained in:
Ye Luo 2021-02-15 01:04:07 -06:00
parent e8d21f1a5e
commit 90984c2692
39 changed files with 76 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMake/macros.cmake
View File

@ -97,7 +97,7 @@ FUNCTION( RUN_QMC_APP_NO_COPY TESTNAME WORKDIR PROCS THREADS TEST_ADDED TEST_LAB
IF ( ${TOT_PROCS} GREATER ${TEST_MAX_PROCS} )
MESSAGE_VERBOSE("Disabling test ${TESTNAME} (exceeds maximum number of processors ${TEST_MAX_PROCS})")
ELSE()
ADD_TEST( ${TESTNAME} ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${PROCS} ${MPIEXEC_PREFLAGS} ${QMC_APP} ${ARGN} )
ADD_TEST( NAME ${TESTNAME} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${PROCS} ${MPIEXEC_PREFLAGS} ${QMC_APP} ${ARGN} )
SET_TESTS_PROPERTIES( ${TESTNAME} PROPERTIES FAIL_REGULAR_EXPRESSION "${TEST_FAIL_REGULAR_EXPRESSION}"
PROCESSORS ${TOT_PROCS} PROCESSOR_AFFINITY TRUE WORKING_DIRECTORY ${WORKDIR}
ENVIRONMENT OMP_NUM_THREADS=${THREADS} )
@ -114,6 +114,11 @@ FUNCTION( RUN_QMC_APP_NO_COPY TESTNAME WORKDIR PROCS THREADS TEST_ADDED TEST_LAB
MESSAGE_VERBOSE("Disabling test ${TESTNAME} (building without MPI)")
ENDIF()
ENDIF()
if (ENABLE_OFFLOAD)
set_tests_properties(${TESTNAME} PROPERTIES RESOURCE_LOCK exclusively_owned_gpus)
endif()
SET(TEST_LABELS_TEMP "")
IF ( TEST_ADDED_TEMP )
ADD_TEST_LABELS( ${TESTNAME} TEST_LABELS_TEMP )

49
CMake/unit_test.cmake
View File

@ -2,30 +2,29 @@
INCLUDE("${PROJECT_SOURCE_DIR}/CMake/test_labels.cmake")
# Runs unit tests
FUNCTION( ADD_UNIT_TEST TESTNAME TEST_BINARY )
MESSAGE_VERBOSE("Adding test ${TESTNAME}")
IF ( HAVE_MPI )
ADD_TEST(NAME ${TESTNAME} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 1 ${MPIEXEC_PREFLAGS} ${TEST_BINARY} ${ARGN})
#SET_TESTS_PROPERTIES( ${TESTNAME} PROPERTIES ENVIRONMENT OMP_NUM_THREADS=1 )
ELSE()
ADD_TEST(NAME ${TESTNAME} COMMAND ${TEST_BINARY} ${ARGN})
#SET_TESTS_PROPERTIES( ${TESTNAME} PROPERTIES ENVIRONMENT OMP_NUM_THREADS=1 )
ENDIF()
SET(TEST_LABELS_TEMP "")
ADD_TEST_LABELS( ${TESTNAME} TEST_LABELS_TEMP )
SET_PROPERTY(TEST ${TESTNAME} APPEND PROPERTY LABELS "unit")
ENDFUNCTION()
FUNCTION( ADD_UNIT_TEST TESTNAME PROCS THREADS TEST_BINARY )
message_verbose("Adding test ${TESTNAME}")
math( EXPR TOT_PROCS "${PROCS} * ${THREADS}" )
if ( HAVE_MPI )
add_test(NAME ${TESTNAME} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${PROCS} ${MPIEXEC_PREFLAGS} ${TEST_BINARY} ${ARGN})
else()
if ( ( ${PROCS} STREQUAL "1" ) )
add_test(NAME ${TESTNAME} COMMAND ${TEST_BINARY} ${ARGN})
else()
message_verbose("Disabling test ${TESTNAME} (building without MPI)")
endif()
endif()
FUNCTION( ADD_MPI_UNIT_TEST TESTNAME TEST_BINARY PROC_COUNT )
MESSAGE_VERBOSE("Adding test ${TESTNAME}")
IF ( HAVE_MPI )
ADD_TEST(NAME ${TESTNAME} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${PROC_COUNT} ${MPIEXEC_PREFLAGS} ${TEST_BINARY} ${ARGN})
# Tests should be able to deal with any number of threads but mpi aware unit tests aren't
# guaranteed yet.
SET_TESTS_PROPERTIES( ${TESTNAME} PROPERTIES ENVIRONMENT OMP_NUM_THREADS=1 )
SET(TEST_LABELS_TEMP "")
ADD_TEST_LABELS( ${TESTNAME} TEST_LABELS_TEMP )
SET_PROPERTY(TEST ${TESTNAME} APPEND PROPERTY LABELS "unit")
ENDIF()
ENDFUNCTION()
set_tests_properties( ${TESTNAME} PROPERTIES
PROCESSORS ${TOT_PROCS}
ENVIRONMENT OMP_NUM_THREADS=${THREADS}
PROCESSOR_AFFINITY TRUE )
if (ENABLE_OFFLOAD)
set_tests_properties(${TESTNAME} PROPERTIES RESOURCE_LOCK exclusively_owned_gpus)
endif()
set(TEST_LABELS_TEMP "")
add_test_labels( ${TESTNAME} TEST_LABELS_TEMP )
set_property(TEST ${TESTNAME} APPEND PROPERTY LABELS "unit")
ENDFUNCTION()

2
src/AFQMC/Estimators/tests/CMakeLists.txt
View File

@ -29,7 +29,7 @@ FOREACH(I RANGE 0 ${ENDP} 2)
GET_FILENAME_COMPONENT(HAMIL ${HAMIL_FILE} NAME_WE)
GET_FILENAME_COMPONENT(WFN ${WFN_FILE} NAME_WE)
SET(UTEST_NAME deterministic-unit_test_${SRC_DIR}_${HAMIL}_${WFN})
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
"--hamil ${HAMIL_FILE}" "--wfn ${WFN_FILE}")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})
SET_PROPERTY(TEST ${UTEST_NAME} APPEND PROPERTY LABELS "afqmc")

4
src/AFQMC/HamiltonianOperations/tests/CMakeLists.txt
View File

@ -20,12 +20,12 @@ ADD_EXECUTABLE(${UTEST_EXE} test_hamiltonian_operations.cpp)
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main afqmc)
IF (QMC_COMPLEX)
SET(UTEST_NAME deterministic-unit_test_${SRC_DIR}_ham_chol_uc_wfn_rhf)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
"--hamil ${qmcpack_SOURCE_DIR}/tests/afqmc/He_2x2x2_dzv/ham_chol_uc.h5"
"--wfn ${qmcpack_SOURCE_DIR}/tests/afqmc/He_2x2x2_dzv/wfn_rhf.h5")
#ELSE()
# SET(UTEST_NAME deterministic-unit_test_${SRC_DIR}_ham_chol_wfn_rhf)
# ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
# ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
# "--hamil ${qmcpack_SOURCE_DIR}/tests/afqmc/Ne_cc-pvdz/ham_chol.h5"
# "--wfn ${qmcpack_SOURCE_DIR}/tests/afqmc/Ne_cc-pvdz/wfn_rhf.h5")
ENDIF()

8
src/AFQMC/Hamiltonians/tests/CMakeLists.txt
View File

@ -25,26 +25,26 @@ TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main afqmc)
SET(UTEST_NAME deterministic-unit_test_${SRC_DIR}_ham_chol_uc)
IF (QMC_COMPLEX)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
"--hamil ${qmcpack_SOURCE_DIR}/tests/afqmc/He_2x2x2_dzv/ham_chol_uc.h5")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})
SET_PROPERTY(TEST ${UTEST_NAME} APPEND PROPERTY LABELS "afqmc")
IF (NOT ENABLE_CUDA)
SET(UTEST_NAME deterministic-unit_test_${SRC_DIR}_ham_chol_sc)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
"--hamil ${qmcpack_SOURCE_DIR}/tests/afqmc/C_1x1x1_dzvp/ham_chol_sc.h5")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})
SET_PROPERTY(TEST ${UTEST_NAME} APPEND PROPERTY LABELS "afqmc")
SET(UTEST_NAME deterministic-unit_test_${SRC_DIR}_ham_thc_sc)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
"--hamil ${qmcpack_SOURCE_DIR}/tests/afqmc/C_1x1x1_szv/ham_thc_sc.h5")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})
SET_PROPERTY(TEST ${UTEST_NAME} APPEND PROPERTY LABELS "afqmc")
ENDIF()
ELSE()
SET(UTEST_NAME deterministic-unit_test_${SRC_DIR}_ham_chol)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
"--hamil ${qmcpack_SOURCE_DIR}/tests/afqmc/Ne_cc-pvdz/ham_chol.h5")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})
SET_PROPERTY(TEST ${UTEST_NAME} APPEND PROPERTY LABELS "afqmc")

3
src/AFQMC/Matrix/tests/CMakeLists.txt
View File

@ -21,7 +21,6 @@ SET(UTEST_NAME deterministic-unit_test_${SRC_DIR})
ADD_EXECUTABLE(${UTEST_EXE} test_csr_matrix.cpp)
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main afqmc)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${QMCPACK_UNIT_TEST_DIR})
SET_PROPERTY(TEST ${UTEST_NAME} APPEND PROPERTY LABELS "afqmc")

3
src/AFQMC/Numerics/shm_tests/CMakeLists.txt
View File

@ -18,7 +18,6 @@ SET(UTEST_NAME deterministic-unit_test_${SRC_DIR})
ADD_EXECUTABLE(${UTEST_EXE} test_shm_gemm.cpp)
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main qmcutil)
#ADD_TEST(NAME ${UTEST_NAME} COMMAND "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${QMCPACK_UNIT_TEST_DIR})
SET_PROPERTY(TEST ${UTEST_NAME} APPEND PROPERTY LABELS "afqmc")

2
src/AFQMC/Numerics/tests/CMakeLists.txt
View File

@ -23,6 +23,6 @@ ADD_EXECUTABLE(${UTEST_EXE} test_dense_numerics.cpp test_ma_blas.cpp
test_misc_kernels.cpp)
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main afqmc Math::BLAS_LAPACK)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${QMCPACK_UNIT_TEST_DIR})
SET_PROPERTY(TEST ${UTEST_NAME} APPEND PROPERTY LABELS "afqmc")

2
src/AFQMC/Propagators/tests/CMakeLists.txt
View File

@ -29,7 +29,7 @@ FOREACH(I RANGE 0 ${ENDP} 2)
GET_FILENAME_COMPONENT(HAMIL ${HAMIL_FILE} NAME_WE)
GET_FILENAME_COMPONENT(WFN ${WFN_FILE} NAME_WE)
SET(UTEST_NAME deterministic-unit_test_${SRC_DIR}_${HAMIL}_${WFN})
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
"--hamil ${HAMIL_FILE}" "--wfn ${WFN_FILE}")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})
SET_PROPERTY(TEST ${UTEST_NAME} APPEND PROPERTY LABELS "afqmc")

2
src/AFQMC/SlaterDeterminantOperations/tests/CMakeLists.txt
View File

@ -21,6 +21,6 @@ SET(UTEST_NAME deterministic-unit_test_${SRC_DIR})
ADD_EXECUTABLE(${UTEST_EXE} test_sdet_ops.cpp)
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main afqmc)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${QMCPACK_UNIT_TEST_DIR})
SET_PROPERTY(TEST ${UTEST_NAME} APPEND PROPERTY LABELS "afqmc")

3
src/AFQMC/Walkers/tests/CMakeLists.txt
View File

@ -21,7 +21,6 @@ SET(UTEST_NAME deterministic-unit_test_${SRC_DIR})
ADD_EXECUTABLE(${UTEST_EXE} test_sharedwset.cpp)
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main afqmc)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${QMCPACK_UNIT_TEST_DIR})
SET_PROPERTY(TEST ${UTEST_NAME} APPEND PROPERTY LABELS "afqmc")

4
src/AFQMC/Wavefunctions/tests/CMakeLists.txt
View File

@ -29,7 +29,7 @@ FOREACH(I RANGE 0 ${ENDP} 2)
GET_FILENAME_COMPONENT(HAMIL ${HAMIL_FILE} NAME_WE)
GET_FILENAME_COMPONENT(WFN ${WFN_FILE} NAME_WE)
SET(UTEST_NAME deterministic-unit_test_${SRC_DIR}_${HAMIL}_${WFN})
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
"--hamil ${HAMIL_FILE}" "--wfn ${WFN_FILE}")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})
SET_PROPERTY(TEST ${UTEST_NAME} APPEND PROPERTY LABELS "afqmc")
@ -39,7 +39,7 @@ IF(NOT QMC_COMPLEX)
ADD_EXECUTABLE(${UTEST_EXE} test_phmsd.cpp)
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main afqmc)
SET(UTEST_NAME deterministic-unit_test_afqmc_phmsd)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}"
"--hamil ${qmcpack_SOURCE_DIR}/tests/afqmc/Be_sto-3g/qmcpack.h5 "
"--wfn ${qmcpack_SOURCE_DIR}/tests/afqmc/Be_sto-3g/qmcpack.h5")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})

2
src/Concurrency/tests/CMakeLists.txt
View File

@ -23,4 +23,4 @@ ADD_EXECUTABLE(${UTEST_EXE} ${SRCS})
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

2
src/Containers/MinimalContainers/tests/CMakeLists.txt
View File

@ -20,4 +20,4 @@ ADD_EXECUTABLE(${UTEST_EXE} ${SRCS})
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main containers)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

2
src/Containers/OhmmsPETE/tests/CMakeLists.txt
View File

@ -21,4 +21,4 @@ SET(UTEST_NAME deterministic-unit_test_${SRC_DIR})
ADD_EXECUTABLE(${UTEST_EXE} test_vector.cpp test_matrix.cpp test_tinyvector.cpp)
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main containers)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

3
src/Containers/OhmmsSoA/tests/CMakeLists.txt
View File

@ -21,5 +21,4 @@ SET(UTEST_NAME deterministic-unit_test_${SRC_DIR})
ADD_EXECUTABLE(${UTEST_EXE} test_vector_soa.cpp)
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main containers)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

4
src/Estimators/tests/CMakeLists.txt
View File

@ -23,7 +23,7 @@ IF(USE_OBJECT_TARGET)
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcutil qmcestimators_unit qmcham_unit qmcwfs qmcparticle qmcutil containers platform_omptarget)
ENDIF()
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
IF(HAVE_MPI)
SET(UTEST_EXE test_${SRC_DIR}_mpi)
@ -36,5 +36,5 @@ IF(HAVE_MPI)
ENDIF()
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main qmcestimators_unit)
# Right now the unified driver mpi tests are hard coded for 3 MPI ranks
ADD_MPI_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}" 3)
ADD_UNIT_TEST(${UTEST_NAME} 3 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ENDIF()

4
src/Message/tests/CMakeLists.txt
View File

@ -19,7 +19,7 @@ SET(UTEST_NAME deterministic-unit_test_${SRC_DIR})
ADD_EXECUTABLE(${UTEST_EXE} test_communciate.cpp)
TARGET_LINK_LIBRARIES(${UTEST_EXE} PUBLIC message catch_main)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
IF(HAVE_MPI)
SET(UTEST_EXE test_${SRC_DIR}_mpi)
@ -30,5 +30,5 @@ IF(HAVE_MPI)
#Way too many depenedencies make for very slow test linking
TARGET_LINK_LIBRARIES(${UTEST_EXE} PUBLIC message catch_main)
# Right now the unified driver mpi tests are hard coded for 3 MPI ranks
ADD_MPI_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}" 3)
ADD_UNIT_TEST(${UTEST_NAME} 3 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ENDIF(HAVE_MPI)

4
src/Numerics/tests/CMakeLists.txt
View File

@ -31,6 +31,4 @@ ADD_EXECUTABLE(${UTEST_EXE} ${UTEST_SRCS})
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main qmcutil Math::scalar_vector_functions)
#ADD_TEST(NAME ${UTEST_NAME} COMMAND "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

2
src/Optimize/tests/CMakeLists.txt
View File

@ -18,4 +18,4 @@ SET(UTEST_NAME deterministic-unit_test_${SRC_DIR})
ADD_EXECUTABLE(${UTEST_EXE} test_variable_set.cpp)
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main qmcutil)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

3
src/Particle/Lattice/tests/CMakeLists.txt
View File

@ -21,5 +21,4 @@ ADD_EXECUTABLE(${UTEST_EXE} test_ParticleBConds.cpp test_CrystalLattice.cpp test
TARGET_INCLUDE_DIRECTORIES(${UTEST_EXE} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../..")
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main qmcutil Math::scalar_vector_functions)
#ADD_TEST(NAME ${UTEST_NAME} COMMAND "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

3
src/Particle/LongRange/tests/CMakeLists.txt
View File

@ -24,5 +24,4 @@ IF(USE_OBJECT_TARGET)
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcutil containers)
ENDIF()
#ADD_TEST(NAME ${UTEST_NAME} COMMAND "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

3
src/Particle/ParticleBase/tests/CMakeLists.txt
View File

@ -24,5 +24,4 @@ IF(USE_OBJECT_TARGET)
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcutil containers)
ENDIF()
#ADD_TEST(NAME ${UTEST_NAME} COMMAND "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

2
src/Particle/ParticleIO/tests/CMakeLists.txt
View File

@ -22,4 +22,4 @@ IF(USE_OBJECT_TARGET)
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcutil containers)
ENDIF()
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

2
src/Particle/tests/CMakeLists.txt
View File

@ -22,4 +22,4 @@ IF(USE_OBJECT_TARGET)
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcutil containers)
ENDIF()
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

2
src/Platforms/tests/CPU/CMakeLists.txt
View File

@ -19,4 +19,4 @@ SET(UTEST_NAME deterministic-unit_test_${SRC_DIR})
ADD_EXECUTABLE(${UTEST_EXE} test_aligned_allocator.cpp test_e2iphi.cpp)
TARGET_LINK_LIBRARIES(${UTEST_EXE} platform_device catch_main)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

2
src/Platforms/tests/CUDA/CMakeLists.txt
View File

@ -19,4 +19,4 @@ SET(UTEST_NAME deterministic-unit_test_${SRC_DIR})
ADD_EXECUTABLE(${UTEST_EXE} test_CUDAallocator.cpp)
TARGET_LINK_LIBRARIES(${UTEST_EXE} platform_device containers catch_main)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

2
src/Platforms/tests/OMPTarget/CMakeLists.txt
View File

@ -21,6 +21,6 @@ SET(UTEST_NAME deterministic-unit_test_${SRC_DIR})
ADD_EXECUTABLE(${UTEST_EXE} test_vector.cpp test_math.cpp test_deep_copy.cpp test_class_member.cpp)
TARGET_LINK_LIBRARIES(${UTEST_EXE} platform_device platform_omptarget catch_main)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ENDIF(ENABLE_OFFLOAD)

2
src/QMCApp/tests/CMakeLists.txt
View File

@ -25,4 +25,4 @@ IF(USE_OBJECT_TARGET)
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcestimators qmcdriver qmcham qmcwfs qmcparticle qmcutil containers platform_device platform_omptarget)
ENDIF()
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

6
src/QMCDrivers/tests/CMakeLists.txt
View File

@ -48,7 +48,7 @@ IF(USE_OBJECT_TARGET)
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcestimators_unit qmcham_unit qmcwfs qmcparticle qmcutil containers platform_omptarget)
ENDIF()
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})
@ -71,7 +71,7 @@ IF(NOT QMC_CUDA)
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcestimators_unit qmcham_unit qmcwfs qmcparticle qmcutil containers platform_omptarget)
ENDIF()
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})
@ -88,7 +88,7 @@ IF(NOT QMC_CUDA)
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcestimators_unit qmcham_unit qmcwfs qmcparticle qmcutil containers platform_omptarget)
ENDIF()
# Right now the unified driver mpi tests are hard coded for 3 MPI ranks
ADD_MPI_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}" 3)
ADD_UNIT_TEST(${UTEST_NAME} 3 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})
ENDIF(HAVE_MPI)
ENDIF(NOT QMC_CUDA)

3
src/QMCHamiltonians/tests/CMakeLists.txt
View File

@ -65,7 +65,6 @@ IF(USE_OBJECT_TARGET)
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcwfs qmcparticle qmcutil containers platform_omptarget)
ENDIF()
#ADD_TEST(NAME ${UTEST_NAME} COMMAND "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})

2
src/QMCTools/tests/CMakeLists.txt
View File

@ -29,6 +29,6 @@ IF(USE_OBJECT_TARGET)
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcparticle qmcutil containers)
ENDIF()
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})

2
src/QMCWaveFunctions/tests/CMakeLists.txt
View File

@ -75,6 +75,6 @@ FOREACH(CATEGORY trialwf sposet jastrow determinant)
TARGET_LINK_LIBRARIES(${UTEST_EXE} qmcparticle qmcutil containers platform_omptarget)
ENDIF()
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})
ENDFOREACH()

3
src/Utilities/tests/CMakeLists.txt
View File

@ -22,5 +22,4 @@ ADD_EXECUTABLE(${UTEST_EXE} test_rng.cpp test_parser.cpp test_timer.cpp test_run
test_infostream.cpp test_output_manager.cpp test_StdRandom.cpp)
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main qmcutil)
#ADD_TEST(NAME ${UTEST_NAME} COMMAND "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

3
src/einspline/tests/CMakeLists.txt
View File

@ -27,5 +27,4 @@ ENDIF()
ADD_EXECUTABLE(${UTEST_EXE} ${SRCS})
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main ${CUDATESTLIB} einspline qmcutil)
#ADD_TEST(NAME ${UTEST_NAME} COMMAND "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST( ${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST( ${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

4
src/io/tests/OhmmsData/CMakeLists.txt
View File

@ -25,7 +25,5 @@ TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main qmcutil)
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory "${UTEST_DIR}")
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/simple.xml" ${UTEST_DIR})
#ADD_TEST(NAME ${UTEST_NAME} COMMAND "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}" WORKING_DIRECTORY ${UTEST_DIR})
#SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES LABELS "unit")
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})

2
src/io/tests/hdf/CMakeLists.txt
View File

@ -28,5 +28,5 @@ TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main qmcio)
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory "${UTEST_DIR}")
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})

4
src/spline2/tests/CMakeLists.txt
View File

@ -27,6 +27,4 @@ SET(SRCS test_multi_spline.cpp)
ADD_EXECUTABLE(${UTEST_EXE} ${SRCS})
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main einspline qmcutil)
#ADD_TEST(NAME ${UTEST_NAME} COMMAND "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
#SET_TESTS_PROPERTIES(${UTEST_NAME} PROPERTIES WORKING_DIRECTORY ${UTEST_DIR})
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")

2
src/type_traits/tests/CMakeLists.txt
View File

@ -26,4 +26,4 @@ endif(QMC_CUDA)
ADD_EXECUTABLE(${UTEST_EXE} ${TEST_SRCS})
TARGET_LINK_LIBRARIES(${UTEST_EXE} catch_main containers)
ADD_UNIT_TEST(${UTEST_NAME} "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")
ADD_UNIT_TEST(${UTEST_NAME} 1 1 "${QMCPACK_UNIT_TEST_DIR}/${UTEST_EXE}")