From d0b0ae52c618c973cb7858c934f9e89117653a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Grad?= Date: Mon, 16 Nov 2020 16:01:27 +0100 Subject: [PATCH 1/2] CMake: Bump Boost version requirement to 1.66 --- CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index da6a19ff1d5..6257c7a7707 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -339,12 +339,7 @@ if(WITH_TESTS) list(APPEND BOOST_COMPONENTS unit_test_framework) endif() -set(BOOST_MINIMUM_VERSION "1.65.0") - -if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND CUDA_FOUND - AND CUDA_VERSION VERSION_GREATER_EQUAL "9.0") - set(BOOST_MINIMUM_VERSION "1.66.0") -endif() +set(BOOST_MINIMUM_VERSION "1.66.0") # old Boost.MPI versions contain a use-after-free bug that seems to only cause # crashes on 32-bit architectures From b274702078b8adb9b9d73b68fccf63b200eff239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Grad?= Date: Mon, 16 Nov 2020 16:18:45 +0100 Subject: [PATCH 2/2] CMake: Fix GPU tests logic Use RESOURCE_LOCK GPU instead of RUN_SERIAL ON to run GPU tests in parallel to CPU tests. Disable this resource lock for builds without CUDA. --- testsuite/python/CMakeLists.txt | 4 ++-- testsuite/scripts/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testsuite/python/CMakeLists.txt b/testsuite/python/CMakeLists.txt index 3b1c0444bc9..a58265ed8f2 100644 --- a/testsuite/python/CMakeLists.txt +++ b/testsuite/python/CMakeLists.txt @@ -36,8 +36,8 @@ function(PYTHON_TEST) set_tests_properties(${TEST_NAME} PROPERTIES PROCESSORS ${TEST_NUM_PROC} DEPENDS "${TEST_DEPENDS}") - if("gpu" IN_LIST TEST_LABELS) - set_tests_properties(${TEST_NAME} PROPERTIES RUN_SERIAL ON) + if("gpu" IN_LIST TEST_LABELS AND WITH_CUDA) + set_tests_properties(${TEST_NAME} PROPERTIES RESOURCE_LOCK GPU) endif() if(${TEST_MAX_NUM_PROC} LESS 2) diff --git a/testsuite/scripts/CMakeLists.txt b/testsuite/scripts/CMakeLists.txt index 3b947563087..f2cb58b42c1 100644 --- a/testsuite/scripts/CMakeLists.txt +++ b/testsuite/scripts/CMakeLists.txt @@ -23,7 +23,7 @@ macro(PYTHON_SCRIPTS_TEST) set_tests_properties(${TEST_NAME} PROPERTIES FIXTURES_REQUIRED IMPORTLIB_WRAPPER) set_tests_properties(${TEST_NAME} PROPERTIES LABELS "${TEST_LABELS}") - if("gpu" IN_LIST TEST_LABELS) + if("gpu" IN_LIST TEST_LABELS AND WITH_CUDA) set_tests_properties(${TEST_NAME} PROPERTIES RESOURCE_LOCK GPU) endif() endmacro(PYTHON_SCRIPTS_TEST)