diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb7213c7456ec1cbb9aa5a7a35c949c620162b85..79bbc4ac9877b1ce2e2892fbe7d34b3c670b8647 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ --- # Install external dependencies before_script: + - patch -d /duneci/modules/dune-common -p1 < dune-common-densematrix-adolc-workaround.diff - duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-matrix-vector.git - duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-fufem.git - duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-solvers.git diff --git a/dune-common-densematrix-adolc-workaround.diff b/dune-common-densematrix-adolc-workaround.diff new file mode 100644 index 0000000000000000000000000000000000000000..da95395f081c10cd7a9afa2fe3b0a6ed7b0214ac --- /dev/null +++ b/dune-common-densematrix-adolc-workaround.diff @@ -0,0 +1,13 @@ +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); + }