Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/configure_core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/configure_core_applications.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/configure_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/configure_research_applications.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion scripts/wheels/linux/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion scripts/wheels/linux/configure_mpi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down