Commit d09f67dc authored by Tobias Schruff's avatar Tobias Schruff
Browse files

Merge with upstream master

parents 0f06aa5f aae402a0
......@@ -28,7 +28,7 @@ stages:
- mkdir $CI_PROJECT_DIR/build
- cd $CI_PROJECT_DIR/build
- if dpkg --compare-versions `ompi_info | head -2 | tail -1 | sed 's/[^0-9.]*\([0-9.]*\).*/\1/'` ge 1.10; then export MPIEXEC_PREFLAGS="--allow-run-as-root" ; fi
- cmake .. -DWALBERLA_BUFFER_DEBUG=$WALBERLA_BUFFER_DEBUG -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=$WALBERLA_BUILD_WITH_MPI -DWALBERLA_BUILD_WITH_CUDA=$WALBERLA_BUILD_WITH_CUDA -DWALBERLA_BUILD_WITH_PYTHON=$WALBERLA_BUILD_WITH_PYTHON -DWALBERLA_BUILD_WITH_OPENMP=$WALBERLA_BUILD_WITH_OPENMP -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS -DWALBERLA_DOUBLE_ACCURACY=$WALBERLA_DOUBLE_ACCURACY -DWARNING_ERROR=ON
- cmake .. -DWALBERLA_BUFFER_DEBUG=$WALBERLA_BUFFER_DEBUG -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=$WALBERLA_BUILD_WITH_MPI -DWALBERLA_BUILD_WITH_CUDA=$WALBERLA_BUILD_WITH_CUDA -DWALBERLA_BUILD_WITH_PYTHON=$WALBERLA_BUILD_WITH_PYTHON -DWALBERLA_BUILD_WITH_OPENMP=$WALBERLA_BUILD_WITH_OPENMP -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS -DWALBERLA_DOUBLE_ACCURACY=$WALBERLA_DOUBLE_ACCURACY -DWARNING_ERROR=ON -DWALBERLA_BUILD_WITH_METIS=$WALBERLA_BUILD_WITH_METIS -DWALBERLA_BUILD_WITH_PARMETIS=$WALBERLA_BUILD_WITH_PARMETIS
- cmake . -LAH
- make -j $NUM_BUILD_CORES -l $NUM_CORES
- ctest -LE $CTEST_EXCLUDE_LABELS -C $CMAKE_BUILD_TYPE --output-on-failure -j $NUM_CORES
......@@ -45,17 +45,21 @@ stages:
CMAKE_BUILD_TYPE: "Release"
WALBERLA_BUFFER_DEBUG: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
WALBERLA_BUILD_WITH_METIS: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF"
.build_mpionly_template: &build_mpionly_definition
<<: *build_definition
variables:
CTEST_EXCLUDE_LABELS: "longrun"
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
CMAKE_BUILD_TYPE: "Release"
WALBERLA_BUFFER_DEBUG: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
CTEST_EXCLUDE_LABELS: "longrun"
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
CMAKE_BUILD_TYPE: "Release"
WALBERLA_BUFFER_DEBUG: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
WALBERLA_BUILD_WITH_METIS: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF"
.build_hybrid_template: &build_hybrid_definition
......@@ -69,6 +73,8 @@ stages:
CMAKE_BUILD_TYPE: "Release"
WALBERLA_BUFFER_DEBUG: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
WALBERLA_BUILD_WITH_METIS: "ON"
WALBERLA_BUILD_WITH_PARMETIS: "ON"
.build_serial_dbg_template: &build_serial_dbg_definition
<<: *build_definition
......@@ -79,17 +85,21 @@ stages:
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_BUFFER_DEBUG: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
WALBERLA_BUILD_WITH_METIS: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF"
.build_mpionly_dbg_template: &build_mpionly_dbg_definition
<<: *build_definition
variables:
CTEST_EXCLUDE_LABELS: "longrun"
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_BUFFER_DEBUG: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
CTEST_EXCLUDE_LABELS: "longrun"
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_BUFFER_DEBUG: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
WALBERLA_BUILD_WITH_METIS: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF"
.build_hybrid_dbg_template: &build_hybrid_dbg_definition
......@@ -103,6 +113,8 @@ stages:
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_BUFFER_DEBUG: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
WALBERLA_BUILD_WITH_METIS: "ON"
WALBERLA_BUILD_WITH_PARMETIS: "ON"
.build_hybrid_dbg_sp_template: &build_hybrid_dbg_sp_definition
<<: *build_definition
......@@ -115,6 +127,8 @@ stages:
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_BUFFER_DEBUG: "OFF"
WALBERLA_DOUBLE_ACCURACY: "OFF"
WALBERLA_BUILD_WITH_METIS: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF"
###############################################################################
......@@ -125,67 +139,6 @@ stages:
intel_15_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
only:
- triggers
tags:
- docker
- intel
intel_15_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
only:
- triggers
tags:
- docker
- intel
intel_15_hybrid:
<<: *build_hybrid_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
only:
- triggers
tags:
- docker
- intel
intel_15_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
only:
- triggers
tags:
- docker
- intel
intel_15_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
only:
- triggers
tags:
- docker
- intel
intel_15_hybrid_dbg:
<<: *build_hybrid_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
tags:
- docker
- intel
intel_15_hybrid_dbg_sp:
<<: *build_hybrid_dbg_sp_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
only:
- triggers
tags:
- docker
- intel
intel_16_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
......@@ -239,8 +192,6 @@ intel_16_mpionly_dbg:
intel_16_hybrid_dbg:
<<: *build_hybrid_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
only:
- triggers
tags:
- cuda
- docker
......@@ -309,172 +260,6 @@ intel_17_hybrid_dbg_sp:
- docker
- intel
gcc_4.7_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
only:
- triggers
tags:
- docker
gcc_4.7_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
only:
- triggers
tags:
- docker
gcc_4.7_hybrid:
<<: *build_hybrid_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
only:
- triggers
tags:
- docker
gcc_4.7_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
only:
- triggers
tags:
- docker
gcc_4.7_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
only:
- triggers
tags:
- docker
gcc_4.7_hybrid_dbg:
<<: *build_hybrid_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
tags:
- docker
gcc_4.7_hybrid_dbg_sp:
<<: *build_hybrid_dbg_sp_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
only:
- triggers
tags:
- docker
gcc_4.8_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
only:
- triggers
tags:
- docker
gcc_4.8_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
only:
- triggers
tags:
- docker
gcc_4.8_hybrid:
<<: *build_hybrid_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
only:
- triggers
tags:
- docker
gcc_4.8_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
only:
- triggers
tags:
- docker
gcc_4.8_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
only:
- triggers
tags:
- docker
gcc_4.8_hybrid_dbg:
<<: *build_hybrid_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
only:
- triggers
tags:
- docker
gcc_4.8_hybrid_dbg_sp:
<<: *build_hybrid_dbg_sp_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
only:
- triggers
tags:
- docker
gcc_4.9_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
only:
- triggers
tags:
- docker
gcc_4.9_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
only:
- triggers
tags:
- docker
gcc_4.9_hybrid:
<<: *build_hybrid_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
only:
- triggers
tags:
- docker
gcc_4.9_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
only:
- triggers
tags:
- docker
gcc_4.9_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
only:
- triggers
tags:
- docker
gcc_4.9_hybrid_dbg:
<<: *build_hybrid_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
only:
- triggers
tags:
- docker
gcc_4.9_hybrid_dbg_sp:
<<: *build_hybrid_dbg_sp_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
only:
- triggers
tags:
- docker
gcc_5_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
......@@ -519,8 +304,6 @@ gcc_5_mpionly_dbg:
gcc_5_hybrid_dbg:
<<: *build_hybrid_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
only:
- triggers
tags:
- cuda
- docker
......@@ -636,72 +419,6 @@ gcc_7_hybrid_dbg_sp:
tags:
- docker
clang_3.4_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.4
only:
- triggers
tags:
- docker
clang_3.4_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.4
only:
- triggers
tags:
- docker
clang_3.4_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.4
only:
- triggers
tags:
- docker
clang_3.4_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.4
tags:
- docker
clang_3.5_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.5
only:
- triggers
tags:
- cuda
- docker
clang_3.5_mpionly:
<<: *build_mpionly_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.5
only:
- triggers
tags:
- cuda
- docker
clang_3.5_serial_dbg:
<<: *build_serial_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.5
only:
- triggers
tags:
- cuda
- docker
clang_3.5_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.5
only:
- triggers
tags:
- cuda
- docker
clang_3.6_serial:
<<: *build_serial_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
......@@ -732,8 +449,6 @@ clang_3.6_serial_dbg:
clang_3.6_mpionly_dbg:
<<: *build_mpionly_dbg_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
only:
- triggers
tags:
- cuda
- docker
......@@ -1097,88 +812,6 @@ coverage:
- ctest -LE $CTEST_EXCLUDE_LABELS -C $BUILD_CONFIGURATION --output-on-failure -j 4
msvc-12_Hybrid_Dbg:
<<: *win_build_definition
variables:
CMAKE_GENERATOR: "Visual Studio 12 2013 Win64"
BUILD_CONFIGURATION: "DebugOptimized"
CTEST_EXCLUDE_LABELS: "longrun"
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "ON"
WALBERLA_DOUBLE_ACCURACY: "ON"
msvc-12_Hybrid_SP_Dbg:
<<: *win_build_definition
variables:
CMAKE_GENERATOR: "Visual Studio 12 2013 Win64"
BUILD_CONFIGURATION: "DebugOptimized"
CTEST_EXCLUDE_LABELS: "longrun"
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "ON"
WALBERLA_DOUBLE_ACCURACY: "OFF"
only:
- triggers
msvc-12_Hybrid:
<<: *win_build_definition
variables:
CMAKE_GENERATOR: "Visual Studio 12 2013 Win64"
BUILD_CONFIGURATION: "Release"
CTEST_EXCLUDE_LABELS: "longrun"
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "ON"
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- triggers
msvc-12_Serial_Dbg:
<<: *win_build_definition
variables:
CMAKE_GENERATOR: "Visual Studio 12 2013 Win64"
BUILD_CONFIGURATION: "DebugOptimized"
CTEST_EXCLUDE_LABELS: "longrun"
WALBERLA_BUILD_WITH_MPI: "OFF"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- triggers
msvc-12_Serial:
<<: *win_build_definition
variables:
CMAKE_GENERATOR: "Visual Studio 12 2013 Win64"
BUILD_CONFIGURATION: "Release"
CTEST_EXCLUDE_LABELS: "longrun"
WALBERLA_BUILD_WITH_MPI: "OFF"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- triggers
msvc-12_MpiOnly_Dbg:
<<: *win_build_definition
variables:
CMAKE_GENERATOR: "Visual Studio 12 2013 Win64"
BUILD_CONFIGURATION: "DebugOptimized"
CTEST_EXCLUDE_LABELS: "longrun"
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- triggers
msvc-12_MpiOnly:
<<: *win_build_definition
variables:
CMAKE_GENERATOR: "Visual Studio 12 2013 Win64"
BUILD_CONFIGURATION: "Release"
CTEST_EXCLUDE_LABELS: "longrun"
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- triggers
msvc-14_Hybrid_Dbg:
<<: *win_build_definition
variables:
......@@ -1188,8 +821,6 @@ msvc-14_Hybrid_Dbg:
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "ON"
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- triggers
msvc-14_Hybrid_SP_Dbg:
<<: *win_build_definition
......@@ -1348,14 +979,10 @@ msvc-14.1_MpiOnly:
.conda-deploy: &conda_deploy_definition
stage: deploy
before_script:
- conda update -y conda
- conda update -y python
- conda install -y conda-build anaconda-client
- anaconda login --username $CONDA_DEPLOY_USER --password $CONDA_DEPLOY_PASSWORD --hostname $CI_JOB_ID
- conda config --set anaconda_upload yes
- conda config --add channels lssfau
- conda -V
- conda build -V
after_script:
- anaconda logout
dependencies: []
......@@ -1364,41 +991,21 @@ msvc-14.1_MpiOnly:
- master@walberla/walberla
- tags@walberla/walberla
conda-py36-win-withoutLbm:
conda-py36-win:
<<: *conda_deploy_definition
tags:
- win
script:
- conda build --python=3.6 --user=lssfau utilities\\conda\\withoutLbm
- conda build --python=3.6 --user=lssfau utilities\\conda\\walberla
conda-py35-win-withoutLbm:
conda-py35-win:
<<: *conda_deploy_definition
tags:
- win
script:
- conda build --python=3.5 --user=lssfau utilities\\conda\\withoutLbm
- conda build --python=3.5 --user=lssfau utilities\\conda\\walberla
conda-py36-linux-withoutLbm:
<<: *conda_deploy_definition
tags:
- docker
image: continuumio/miniconda3
script:
- apt-get update
- apt-get install -y build-essential
- conda build --python=3.6 --user=lssfau utilities/conda/withoutLbm
conda-py35-linux-withoutLbm:
<<: *conda_deploy_definition
tags:
- docker
image: continuumio/miniconda3
script:
- apt-get update
- apt-get install -y build-essential
- conda build --python=3.5 --user=lssfau utilities/conda/withoutLbm
conda-py36-linux-withLbm:
conda-py36-linux:
<<: *conda_deploy_definition
tags:
- docker
......@@ -1406,9 +1013,9 @@ conda-py36-linux-withLbm:
script:
- apt-get update
- apt-get install -y build-essential
- conda build --python=3.6 --user=lssfau utilities/conda/withLbm
- conda build --python=3.6 --user=lssfau utilities/conda/walberla
conda-py35-linux-withLbm:
conda-py35-linux:
<<: *conda_deploy_definition
tags:
- docker
......@@ -1416,4 +1023,4 @@ conda-py35-linux-withLbm:
script:
- apt-get update
- apt-get install -y build-essential
- conda build --python=3.5 --user=lssfau utilities/conda/withLbm
- conda build --python=3.5 --user=lssfau utilities/conda/walberla
......@@ -25,7 +25,7 @@
##
############################################################################################################################
CMAKE_MINIMUM_REQUIRED (VERSION 2.8)
CMAKE_MINIMUM_REQUIRED (VERSION 3.1)
PROJECT ( walberla )
......@@ -36,11 +36,7 @@ include ( waLBerlaFunctions )
set_version( 4 0 )
if( CMAKE_VERSION VERSION_LESS 2.8.3 )
include( CMakeParseArgumentsCompat )
else()
include( CMakeParseArguments )
endif()
include( CMakeParseArguments )
# Enable CTest
enable_testing()
......@@ -166,6 +162,10 @@ if( CMAKE_CXX_COMPILER MATCHES "icpc" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "icpc"
SET(CMAKE_LINKER "${XILD}")
ENDIF(XILD)
MARK_AS_ADVANCED(XILD)
if( CMAKE_VERSION VERSION_LESS 3.6.0 )
set( CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14" )
add_flag ( CMAKE_CXX_FLAGS ${CMAKE_CXX14_STANDARD_COMPILE_OPTION} )
endif()
else()
option ( WALBERLA_CXX_COMPILER_IS_INTEL "Use Intel compiler" OFF )
endif()
......@@ -204,7 +204,7 @@ endif()
mark_as_advanced ( WALBERLA_CXX_COMPILER_IS_NEC )
# Check for Clang compiler
if( CMAKE_CXX_COMPILER MATCHES "clang" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" )
if( CMAKE_CXX_COMPILER MATCHES "clang" OR CMAKE_CXX_COMPILER_ARG1 MATCHES "clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" )
option ( WALBERLA_CXX_COMPILER_IS_CLANG "Use clang compiler" ON )
else()
option ( WALBERLA_CXX_COMPILER_IS_CLANG "Use clang compiler" OFF )
......@@ -270,30 +270,19 @@ if ( WALBERLA_PROFILE_USE )
endif()