Skip to content

Upgrade to Boost 1.66 #3939

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

Merged
merged 1 commit into from
Dec 17, 2021
Merged

Upgrade to Boost 1.66 #3939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions INSTALL.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,15 @@ zlib

boost
"""""
- 1.65.1 - 1.74.0 (``program_options``, ``filesystem``, ``system``, ``math``, ``serialization`` and header-only libs, optional: ``fiber`` with ``context``, ``thread``, ``chrono``, ``atomic``, ``date_time``)
- 1.66.0 - 1.74.0 (``program_options``, ``filesystem``, ``system``, ``math``, ``serialization`` and header-only libs, optional: ``fiber`` with ``context``, ``thread``, ``chrono``, ``atomic``, ``date_time``)
- *Debian/Ubuntu:* ``sudo apt-get install libboost-program-options-dev libboost-filesystem-dev libboost-system-dev libboost-thread-dev libboost-chrono-dev libboost-atomic-dev libboost-date-time-dev libboost-math-dev libboost-serialization-dev libboost-fiber-dev libboost-context-dev``
- *Arch Linux:* ``sudo pacman --sync boost``
- *Spack:* ``spack install boost``
- *from source:*

- ``curl -Lo boost_1_65_1.tar.gz https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.gz``
- ``tar -xzf boost_1_65_1.tar.gz``
- ``cd boost_1_65_1``
- ``curl -Lo boost_1_66_0.tar.gz https://boostorg.jfrog.io/ui/native/main/release/1.66.0/source/boost_1_66_0.tar.gz``
- ``tar -xzf boost_1_66_0.tar.gz``
- ``cd boost_1_66_0``
- ``./bootstrap.sh --with-libraries=atomic,chrono,context,date_time,fiber,filesystem,math,program_options,serialization,system,thread --prefix=$HOME/lib/boost``
- ``./b2 cxxflags="-std=c++11" -j4 && ./b2 install``
- *environment:* (assumes install from source in ``$HOME/lib/boost``)
Expand Down
4 changes: 2 additions & 2 deletions etc/picongpu/lawrencium-lbnl/picongpu.profile.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ then
# Core Dependencies
module load gcc
module load cuda
echo "WARNING: Boost version is too old! (Need: 1.65.1+)" >&2
# module load boost/1.65.1-gcc
echo "WARNING: Boost version is too old! (Need: 1.66.0+)" >&2
# module load boost/1.66.0-gcc
module load openmpi/1.6.5-gcc

# Core tools
Expand Down
2 changes: 1 addition & 1 deletion etc/picongpu/pizdaint-cscs/picongpu.profile.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ module load cray-hdf5-parallel/1.10.0.3
#
# needs to be compiled by the user
export PIC_LIBS="$HOME/lib"
export BOOST_ROOT=$PIC_LIBS/boost-1.65.1
export BOOST_ROOT=$PIC_LIBS/boost-1.66.0
export ZLIB_ROOT=$PIC_LIBS/zlib-1.2.11
export PNG_ROOT=$PIC_LIBS/libpng-1.6.34
export BLOSC_ROOT=$PIC_LIBS/blosc-1.12.1
Expand Down
2 changes: 1 addition & 1 deletion include/mpiInfo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ endif(MPI_CXX_FOUND)
# Find Boost
################################################################################

find_package(Boost 1.65.1 REQUIRED COMPONENTS program_options)
find_package(Boost 1.66.0 REQUIRED COMPONENTS program_options)
if(TARGET Boost::program_options)
set(MPIINFO_LIBS ${MPIINFO_LIBS} Boost::boost Boost::program_options)
else()
Expand Down
2 changes: 1 addition & 1 deletion include/picongpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ endif()
# Find Boost
################################################################################

find_package(Boost 1.65.1 REQUIRED COMPONENTS program_options filesystem
find_package(Boost 1.66.0 REQUIRED COMPONENTS program_options filesystem
system math_tr1 serialization)
if(TARGET Boost::program_options)
set(HOST_LIBS ${HOST_LIBS} Boost::boost Boost::program_options
Expand Down
2 changes: 1 addition & 1 deletion include/pmacc/PMaccConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ endif(MPI_CXX_FOUND)
# Find Boost
################################################################################

find_package(Boost 1.65.1 REQUIRED COMPONENTS filesystem system math_tr1)
find_package(Boost 1.66 REQUIRED COMPONENTS filesystem system math_tr1)
if(TARGET Boost::filesystem)
set(PMacc_LIBRARIES ${PMacc_LIBRARIES} Boost::boost Boost::filesystem
Boost::system Boost::math_tr1)
Expand Down
2 changes: 1 addition & 1 deletion share/ci/n_wise_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ def is_valid_combination(row):
("cuda", 11.0), ("cuda", 11.1), ("cuda", 11.2),
("omp2b", ), ("serial", )]

boost_libs_all = ["1.65.1", "1.66.0", "1.67.0", "1.68.0",
boost_libs_all = ["1.66.0", "1.67.0", "1.68.0",
"1.69.0", "1.70.0", "1.71.0", "1.72.0",
"1.73.0", "1.74.0", "1.75.0"]

Expand Down
2 changes: 1 addition & 1 deletion share/pmacc/examples/gameOfLife2D/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ endif(GOL_RELEASE)
# Find Boost
###############################################################################

find_package(Boost 1.65.1 REQUIRED COMPONENTS program_options)
find_package(Boost 1.66.0 REQUIRED COMPONENTS program_options)
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
set(LIBS ${LIBS} ${Boost_LIBRARIES})

Expand Down