From: bangerth Date: Tue, 29 Apr 2014 03:12:22 +0000 (+0000) Subject: Augment documentation. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a7289966818b5a5f0f118f960bffc642549a8bc;p=dealii-svn.git Augment documentation. git-svn-id: https://svn.dealii.org/trunk@32856 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/macros/macro_add_test.cmake b/deal.II/cmake/macros/macro_add_test.cmake index cc47fb41d1..bf41cec0bd 100644 --- a/deal.II/cmake/macros/macro_add_test.cmake +++ b/deal.II/cmake/macros/macro_add_test.cmake @@ -258,11 +258,16 @@ MACRO(DEAL_II_ADD_TEST _category _test_name _comparison_file) TIMEOUT ${TEST_TIME_LIMIT} ) - IF(_n_cpu GREATER 4) + # + # Limit concurrency of mpi tests. We can only set concurrency + # for the entire test, which includes the compiling and linking + # stages that are purely sequential. There is no good way to model + # this without unnecessarily restricting concurrency. Consequently, + # we just choose to model an "average" concurrency as one half of + # the number of MPI jobs. + # + IF(_n_cpu GREATER 2) MATH(EXPR _slots "${_n_cpu} / 2") - # - # Limit concurrency of mpi tests: - # SET_TESTS_PROPERTIES(${_test_full} PROPERTIES PROCESSORS ${_slots}) ENDIF()