Skip to content
Snippets Groups Projects
Commit 94ed5d8e authored by René Heß's avatar René Heß
Browse files

Merge branch 'master' into feature/sum-factorization-on-unstructered-grids

parents 138095ad 718f1dfb
No related branches found
No related tags found
No related merge requests found
--- ---
variables: variables:
# work around https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/2148 GIT_SUBMODULE_STRATEGY: recursive
# value should be "recursive" without workaround HYPERTHREADING: "false"
GIT_SUBMODULE_STRATEGY: none OMP_NUM_THREADS: 1
before_script: before_script:
- echo "Running make concurrently with $(nproc) cores, where possibly" - echo "Running make concurrently with ${DUNECI_PARALLEL} cores, where possibly"
# make sure we can update submodules and apply the patches - patches/apply_patches.sh
- git submodule foreach --recursive git reset --hard HEAD - duneci-install-module --recursive https://gitlab.dune-project.org/dominic/dune-opcounter.git
- git submodule foreach --recursive git clean -fdx - duneci-install-module --recursive https://gitlab.dune-project.org/marcel.koch/consistent-edge-orientation.git
# work around https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/2148
- git submodule sync --recursive
- git submodule update --init --recursive
# end workaround
- patches/apply_patches.sh
# detect number of processors, but make sure never to run with -j"", as the
# build host would likely run out of memory
- ": ${DUNECI_PARALLEL:=$(nproc || echo 1)}"
- export DUNECI_PARALLEL
git--gcc: git-debian-10-gcc-7-14:
image: registry.dune-project.org/joe/dune-perftool-ci/perftool-base:git image: "registry.dune-project.org/docker/ci/dune-pdelab:git-debian-10-gcc-7-14"
script: duneci-standard-test script: duneci-standard-test
tags: tags:
- "cores:20" - "cores:20"
- "perftool" - "perftool"
git--clang: git-debian-10-clang-6-libcpp-17:
image: registry.dune-project.org/joe/dune-perftool-ci/perftool-base:git image: "registry.dune-project.org/docker/ci/dune-pdelab:git-debian-10-clang-6-libcpp-17"
script: duneci-standard-test --opts=/duneci/opts.clang script: duneci-standard-test
tags: tags:
- "cores:20" - "cores:20"
- "perftool" - "perftool"
...@@ -13,7 +13,7 @@ reference = hagenpoiseuille_ref ...@@ -13,7 +13,7 @@ reference = hagenpoiseuille_ref
extension = vtu extension = vtu
[formcompiler] [formcompiler]
compare_l2errorsquared = 1e-11 compare_l2errorsquared = 1e-10
[formcompiler.r] [formcompiler.r]
numerical_jacobian = 0, 1 | expand num numerical_jacobian = 0, 1 | expand num
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment