diff --git a/.github/workflows/configure_core.sh b/.github/workflows/configure_core.sh index 60a09f792cf9..aed0cfe2c33c 100644 --- a/.github/workflows/configure_core.sh +++ b/.github/workflows/configure_core.sh @@ -36,6 +36,8 @@ echo "Kratos build type is ${KRATOS_BUILD_TYPE}" cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \ ${KRATOS_CMAKE_OPTIONS_FLAGS} \ -DUSE_MPI=ON \ +-DBOOST_ROOT="/workspace/boost/boost_1_87_0" \ +-DBoost_NO_SYSTEM_PATHS=ON \ -DCMAKE_CXX_FLAGS="${KRATOS_CMAKE_CXX_FLAGS} -O0 -Wall" \ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DTRILINOS_INCLUDE_DIR="/usr/include/trilinos" \ diff --git a/.github/workflows/configure_core_applications.sh b/.github/workflows/configure_core_applications.sh index ccb09634ed57..a0f3cc6d6bdd 100644 --- a/.github/workflows/configure_core_applications.sh +++ b/.github/workflows/configure_core_applications.sh @@ -39,6 +39,8 @@ echo "Kratos build type is ${KRATOS_BUILD_TYPE}" cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \ ${KRATOS_CMAKE_OPTIONS_FLAGS} \ -DUSE_MPI=ON \ +-DBOOST_ROOT="/workspace/boost/boost_1_87_0" \ +-DBoost_NO_SYSTEM_PATHS=ON \ -DEXCLUDE_KRATOS_CORE=ON \ -DEXCLUDE_AUTOMATIC_DEPENDENCIES=ON \ -DREMOVE_INSTALL_DIRECTORIES=OFF \ diff --git a/.github/workflows/configure_dependencies.sh b/.github/workflows/configure_dependencies.sh index e79f9411a2a6..6f7c24252fb1 100644 --- a/.github/workflows/configure_dependencies.sh +++ b/.github/workflows/configure_dependencies.sh @@ -40,6 +40,8 @@ echo "Kratos build type is ${KRATOS_BUILD_TYPE}" cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \ ${KRATOS_CMAKE_OPTIONS_FLAGS} \ -DUSE_MPI=ON \ +-DBOOST_ROOT="/workspace/boost/boost_1_87_0" \ +-DBoost_NO_SYSTEM_PATHS=ON \ -DEXCLUDE_KRATOS_CORE=ON \ -DEXCLUDE_AUTOMATIC_DEPENDENCIES=ON \ -DREMOVE_INSTALL_DIRECTORIES=OFF \ diff --git a/.github/workflows/configure_research_applications.sh b/.github/workflows/configure_research_applications.sh index 6d9ed1899a6b..3fb738658c61 100644 --- a/.github/workflows/configure_research_applications.sh +++ b/.github/workflows/configure_research_applications.sh @@ -54,6 +54,8 @@ echo "Kratos build type is ${KRATOS_BUILD_TYPE}" cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \ ${KRATOS_CMAKE_OPTIONS_FLAGS} \ -DUSE_MPI=ON \ +-DBOOST_ROOT="/workspace/boost/boost_1_87_0" \ +-DBoost_NO_SYSTEM_PATHS=ON \ -DEXCLUDE_KRATOS_CORE=ON \ -DEXCLUDE_AUTOMATIC_DEPENDENCIES=ON \ -DREMOVE_INSTALL_DIRECTORIES=OFF \ diff --git a/scripts/docker_files/docker_file_wheelbuilder_linux/Dockerfile b/scripts/docker_files/docker_file_wheelbuilder_linux/Dockerfile index dc59d217166d..f1edb55ae321 100644 --- a/scripts/docker_files/docker_file_wheelbuilder_linux/Dockerfile +++ b/scripts/docker_files/docker_file_wheelbuilder_linux/Dockerfile @@ -14,13 +14,10 @@ RUN mkdir -p /workspace/scripts; \ mkdir -p /workspace/kratos; \ mkdir -p /workspace/boost -# Install Boost (from source) -# 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 - # Install Boost (form zip) -RUN wget -P /workspace/boost https://archives.boost.io/release/1.74.0/source/boost_1_74_0.tar.gz; \ +RUN wget -P /workspace/boost https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.gz; \ tar -C /workspace/boost -xzf /workspace/boost/boost_1_74_0.tar.gz; \ - rm /workspace/boost/boost_1_74_0.tar.gz + rm /workspace/boost/boost_1_87_0.tar.gz # Install MMG 5.5.1 # Note ( upgraded from 5.4.1 because of https://github.com/MmgTools/mmg/issues/85) diff --git a/scripts/docker_files/docker_file_wheelbuilder_linux_mpi/Dockerfile b/scripts/docker_files/docker_file_wheelbuilder_linux_mpi/Dockerfile index 66ce215825df..cf642c3ab8bd 100644 --- a/scripts/docker_files/docker_file_wheelbuilder_linux_mpi/Dockerfile +++ b/scripts/docker_files/docker_file_wheelbuilder_linux_mpi/Dockerfile @@ -14,13 +14,10 @@ RUN mkdir -p /workspace/scripts; \ mkdir -p /workspace/kratos; \ mkdir -p /workspace/boost -# Install Boost (from source) -# 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 - # Install Boost (form zip) -RUN wget -P /workspace/boost https://archives.boost.io/release/1.74.0/source/boost_1_74_0.tar.gz; \ - tar -C /workspace/boost -xzf /workspace/boost/boost_1_74_0.tar.gz; \ - rm /workspace/boost/boost_1_74_0.tar.gz +RUN wget -P /workspace/boost https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.gz; \ + tar -C /workspace/boost -xzf /workspace/boost/boost_1_87_0.tar.gz; \ + rm /workspace/boost/boost_1_87_0.tar.gz # Install MMG 5.5.1 # Note ( upgraded from 5.4.1 because of https://github.com/MmgTools/mmg/issues/85) diff --git a/scripts/docker_files/docker_file_wheelbuilder_windows/Dockerfile b/scripts/docker_files/docker_file_wheelbuilder_windows/Dockerfile index 5fbe7ad03db5..b876be72c5e5 100644 --- a/scripts/docker_files/docker_file_wheelbuilder_windows/Dockerfile +++ b/scripts/docker_files/docker_file_wheelbuilder_windows/Dockerfile @@ -41,7 +41,7 @@ RUN powershell.exe -Command \ #download and extract boost RUN powershell.exe -Command \ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - wget https://archives.boost.io/release/1.74.0/source/boost_1_74_0.zip -OutFile c:\TEMP\boost.zip; \ + wget https://archives.boost.io/release/1.87.0/source/boost_1_87_0.zip -OutFile c:\TEMP\boost.zip; \ mkdir c:\boost; \ 7z x c:\TEMP\boost.zip -o"c:\boost" diff --git a/scripts/wheels/linux/configure.sh b/scripts/wheels/linux/configure.sh index 9d3e24e5b636..ac3f925485c7 100644 --- a/scripts/wheels/linux/configure.sh +++ b/scripts/wheels/linux/configure.sh @@ -69,7 +69,7 @@ cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \ -DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-8/root/usr/bin/g++ \ -DCMAKE_CXX_FLAGS="-msse3 -std=c++11 " \ -DCMAKE_C_FLAGS="-msse3" \ --DBOOST_ROOT="/workspace/boost/boost_1_74_0" \ +-DBOOST_ROOT="/workspace/boost/boost_1_87_0" \ -DLAPACK_LIBRARIES="/usr/lib64/liblapack.so.3" \ -DBLAS_LIBRARIES="/usr/lib64/libblas.so.3" \ -DINCLUDE_MMG=ON \ diff --git a/scripts/wheels/linux/configure_mpi.sh b/scripts/wheels/linux/configure_mpi.sh index 2891e45ca72f..f0c69588e806 100644 --- a/scripts/wheels/linux/configure_mpi.sh +++ b/scripts/wheels/linux/configure_mpi.sh @@ -74,7 +74,7 @@ cmake -H"${KRATOS_SOURCE}" -B"${KRATOS_BUILD}/${KRATOS_BUILD_TYPE}" \ -DCMAKE_CXX_COMPILER=g++ \ -DCMAKE_CXX_FLAGS="-msse3 -std=c++11 " \ -DCMAKE_C_FLAGS="-msse3" \ --DBOOST_ROOT="/workspace/boost/boost_1_74_0" \ +-DBOOST_ROOT="/workspace/boost/boost_1_87_0" \ -DINCLUDE_MMG=ON \ -DMMG_ROOT="/workspace/external_libraries/mmg/mmg_5_5_1" \ -DKRATOS_BUILD_TESTING=OFF \