Commit dd40b787 authored by Michael Kuron's avatar Michael Kuron 💡

Fix build errors with new Docker images

parent 02f72876
Pipeline #2933 failed with stages
in 31 minutes and 32 seconds
......@@ -38,10 +38,11 @@ maxset:
- export with_cuda=false myconfig=maxset with_coverage=true
- bash maintainer/CI/build_cmake.sh
maxset_python3:
maxset-python3:
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/ubuntu-python3:18.04
script:
- export with_cuda=false myconfig=maxset with_coverage=true python_version=3
- export myconfig=maxset with_coverage=true python_version=3
- bash maintainer/CI/build_cmake.sh
nocheckmaxset:
......@@ -160,14 +161,21 @@ clang:6.0:
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/$CI_JOB_NAME
script:
- export myconfig=maxset with_coverage=true with_static_analysis=true
- export myconfig=maxset with_coverage=false with_static_analysis=true
- bash maintainer/cuda_build.sh
intel:15:
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/$CI_JOB_NAME
script:
- export myconfig=maxset with_coverage=true
- export myconfig=maxset with_coverage=false
- bash maintainer/cuda_build.sh
intel:17:
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/$CI_JOB_NAME
script:
- export myconfig=maxset with_coverage=false
- bash maintainer/cuda_build.sh
### Other builds
......
......@@ -298,6 +298,9 @@ endif()
if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
set(BOOST_MINIMUM_VERSION "1.65.0")
if (CUDA_FOUND AND NOT CUDA_VERSION VERSION_LESS "9.0")
set(BOOST_MINIMUM_VERSION "1.66.0")
endif()
else()
set(BOOST_MINIMUM_VERSION "1.53.0")
endif()
......@@ -355,7 +358,7 @@ endif()
if(WARNINGS_ARE_ERRORS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
if (NOT CUDA_NVCC_EXECUTABLE STREQUAL CMAKE_C_COMPILER AND NOT CUDA_NVCC_EXECUTABLE STREQUAL CMAKE_CXX_COMPILER)
if (NOT CUDA_NVCC_EXECUTABLE STREQUAL CMAKE_CXX_COMPILER)
set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -Xcompiler -Werror")
endif()
endif(WARNINGS_ARE_ERRORS)
......@@ -386,7 +389,7 @@ if( WITH_CLANG_TIDY )
message(STATUS "clang-tidy not found.")
else()
message(STATUS "clang-tidy found: ${CLANG_TIDY_EXE}")
set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_EXE}" "-checks=*,-clang-analyzer-alpha.*,-misc-unused-*,-google-*,-llvm-*,-modernize-*,-readability-*,-cppcoreguidelines-*,-clang-analyzer-deadcode*,-cert-*,-clang-analyzer-core.NullDereference,-clang-analyzer-core.DivideZero,-misc-misplaced-widening-cast,-misc-macro-parentheses,-clang-analyzer-security.FloatLoopCounter,-clang-analyzer-optin.mpi.MPI-Checker,-boost-use-to-string" "-header-filter=.*" "-warnings-as-errors=*")
set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_EXE}" "-checks=*,-clang-analyzer-alpha.*,-misc-unused-*,-fuchsia-*,-google-*,-llvm-*,-modernize-*,-readability-*,-cppcoreguidelines-*,-clang-analyzer-deadcode*,-cert-*,-clang-analyzer-core.NullDereference,-clang-analyzer-core.DivideZero,-misc-misplaced-widening-cast,-misc-macro-parentheses,-clang-analyzer-security.FloatLoopCounter,-boost-use-to-string,-hicpp-*" "-header-filter=.*" "-warnings-as-errors=*")
endif()
endif()
......
Subproject commit 89d8d435872ec77dd931e709df98eefac8cbc925
Subproject commit a9ae888a0a19046fded704d9db3c9f5fe1ad5d07
......@@ -72,7 +72,18 @@ outp insource srcdir builddir make_check \
python_version with_cuda
# check indentation of python files
pep8 --filename=*.pyx,*.pxd,*.py --select=E111 $srcdir/src/python/espressomd/
pep8_command () {
if hash pep8 2> /dev/null; then
pep8 "$@"
elif hash pycodestyle 2> /dev/null; then
pycodestyle "$@"
else
echo "pep8 not found";
exit 1
fi
}
pep8_command --filename=*.pyx,*.pxd,*.py --select=E111 $srcdir/src/python/espressomd/
ec=$?
if [ $ec -eq 0 ]; then
echo ""
......@@ -90,6 +101,10 @@ pylint_command () {
pylint "$@"
elif hash pylint3 2> /dev/null; then
pylint3 "$@"
elif hash pylint-2 2> /dev/null; then
pylint-2 "$@"
elif hash pylint-3 2> /dev/null; then
pylint-3 "$@"
else
echo "pylint not found";
exit 1
......@@ -116,7 +131,7 @@ fi
# load MPI module if necessary
if [ -f "/etc/os-release" ]; then
grep -q suse /etc/os-release && source /etc/profile.d/modules.sh && module load gnu-openmpi
grep -q rhel /etc/os-release && source /etc/profile.d/modules.sh && module load mpi
grep -q 'rhel\|fedora' /etc/os-release && for f in /etc/profile.d/*module*.sh; do source $f; done && module load mpi
fi
# CONFIGURE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment