Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Boost version requirement to 1.66 #3994

Merged
merged 2 commits into from
Nov 16, 2020
+4 −9
Merged

Bump Boost version requirement to 1.66 #3994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0b0ae5
CMake: Bump Boost version requirement to 1.66
jngrad Nov 16, 2020
b274702
CMake: Fix GPU tests logic
jngrad Nov 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions CMakeLists.txt
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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