From 6c94d68be976928c8ee370f3a85c49b67ab083ec Mon Sep 17 00:00:00 2001 From: Bernhard Manfred Gruber Date: Mon, 1 Nov 2021 11:41:16 +0100 Subject: [PATCH] require at least boost 1.66 --- INSTALL.rst | 8 ++++---- etc/picongpu/lawrencium-lbnl/picongpu.profile.example | 4 ++-- etc/picongpu/pizdaint-cscs/picongpu.profile.example | 2 +- include/mpiInfo/CMakeLists.txt | 2 +- include/picongpu/CMakeLists.txt | 2 +- include/pmacc/PMaccConfig.cmake | 2 +- share/ci/n_wise_generator.py | 2 +- share/pmacc/examples/gameOfLife2D/CMakeLists.txt | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/INSTALL.rst b/INSTALL.rst index b48cb4c529..c97b147050 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -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``) diff --git a/etc/picongpu/lawrencium-lbnl/picongpu.profile.example b/etc/picongpu/lawrencium-lbnl/picongpu.profile.example index 83a34a1876..f2bab202e2 100644 --- a/etc/picongpu/lawrencium-lbnl/picongpu.profile.example +++ b/etc/picongpu/lawrencium-lbnl/picongpu.profile.example @@ -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 diff --git a/etc/picongpu/pizdaint-cscs/picongpu.profile.example b/etc/picongpu/pizdaint-cscs/picongpu.profile.example index 66bd6248c5..be73a8bee1 100644 --- a/etc/picongpu/pizdaint-cscs/picongpu.profile.example +++ b/etc/picongpu/pizdaint-cscs/picongpu.profile.example @@ -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 diff --git a/include/mpiInfo/CMakeLists.txt b/include/mpiInfo/CMakeLists.txt index ffabfe85c5..61d82b789f 100644 --- a/include/mpiInfo/CMakeLists.txt +++ b/include/mpiInfo/CMakeLists.txt @@ -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() diff --git a/include/picongpu/CMakeLists.txt b/include/picongpu/CMakeLists.txt index 80764ad4bb..e8e3620da7 100644 --- a/include/picongpu/CMakeLists.txt +++ b/include/picongpu/CMakeLists.txt @@ -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 diff --git a/include/pmacc/PMaccConfig.cmake b/include/pmacc/PMaccConfig.cmake index 6313f0c245..d4b92c8a38 100644 --- a/include/pmacc/PMaccConfig.cmake +++ b/include/pmacc/PMaccConfig.cmake @@ -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) diff --git a/share/ci/n_wise_generator.py b/share/ci/n_wise_generator.py index f89f5d565b..6dfd7c7fd7 100755 --- a/share/ci/n_wise_generator.py +++ b/share/ci/n_wise_generator.py @@ -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"] diff --git a/share/pmacc/examples/gameOfLife2D/CMakeLists.txt b/share/pmacc/examples/gameOfLife2D/CMakeLists.txt index 798d2646ab..1b2ba70592 100644 --- a/share/pmacc/examples/gameOfLife2D/CMakeLists.txt +++ b/share/pmacc/examples/gameOfLife2D/CMakeLists.txt @@ -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})