Skip to content

Commit

Permalink
Bump Boost version requirement to 1.66 (#3994)
Browse files Browse the repository at this point in the history
Fixes #3807, fixes #3093

Description of changes:
- increase Boost version to avoid singleton bug from 1.65.1
- improve parallelism of GPU integration tests
  • Loading branch information
kodiakhq[bot] authored Nov 16, 2020
2 parents 6f3239e + b274702 commit e72ee7b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
7 changes: 1 addition & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions testsuite/python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion testsuite/scripts/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit e72ee7b

Please sign in to comment.