Skip to content

Commit 6d96cc9

Browse files
committed
Update all instances of boost 1.74 to 1.87
1 parent bde18dc commit 6d96cc9

File tree

9 files changed

+12
-14
lines changed

9 files changed

+12
-14
lines changed

.github/workflows/configure_core.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ echo "Kratos build type is ${KRATOS_BUILD_TYPE}"
3636
cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
3737
${KRATOS_CMAKE_OPTIONS_FLAGS} \
3838
-DUSE_MPI=ON \
39+
-DBOOST_ROOT="/workspace/boost/boost_1_87_0" \
3940
-DCMAKE_CXX_FLAGS="${KRATOS_CMAKE_CXX_FLAGS} -O0 -Wall" \
4041
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
4142
-DTRILINOS_INCLUDE_DIR="/usr/include/trilinos" \

.github/workflows/configure_core_applications.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ echo "Kratos build type is ${KRATOS_BUILD_TYPE}"
3939
cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
4040
${KRATOS_CMAKE_OPTIONS_FLAGS} \
4141
-DUSE_MPI=ON \
42+
-DBOOST_ROOT="/workspace/boost/boost_1_87_0" \
4243
-DEXCLUDE_KRATOS_CORE=ON \
4344
-DEXCLUDE_AUTOMATIC_DEPENDENCIES=ON \
4445
-DREMOVE_INSTALL_DIRECTORIES=OFF \

.github/workflows/configure_dependencies.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ echo "Kratos build type is ${KRATOS_BUILD_TYPE}"
4040
cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
4141
${KRATOS_CMAKE_OPTIONS_FLAGS} \
4242
-DUSE_MPI=ON \
43+
-DBOOST_ROOT="/workspace/boost/boost_1_87_0" \
4344
-DEXCLUDE_KRATOS_CORE=ON \
4445
-DEXCLUDE_AUTOMATIC_DEPENDENCIES=ON \
4546
-DREMOVE_INSTALL_DIRECTORIES=OFF \

.github/workflows/configure_research_applications.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ echo "Kratos build type is ${KRATOS_BUILD_TYPE}"
5454
cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
5555
${KRATOS_CMAKE_OPTIONS_FLAGS} \
5656
-DUSE_MPI=ON \
57+
-DBOOST_ROOT="/workspace/boost/boost_1_87_0" \
5758
-DEXCLUDE_KRATOS_CORE=ON \
5859
-DEXCLUDE_AUTOMATIC_DEPENDENCIES=ON \
5960
-DREMOVE_INSTALL_DIRECTORIES=OFF \

scripts/docker_files/docker_file_wheelbuilder_linux/Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@ RUN mkdir -p /workspace/scripts; \
1414
mkdir -p /workspace/kratos; \
1515
mkdir -p /workspace/boost
1616

17-
# Install Boost (from source)
18-
# RUN git clone -b 'boost-1.74.0' --depth 1 --recurse-submodules -j24 https://github.com/boostorg/boost.git /workspace/boost/boost_1_74_0
19-
2017
# Install Boost (form zip)
21-
RUN wget -P /workspace/boost https://archives.boost.io/release/1.74.0/source/boost_1_74_0.tar.gz; \
18+
RUN wget -P /workspace/boost https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.gz; \
2219
tar -C /workspace/boost -xzf /workspace/boost/boost_1_74_0.tar.gz; \
23-
rm /workspace/boost/boost_1_74_0.tar.gz
20+
rm /workspace/boost/boost_1_87_0.tar.gz
2421

2522
# Install MMG 5.5.1
2623
# Note ( upgraded from 5.4.1 because of https://github.com/MmgTools/mmg/issues/85)

scripts/docker_files/docker_file_wheelbuilder_linux_mpi/Dockerfile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@ RUN mkdir -p /workspace/scripts; \
1414
mkdir -p /workspace/kratos; \
1515
mkdir -p /workspace/boost
1616

17-
# Install Boost (from source)
18-
# RUN git clone -b 'boost-1.74.0' --depth 1 --recurse-submodules -j24 https://github.com/boostorg/boost.git /workspace/boost/boost_1_74_0
19-
2017
# Install Boost (form zip)
21-
RUN wget -P /workspace/boost https://archives.boost.io/release/1.74.0/source/boost_1_74_0.tar.gz; \
22-
tar -C /workspace/boost -xzf /workspace/boost/boost_1_74_0.tar.gz; \
23-
rm /workspace/boost/boost_1_74_0.tar.gz
18+
RUN wget -P /workspace/boost https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.gz; \
19+
tar -C /workspace/boost -xzf /workspace/boost/boost_1_87_0.tar.gz; \
20+
rm /workspace/boost/boost_1_87_0.tar.gz
2421

2522
# Install MMG 5.5.1
2623
# Note ( upgraded from 5.4.1 because of https://github.com/MmgTools/mmg/issues/85)

scripts/docker_files/docker_file_wheelbuilder_windows/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ RUN powershell.exe -Command \
4141
#download and extract boost
4242
RUN powershell.exe -Command \
4343
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
44-
wget https://archives.boost.io/release/1.74.0/source/boost_1_74_0.zip -OutFile c:\TEMP\boost.zip; \
44+
wget https://archives.boost.io/release/1.87.0/source/boost_1_87_0.zip -OutFile c:\TEMP\boost.zip; \
4545
mkdir c:\boost; \
4646
7z x c:\TEMP\boost.zip -o"c:\boost"
4747

scripts/wheels/linux/configure.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
6969
-DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-8/root/usr/bin/g++ \
7070
-DCMAKE_CXX_FLAGS="-msse3 -std=c++11 " \
7171
-DCMAKE_C_FLAGS="-msse3" \
72-
-DBOOST_ROOT="/workspace/boost/boost_1_74_0" \
72+
-DBOOST_ROOT="/workspace/boost/boost_1_87_0" \
7373
-DLAPACK_LIBRARIES="/usr/lib64/liblapack.so.3" \
7474
-DBLAS_LIBRARIES="/usr/lib64/libblas.so.3" \
7575
-DINCLUDE_MMG=ON \

scripts/wheels/linux/configure_mpi.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \
7474
-DCMAKE_CXX_COMPILER=g++ \
7575
-DCMAKE_CXX_FLAGS="-msse3 -std=c++11 " \
7676
-DCMAKE_C_FLAGS="-msse3" \
77-
-DBOOST_ROOT="/workspace/boost/boost_1_74_0" \
77+
-DBOOST_ROOT="/workspace/boost/boost_1_87_0" \
7878
-DINCLUDE_MMG=ON \
7979
-DMMG_ROOT="/workspace/external_libraries/mmg/mmg_5_5_1" \
8080
-DKRATOS_BUILD_TESTING=OFF \

0 commit comments

Comments
 (0)