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

[ci] update libboost version from 1.74 to 1.83 #6582

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

[ci] update libboost version from 1.74 to 1.83 #6582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
98fa5da
update boost
StrikerRUS Jul 30, 2024
d656b75
update boost in integrated opencl
StrikerRUS Jul 30, 2024
6432925
Update IntegratedOpenCL.cmake
StrikerRUS Jul 30, 2024
b8241fd
Update IntegratedOpenCL.cmake
StrikerRUS Jul 30, 2024
355e26d
64bit build
StrikerRUS Jul 31, 2024
c6ed624
try architecture
StrikerRUS Jul 31, 2024
01555d6
try abbreviate-paths
StrikerRUS Jul 31, 2024
955e32b
try no threading
StrikerRUS Jul 31, 2024
83d6c27
Update IntegratedOpenCL.cmake
StrikerRUS Jul 31, 2024
3b08215
set address-model
StrikerRUS Aug 7, 2024
144f092
Merge branch 'master' into ci/libboost
StrikerRUS Aug 7, 2024
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: 5 additions & 2 deletions .ci/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,13 @@ else # Linux
fi
if [[ $TASK == "gpu" ]]; then
if [[ $IN_UBUNTU_BASE_CONTAINER == "true" ]]; then
sudo apt-get install --no-install-recommends -y \
gpg-agent
sudo add-apt-repository ppa:mhier/libboost-latest -y
sudo apt-get update
sudo apt-get install --no-install-recommends -y \
libboost1.74-dev \
libboost-filesystem1.74-dev \
libboost1.83-dev \
libboost-filesystem1.83-dev \
ocl-icd-opencl-dev
else # in manylinux image
sudo yum update -y
Expand Down
10 changes: 9 additions & 1 deletion cmake/IntegratedOpenCL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
set(BOOST_VERSION_DOT "1.74")
set(BOOST_VERSION_DOT "1.83")
string(REPLACE "." "_" BOOST_VERSION_UNDERSCORE ${BOOST_VERSION_DOT})

set(OPENCL_HEADER_REPOSITORY "https://github.com/KhronosGroup/OpenCL-Headers.git")
Expand Down Expand Up @@ -64,6 +64,7 @@ ProcessorCount(J)
set(BOOST_BASE "${PROJECT_BINARY_DIR}/Boost")
set(BOOST_INCLUDE "${BOOST_BASE}/source" CACHE PATH "")
set(BOOST_LIBRARY "${BOOST_BASE}/source/stage/lib" CACHE PATH "")
set(BOOST_ADDRESS_MODEL 64)
if(WIN32)
if(MSVC)
if(${MSVC_VERSION} GREATER 1929)
Expand All @@ -77,6 +78,9 @@ if(WIN32)
else()
message(FATAL_ERROR "Unrecognized MSVC version number: ${MSVC_VERSION}")
endif()
if("${CMAKE_GENERATOR_PLATFORM}" MATCHES "Win32")
set(BOOST_ADDRESS_MODEL 32)
endif()
list(
APPEND
BOOST_BUILD_BYPRODUCTS
Expand Down Expand Up @@ -110,6 +114,7 @@ list(
"libs/any"
"libs/array"
"libs/assert"
"libs/atomic"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Starting from 1.77 filesystem module requires atomic module
https://github.com/boostorg/filesystem/blob/9794725bda2e612f1fdcadd98cdce5b7bfb548f1/CMakeLists.txt#L180

"libs/bind"
"libs/chrono"
"libs/compute"
Expand All @@ -118,6 +123,7 @@ list(
"libs/container"
"libs/container_hash"
"libs/core"
"libs/describe"
"libs/detail"
"libs/filesystem"
"libs/foreach"
Expand All @@ -132,6 +138,7 @@ list(
"libs/lexical_cast"
"libs/math"
"libs/move"
"libs/mp11"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Starting from 1.81 container_hash module requires describe and mp11 modules
https://github.com/boostorg/container_hash/blob/bd5b7a359c285a65836674d963e1137b067983ac/CMakeLists.txt#L18-L19

"libs/mpl"
"libs/multi_index"
"libs/numeric/conversion"
Expand Down Expand Up @@ -185,6 +192,7 @@ ExternalProject_Add(
runtime-link=shared
variant=release
threading=multi
address-model=${BOOST_ADDRESS_MODEL}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To fix the following error on Windows:

CUSTOMBUILD : error : Name clash for '<pC:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost\source\stage\lib>libboost_chrono-vc142-mt-1_83.lib' [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error :  [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error : Tried to build the target twice, with property sets having [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error : these incompatible properties: [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error :  [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error : -  <address-model>32 [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error : -  <address-model>64 [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error :  [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error : Please make sure to have consistent requirements for these [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error : properties everywhere in your project, especially for install [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]
CUSTOMBUILD : error : targets. [C:\Users\VssAdministrator\tmp\tmpgmzb0fzs\build\Boost.vcxproj]

cxxflags="${BOOST_FLAGS}"
INSTALL_COMMAND ""
# BUILD_BYPRODUCTS is necessary to support 'Ninja' builds.
Expand Down
Loading