Commit b6f607c7 authored by Markus Holzer's avatar Markus Holzer
Browse files

Update master

parents 5105aff5 cce82fcc
Pipeline #31000 failed with stages
in 44 minutes and 47 seconds
......@@ -11,6 +11,7 @@ bugprone-*,
misc-*,
-misc-misplaced-const,
-misc-no-recursion,
-misc-non-private-member-variables-in-classes,
modernize-*,
......@@ -25,8 +26,11 @@ modernize-*,
-modernize-redundant-void-arg,
-modernize-use-trailing-return-type,
-modernize-avoid-c-arrays,
-modernize-concat-nested-namespaces,
-modernize-use-nodiscard,
mpi-*,
-mpi-type-mismatch,
openmp-*,
-openmp-exception-escape,
......@@ -43,21 +47,24 @@ readability-deleted-default,
readability-isolate-declaration,
readability-misleading-indentation,
readability-misplaced-array-index,
readability-non-const-parameter,
readability-redundant-access-specifiers,
readability-redundant-control-flow,
readability-redundant-declaration,
readability-redundant-function-ptr-dereference,
readability-redundant-preprocessor,
readability-redundant-smartptr-get,
readability-redundant-string-cstr,
readability-simplify-boolean-expr,
readability-simplify-subscript-expr,
readability-static-accessed-through-instance,
readability-static-definition-in-anonymous-namespace,
readability-string-compare,
readability-uniqueptr-delete-release
readability-uniqueptr-delete-release,
readability-use-anyofallof
'
WarningsAsErrors: '*'
HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
HeaderFilterRegex: '.*'
...
......@@ -7,7 +7,6 @@
stages:
- pretest
- test
- merge_request
- deploy
- benchmark
......@@ -33,10 +32,30 @@ 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 -DWALBERLA_BUILD_WITH_METIS=$WALBERLA_BUILD_WITH_METIS -DWALBERLA_BUILD_WITH_PARMETIS=$WALBERLA_BUILD_WITH_PARMETIS -DWALBERLA_ENABLE_GUI=$WALBERLA_ENABLE_GUI -DWALBERLA_BUILD_WITH_CODEGEN=$WALBERLA_BUILD_WITH_CODEGEN
- cmake . -LAH
- 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_SHOWCASES=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
-DWALBERLA_ENABLE_GUI=$WALBERLA_ENABLE_GUI
-DWALBERLA_BUILD_WITH_CODEGEN=$WALBERLA_BUILD_WITH_CODEGEN
-DWALBERLA_STL_BOUNDS_CHECKS=$WALBERLA_STL_BOUNDS_CHECKS
- cmake . -LA
- make -j $NUM_BUILD_CORES -l $NUM_CORES
- ctest -LE $CTEST_EXCLUDE_LABELS -C $CMAKE_BUILD_TYPE --output-on-failure -j $NUM_CORES
- ctest -LE $CTEST_EXCLUDE_LABELS -C $CMAKE_BUILD_TYPE --output-on-failure -j $NUM_CORES -T Test
after_script:
- python3 cmake/ctest2junit.py build > report.xml
tags:
- docker
variables:
......@@ -51,6 +70,12 @@ stages:
WALBERLA_BUILD_WITH_METIS: "ON"
WALBERLA_BUILD_WITH_PARMETIS: "ON"
WALBERLA_ENABLE_GUI: "OFF"
artifacts:
when: always
reports:
junit:
- report.xml
- python/report.xml
###############################################################################
......@@ -61,202 +86,28 @@ stages:
intel_18_serial:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- cd ..
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_MPI: "OFF"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
stage: merge_request
when: manual
needs: []
allow_failure: false
tags:
- cuda
- docker
- intel
intel_18_mpionly:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- cd ..
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
stage: merge_request
when: manual
needs: []
allow_failure: false
tags:
- cuda
- docker
- intel
intel_18_hybrid:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- cd ..
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_ENABLE_GUI: "ON"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
stage: merge_request
when: manual
needs: []
allow_failure: false
tags:
- cuda
- docker
- intel
intel_18_serial_dbg:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- cd ..
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_MPI: "OFF"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF"
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
stage: merge_request
when: manual
needs: []
allow_failure: false
tags:
- cuda
- docker
- intel
intel_18_mpionly_dbg:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- cd ..
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
stage: merge_request
when: manual
needs: []
allow_failure: false
tags:
- cuda
- docker
- intel
intel_18_hybrid_dbg:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- cd ..
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
stage: merge_request
when: manual
needs: []
allow_failure: false
tags:
- cuda
- docker
- intel
intel_18_hybrid_dbg_sp:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_DOUBLE_ACCURACY: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF"
WALBERLA_BUILD_WITH_METIS: "OFF"
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
stage: merge_request
when: manual
needs: []
allow_failure: false
tags:
- cuda
- docker
- intel
intel_19_serial:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables:
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_MPI: "OFF"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
stage: merge_request
when: manual
needs: []
allow_failure: false
tags:
- cuda
- docker
- intel
......@@ -266,22 +117,20 @@ intel_19_mpionly:
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables:
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
stage: merge_request
when: manual
needs: []
allow_failure: false
tags:
- cuda
- docker
- intel
......@@ -291,17 +140,15 @@ intel_19_hybrid:
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables:
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
stage: merge_request
when: manual
needs: []
allow_failure: false
WALBERLA_BUILD_WITH_PYTHON: "ON"
tags:
- cuda
- docker
- intel
......@@ -311,21 +158,19 @@ intel_19_serial_dbg:
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables:
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_MPI: "OFF"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF"
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
stage: merge_request
when: manual
needs: []
allow_failure: false
WALBERLA_BUILD_WITH_PYTHON: "ON"
tags:
- cuda
- docker
- intel
......@@ -335,19 +180,17 @@ intel_19_mpionly_dbg:
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables:
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
stage: merge_request
when: manual
needs: []
allow_failure: false
WALBERLA_BUILD_WITH_PYTHON: "ON"
tags:
- cuda
- docker
- intel
......@@ -357,14 +200,16 @@ intel_19_hybrid_dbg:
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables:
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
tags:
- cuda
- docker
- intel
......@@ -372,16 +217,13 @@ intel_19_hybrid_dbg_sp:
extends: .build_template
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
variables:
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_DOUBLE_ACCURACY: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF"
WALBERLA_BUILD_WITH_METIS: "OFF"
stage: merge_request
when: manual
needs: []
allow_failure: false
tags:
- cuda
- docker
- intel
......@@ -391,23 +233,20 @@ gcc_7_serial:
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_MPI: "OFF"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
stage: merge_request
when: manual
needs: []
allow_failure: false
tags:
- cuda
- docker
......@@ -418,21 +257,18 @@ gcc_7_mpionly:
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
stage: merge_request
when: manual
needs: []
allow_failure: false
tags:
- cuda
- docker
......@@ -443,16 +279,17 @@ gcc_7_hybrid:
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
stage: merge_request
when: manual
needs: []
allow_failure: false
WALBERLA_BUILD_WITH_PYTHON: "ON"
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
tags:
- cuda
- docker
......@@ -463,9 +300,9 @@ gcc_7_serial_dbg:
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_MPI: "OFF"
......@@ -474,10 +311,11 @@ gcc_7_serial_dbg:
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_ENABLE_GUI: "ON"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
stage: merge_request
when: manual
needs: []
allow_failure: false
WALBERLA_BUILD_WITH_PYTHON: "ON"
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
tags:
- cuda
- docker
......@@ -488,22 +326,19 @@ gcc_7_mpionly_dbg:
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
stage: merge_request
when: manual
needs: []
allow_failure: false
tags:
- cuda
- docker
......@@ -514,17 +349,14 @@ gcc_7_hybrid_dbg:
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables:
WALBERLA_BUILD_WITH_CUDA: "ON"
CMAKE_BUILD_TYPE: "DebugOptimized"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
stage: merge_request
when: manual
needs: []
allow_failure: false
WALBERLA_BUILD_WITH_PYTHON: "ON"
tags:
- cuda
- docker
......@@ -542,10 +374,6 @@ gcc_7_hybrid_dbg_sp:
variables:
- $ENABLE_NIGHTLY_BUILDS
stage: merge_request
when: manual
needs: []
allow_failure: false
tags:
- cuda
- docker
......@@ -556,24 +384,22 @@ gcc_8_serial:
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables:
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_BUILD_WITH_CUDA: "ON"
WALBERLA_BUILD_WITH_MPI: "OFF"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_PARMETIS: "OFF"
WALBERLA_BUILD_WITH_CODEGEN: "ON"
WALBERLA_BUILD_WITH_PYTHON: "ON"
only:
variables:
- $ENABLE_NIGHTLY_BUILDS
stage: merge_request
when: manual
needs: []
allow_failure: false
tags:
- cuda
- docker
gcc_8_mpionly:
......@@ -582,22 +408,20 @@ gcc_8_mpionly:
before_script:
- pip3 install lbmpy jinja2
- cd python
- python3 -m unittest discover pystencils_walberla/
- python3 -m unittest discover lbmpy_walberla/
- python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
- cd ..
- CC=gcc CXX=g++ pip3 install pycuda
variables:
WALBERLA_BUILD_WITH_CUDA: "OFF"
WALBERLA_BUILD_WITH_CUDA: "ON"