Skip to content
Snippets Groups Projects
Commit 95740e81 authored by Sander, Oliver's avatar Sander, Oliver
Browse files

Stop patching dune-common to work around a bug in ADOL-C

The ADOL-C bug was fixed in Debian 11.
parent 2c08f12c
No related branches found
No related tags found
1 merge request!137Various CI updates
Pipeline #13270 passed
...@@ -9,26 +9,6 @@ before_script: &before ...@@ -9,26 +9,6 @@ before_script: &before
- duneci-install-module https://gitlab.mn.tu-dresden.de/ag-sander/dune/dune-elasticity.git - duneci-install-module https://gitlab.mn.tu-dresden.de/ag-sander/dune/dune-elasticity.git
- duneci-install-module https://gitlab.mn.tu-dresden.de/iwr/dune-gmsh4 - duneci-install-module https://gitlab.mn.tu-dresden.de/iwr/dune-gmsh4
# ADOL-C's comparison operators prior to version 2.7.2 return `int` instead of `bool`,
# which confuses template meta-programming in dune-common...
.patch-dune-common: &patch-dune-common
- |-
patch -d /duneci/modules/dune-common -p1 <<EOT
diff --git a/dune/common/densematrix.hh b/dune/common/densematrix.hh
index b03bbb0b..917ecef9 100644
--- a/dune/common/densematrix.hh
+++ b/dune/common/densematrix.hh
@@ -897,7 +897,7 @@ namespace Dune
for (size_type k=i+1; k<A.rows(); k++)
{
auto abs = fvmeta::absreal(A[k][i]);
- auto mask = abs > pivmax;
+ bool mask = abs > pivmax;
pivmax = Simd::cond(mask, abs, pivmax);
imax = Simd::cond(mask, simd_index_type(k), imax);
}
EOT
dune:2.9 gcc: dune:2.9 gcc:
variables: variables:
DUNECI_BRANCH: releases/2.9 DUNECI_BRANCH: releases/2.9
...@@ -40,21 +20,18 @@ dune:2.9 gcc: ...@@ -40,21 +20,18 @@ dune:2.9 gcc:
dune:git gcc-10 C++20: dune:git gcc-10 C++20:
image: registry.dune-project.org/docker/ci/dune:git-debian-11-gcc-10-20 image: registry.dune-project.org/docker/ci/dune:git-debian-11-gcc-10-20
before_script: before_script:
- *patch-dune-common
- *before - *before
script: duneci-standard-test script: duneci-standard-test
dune:git clang-11 C++20: dune:git clang-11 C++20:
image: registry.dune-project.org/docker/ci/dune:git-debian-11-clang-11-20 image: registry.dune-project.org/docker/ci/dune:git-debian-11-clang-11-20
before_script: before_script:
- *patch-dune-common
- *before - *before
script: duneci-standard-test script: duneci-standard-test
dune:git dune-parmg dune-vtk dune-curvedgeometry dune-curvedgrid dune-foamgrid gcc-10 C++20: dune:git dune-parmg dune-vtk dune-curvedgeometry dune-curvedgrid dune-foamgrid gcc-10 C++20:
image: registry.dune-project.org/docker/ci/dune:git-debian-11-gcc-10-20 image: registry.dune-project.org/docker/ci/dune:git-debian-11-gcc-10-20
before_script: before_script:
- *patch-dune-common
- *before - *before
- duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/paraphase/dune-parmg.git - duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/paraphase/dune-parmg.git
- duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/spraetor/dune-vtk.git - duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/spraetor/dune-vtk.git
...@@ -66,7 +43,6 @@ dune:git dune-parmg dune-vtk dune-curvedgeometry dune-curvedgrid dune-foamgrid g ...@@ -66,7 +43,6 @@ dune:git dune-parmg dune-vtk dune-curvedgeometry dune-curvedgrid dune-foamgrid g
dune:git dune-parmg dune-vtk dune-curvedgeometry dune-curvedgrid dune-foamgrid clang-11 C++20: dune:git dune-parmg dune-vtk dune-curvedgeometry dune-curvedgrid dune-foamgrid clang-11 C++20:
image: registry.dune-project.org/docker/ci/dune:git-debian-11-clang-11-20 image: registry.dune-project.org/docker/ci/dune:git-debian-11-clang-11-20
before_script: before_script:
- *patch-dune-common
- *before - *before
- duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/paraphase/dune-parmg.git - duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/paraphase/dune-parmg.git
- duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/spraetor/dune-vtk.git - duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/spraetor/dune-vtk.git
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment