From 90984c26929bec17306bc7c03e078f06e2b25f3c Mon Sep 17 00:00:00 2001 From: Ye Luo Date: Mon, 15 Feb 2021 01:04:07 -0600 Subject: [PATCH] Lock gpu resource when offlaod is enabled. --- CMake/macros.cmake | 7 ++- CMake/unit_test.cmake | 49 +++++++++---------- src/AFQMC/Estimators/tests/CMakeLists.txt | 2 +- .../tests/CMakeLists.txt | 4 +- src/AFQMC/Hamiltonians/tests/CMakeLists.txt | 8 +-- src/AFQMC/Matrix/tests/CMakeLists.txt | 3 +- src/AFQMC/Numerics/shm_tests/CMakeLists.txt | 3 +- src/AFQMC/Numerics/tests/CMakeLists.txt | 2 +- src/AFQMC/Propagators/tests/CMakeLists.txt | 2 +- .../tests/CMakeLists.txt | 2 +- src/AFQMC/Walkers/tests/CMakeLists.txt | 3 +- src/AFQMC/Wavefunctions/tests/CMakeLists.txt | 4 +- src/Concurrency/tests/CMakeLists.txt | 2 +- .../MinimalContainers/tests/CMakeLists.txt | 2 +- src/Containers/OhmmsPETE/tests/CMakeLists.txt | 2 +- src/Containers/OhmmsSoA/tests/CMakeLists.txt | 3 +- src/Estimators/tests/CMakeLists.txt | 4 +- src/Message/tests/CMakeLists.txt | 4 +- src/Numerics/tests/CMakeLists.txt | 4 +- src/Optimize/tests/CMakeLists.txt | 2 +- src/Particle/Lattice/tests/CMakeLists.txt | 3 +- src/Particle/LongRange/tests/CMakeLists.txt | 3 +- .../ParticleBase/tests/CMakeLists.txt | 3 +- src/Particle/ParticleIO/tests/CMakeLists.txt | 2 +- src/Particle/tests/CMakeLists.txt | 2 +- src/Platforms/tests/CPU/CMakeLists.txt | 2 +- src/Platforms/tests/CUDA/CMakeLists.txt | 2 +- src/Platforms/tests/OMPTarget/CMakeLists.txt | 2 +- src/QMCApp/tests/CMakeLists.txt | 2 +- src/QMCDrivers/tests/CMakeLists.txt | 6 +-- src/QMCHamiltonians/tests/CMakeLists.txt | 3 +- src/QMCTools/tests/CMakeLists.txt | 2 +- src/QMCWaveFunctions/tests/CMakeLists.txt | 2 +- src/Utilities/tests/CMakeLists.txt | 3 +- src/einspline/tests/CMakeLists.txt | 3 +- src/io/tests/OhmmsData/CMakeLists.txt | 4 +- src/io/tests/hdf/CMakeLists.txt | 2 +- src/spline2/tests/CMakeLists.txt | 4 +- src/type_traits/tests/CMakeLists.txt | 2 +- 39 files changed, 76 insertions(+), 88 deletions(-) diff --git a/CMake/macros.cmake b/CMake/macros.cmake index 128480d72..b491a86a4 100644 --- a/CMake/macros.cmake +++ b/CMake/macros.cmake @@ -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 ) diff --git a/CMake/unit_test.cmake b/CMake/unit_test.cmake index 67133607a..7a6ec0854 100644 --- a/CMake/unit_test.cmake +++ b/CMake/unit_test.cmake @@ -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() diff --git a/src/AFQMC/Estimators/tests/CMakeLists.txt b/src/AFQMC/Estimators/tests/CMakeLists.txt index fd3ae6c93..ae0e91e6d 100644 --- a/src/AFQMC/Estimators/tests/CMakeLists.txt +++ b/src/AFQMC/Estimators/tests/CMakeLists.txt @@ -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") diff --git a/src/AFQMC/HamiltonianOperations/tests/CMakeLists.txt b/src/AFQMC/HamiltonianOperations/tests/CMakeLists.txt index 376922973..6106286c8 100644 --- a/src/AFQMC/HamiltonianOperations/tests/CMakeLists.txt +++ b/src/AFQMC/HamiltonianOperations/tests/CMakeLists.txt @@ -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() diff --git a/src/AFQMC/Hamiltonians/tests/CMakeLists.txt b/src/AFQMC/Hamiltonians/tests/CMakeLists.txt index 4f7d8cd57..024d688a5 100644 --- a/src/AFQMC/Hamiltonians/tests/CMakeLists.txt +++ b/src/AFQMC/Hamiltonians/tests/CMakeLists.txt @@ -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") diff --git a/src/AFQMC/Matrix/tests/CMakeLists.txt b/src/AFQMC/Matrix/tests/CMakeLists.txt index 82d84dd7d..f2455fb94 100644 --- a/src/AFQMC/Matrix/tests/CMakeLists.txt +++ b/src/AFQMC/Matrix/tests/CMakeLists.txt @@ -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") - diff --git a/src/AFQMC/Numerics/shm_tests/CMakeLists.txt b/src/AFQMC/Numerics/shm_tests/CMakeLists.txt index 6fcd27358..739d51a23 100644 --- a/src/AFQMC/Numerics/shm_tests/CMakeLists.txt +++ b/src/AFQMC/Numerics/shm_tests/CMakeLists.txt @@ -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") diff --git a/src/AFQMC/Numerics/tests/CMakeLists.txt b/src/AFQMC/Numerics/tests/CMakeLists.txt index 14c045ca4..b2672a905 100644 --- a/src/AFQMC/Numerics/tests/CMakeLists.txt +++ b/src/AFQMC/Numerics/tests/CMakeLists.txt @@ -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") diff --git a/src/AFQMC/Propagators/tests/CMakeLists.txt b/src/AFQMC/Propagators/tests/CMakeLists.txt index e08fb130b..b32eaff1b 100644 --- a/src/AFQMC/Propagators/tests/CMakeLists.txt +++ b/src/AFQMC/Propagators/tests/CMakeLists.txt @@ -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") diff --git a/src/AFQMC/SlaterDeterminantOperations/tests/CMakeLists.txt b/src/AFQMC/SlaterDeterminantOperations/tests/CMakeLists.txt index 95e4ade7c..ecf095192 100644 --- a/src/AFQMC/SlaterDeterminantOperations/tests/CMakeLists.txt +++ b/src/AFQMC/SlaterDeterminantOperations/tests/CMakeLists.txt @@ -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") diff --git a/src/AFQMC/Walkers/tests/CMakeLists.txt b/src/AFQMC/Walkers/tests/CMakeLists.txt index b4d0e5ba2..21cdd31e1 100644 --- a/src/AFQMC/Walkers/tests/CMakeLists.txt +++ b/src/AFQMC/Walkers/tests/CMakeLists.txt @@ -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") - diff --git a/src/AFQMC/Wavefunctions/tests/CMakeLists.txt b/src/AFQMC/Wavefunctions/tests/CMakeLists.txt index 603cef5a5..d65d4bd8c 100644 --- a/src/AFQMC/Wavefunctions/tests/CMakeLists.txt +++ b/src/AFQMC/Wavefunctions/tests/CMakeLists.txt @@ -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}) diff --git a/src/Concurrency/tests/CMakeLists.txt b/src/Concurrency/tests/CMakeLists.txt index 747a85ea4..c54275e85 100644 --- a/src/Concurrency/tests/CMakeLists.txt +++ b/src/Concurrency/tests/CMakeLists.txt @@ -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}") diff --git a/src/Containers/MinimalContainers/tests/CMakeLists.txt b/src/Containers/MinimalContainers/tests/CMakeLists.txt index 54e88c914..31a021f0d 100644 --- a/src/Containers/MinimalContainers/tests/CMakeLists.txt +++ b/src/Containers/MinimalContainers/tests/CMakeLists.txt @@ -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}") diff --git a/src/Containers/OhmmsPETE/tests/CMakeLists.txt b/src/Containers/OhmmsPETE/tests/CMakeLists.txt index eff6845f1..df5761974 100644 --- a/src/Containers/OhmmsPETE/tests/CMakeLists.txt +++ b/src/Containers/OhmmsPETE/tests/CMakeLists.txt @@ -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}") diff --git a/src/Containers/OhmmsSoA/tests/CMakeLists.txt b/src/Containers/OhmmsSoA/tests/CMakeLists.txt index ae91272ad..2645e8aaa 100644 --- a/src/Containers/OhmmsSoA/tests/CMakeLists.txt +++ b/src/Containers/OhmmsSoA/tests/CMakeLists.txt @@ -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}") diff --git a/src/Estimators/tests/CMakeLists.txt b/src/Estimators/tests/CMakeLists.txt index 15b6bc743..1e88b7382 100644 --- a/src/Estimators/tests/CMakeLists.txt +++ b/src/Estimators/tests/CMakeLists.txt @@ -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() diff --git a/src/Message/tests/CMakeLists.txt b/src/Message/tests/CMakeLists.txt index d35e4b9dc..23c62d6c9 100644 --- a/src/Message/tests/CMakeLists.txt +++ b/src/Message/tests/CMakeLists.txt @@ -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) diff --git a/src/Numerics/tests/CMakeLists.txt b/src/Numerics/tests/CMakeLists.txt index 7cc86c9a8..edf64d0cf 100644 --- a/src/Numerics/tests/CMakeLists.txt +++ b/src/Numerics/tests/CMakeLists.txt @@ -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}") diff --git a/src/Optimize/tests/CMakeLists.txt b/src/Optimize/tests/CMakeLists.txt index 524ca9435..85ea191e7 100644 --- a/src/Optimize/tests/CMakeLists.txt +++ b/src/Optimize/tests/CMakeLists.txt @@ -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}") diff --git a/src/Particle/Lattice/tests/CMakeLists.txt b/src/Particle/Lattice/tests/CMakeLists.txt index 2c708d084..00c7751e0 100644 --- a/src/Particle/Lattice/tests/CMakeLists.txt +++ b/src/Particle/Lattice/tests/CMakeLists.txt @@ -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}") diff --git a/src/Particle/LongRange/tests/CMakeLists.txt b/src/Particle/LongRange/tests/CMakeLists.txt index 95868edc1..2d4842b95 100644 --- a/src/Particle/LongRange/tests/CMakeLists.txt +++ b/src/Particle/LongRange/tests/CMakeLists.txt @@ -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}") diff --git a/src/Particle/ParticleBase/tests/CMakeLists.txt b/src/Particle/ParticleBase/tests/CMakeLists.txt index d9be38a81..4e6e37a4a 100644 --- a/src/Particle/ParticleBase/tests/CMakeLists.txt +++ b/src/Particle/ParticleBase/tests/CMakeLists.txt @@ -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}") diff --git a/src/Particle/ParticleIO/tests/CMakeLists.txt b/src/Particle/ParticleIO/tests/CMakeLists.txt index bf9cc3f72..d74412622 100644 --- a/src/Particle/ParticleIO/tests/CMakeLists.txt +++ b/src/Particle/ParticleIO/tests/CMakeLists.txt @@ -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}") diff --git a/src/Particle/tests/CMakeLists.txt b/src/Particle/tests/CMakeLists.txt index e15b35634..a70da3e50 100644 --- a/src/Particle/tests/CMakeLists.txt +++ b/src/Particle/tests/CMakeLists.txt @@ -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}") diff --git a/src/Platforms/tests/CPU/CMakeLists.txt b/src/Platforms/tests/CPU/CMakeLists.txt index e84d02848..151129bde 100644 --- a/src/Platforms/tests/CPU/CMakeLists.txt +++ b/src/Platforms/tests/CPU/CMakeLists.txt @@ -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}") diff --git a/src/Platforms/tests/CUDA/CMakeLists.txt b/src/Platforms/tests/CUDA/CMakeLists.txt index f2f4bb0dc..06ada396a 100644 --- a/src/Platforms/tests/CUDA/CMakeLists.txt +++ b/src/Platforms/tests/CUDA/CMakeLists.txt @@ -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}") diff --git a/src/Platforms/tests/OMPTarget/CMakeLists.txt b/src/Platforms/tests/OMPTarget/CMakeLists.txt index 9ae9347b6..25962f910 100644 --- a/src/Platforms/tests/OMPTarget/CMakeLists.txt +++ b/src/Platforms/tests/OMPTarget/CMakeLists.txt @@ -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) diff --git a/src/QMCApp/tests/CMakeLists.txt b/src/QMCApp/tests/CMakeLists.txt index a8ac0ca97..62ee98059 100644 --- a/src/QMCApp/tests/CMakeLists.txt +++ b/src/QMCApp/tests/CMakeLists.txt @@ -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}") diff --git a/src/QMCDrivers/tests/CMakeLists.txt b/src/QMCDrivers/tests/CMakeLists.txt index 98fd7b3b3..3dfcd4fe6 100644 --- a/src/QMCDrivers/tests/CMakeLists.txt +++ b/src/QMCDrivers/tests/CMakeLists.txt @@ -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) diff --git a/src/QMCHamiltonians/tests/CMakeLists.txt b/src/QMCHamiltonians/tests/CMakeLists.txt index b87faf228..3d2b2bfcb 100644 --- a/src/QMCHamiltonians/tests/CMakeLists.txt +++ b/src/QMCHamiltonians/tests/CMakeLists.txt @@ -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}) diff --git a/src/QMCTools/tests/CMakeLists.txt b/src/QMCTools/tests/CMakeLists.txt index 1cbf17b26..d187c7529 100644 --- a/src/QMCTools/tests/CMakeLists.txt +++ b/src/QMCTools/tests/CMakeLists.txt @@ -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}) diff --git a/src/QMCWaveFunctions/tests/CMakeLists.txt b/src/QMCWaveFunctions/tests/CMakeLists.txt index 2e9bcf904..e1316bbc9 100644 --- a/src/QMCWaveFunctions/tests/CMakeLists.txt +++ b/src/QMCWaveFunctions/tests/CMakeLists.txt @@ -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() diff --git a/src/Utilities/tests/CMakeLists.txt b/src/Utilities/tests/CMakeLists.txt index 3d1b833c6..a392255aa 100644 --- a/src/Utilities/tests/CMakeLists.txt +++ b/src/Utilities/tests/CMakeLists.txt @@ -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}") diff --git a/src/einspline/tests/CMakeLists.txt b/src/einspline/tests/CMakeLists.txt index 2ae65c123..f339f033e 100644 --- a/src/einspline/tests/CMakeLists.txt +++ b/src/einspline/tests/CMakeLists.txt @@ -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}") diff --git a/src/io/tests/OhmmsData/CMakeLists.txt b/src/io/tests/OhmmsData/CMakeLists.txt index b8bddfc8d..575e5be4f 100644 --- a/src/io/tests/OhmmsData/CMakeLists.txt +++ b/src/io/tests/OhmmsData/CMakeLists.txt @@ -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}) diff --git a/src/io/tests/hdf/CMakeLists.txt b/src/io/tests/hdf/CMakeLists.txt index 42a4390ff..14957deff 100644 --- a/src/io/tests/hdf/CMakeLists.txt +++ b/src/io/tests/hdf/CMakeLists.txt @@ -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}) diff --git a/src/spline2/tests/CMakeLists.txt b/src/spline2/tests/CMakeLists.txt index a7b3ff921..947a2d250 100644 --- a/src/spline2/tests/CMakeLists.txt +++ b/src/spline2/tests/CMakeLists.txt @@ -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}") diff --git a/src/type_traits/tests/CMakeLists.txt b/src/type_traits/tests/CMakeLists.txt index 6c699dc53..82dbadb9a 100644 --- a/src/type_traits/tests/CMakeLists.txt +++ b/src/type_traits/tests/CMakeLists.txt @@ -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}")