- 26 Jun, 2020 1 commit
-
-
Dominic Kempf authored
Merge branch 'cherry-pick-cc5ed571' into 'releases/2.6' ref:core/dune-common\> Merge branch 'feature/install-scripts-executable' into 'master' ref:core/dune-common\> CMake does not preserve file permissions when installing files. In order to get executable scripts installed, the install(PROGRAMS\...) signature needs to be used instead of install(FILES\...). See merge request [[!812]] (cherry picked from commit cc5ed571) ee4cef6d \[cmake\]\[bugfix\] Use install(PROGRAMS\...) signature to install executable scripts See merge request [!828] [!812]: gitlab.dune-project.org/core/dune-common/merge_requests/812 [!828]: gitlab.dune-project.org/core/dune-common/merge_requests/828
-
- 25 Jun, 2020 1 commit
-
-
Dominic Kempf authored
Merge branch 'feature/install-scripts-executable' into 'master' ref:core/dune-common\> CMake does not preserve file permissions when installing files. In order to get executable scripts installed, the install(PROGRAMS\...) signature needs to be used instead of install(FILES\...). See merge request [!812] [!812]: gitlab.dune-project.org/core/dune-common/merge_requests/812 (cherry picked from commit cc5ed571) ee4cef6d [cmake][bugfix] Use install(PROGRAMS...) signature to install executable scripts
-
- 19 Mar, 2019 1 commit
-
-
Jö Fahlke authored
Merge branch 'cherry-pick-cb44193b' into 'releases/2.6' ref:core/dune-common (cherry picked from commit cb44193b) The current implementation of `FieldVector<K, 1>::operator= (const FieldVector<T, N>& other)` attempts to access a private member of `FieldVector<T, N>`. This results in a compilation error. See MR [!637] See merge request [!646] [!637]: gitlab.dune-project.org/NoneNone/merge_requests/637 [!646]: gitlab.dune-project.org/core/dune-common/merge_requests/646
-
- 18 Mar, 2019 1 commit
-
-
Felix Müller authored
(cherry picked from commit cb44193b)
-
- 13 Dec, 2018 4 commits
-
-
Jö Fahlke authored
Merge branch 'stopgap-simd-io-2.6' into 'releases/2.6' ref:core/dune-common Addresses: [dune-istl#60] See merge request [!593] [dune-istl#60]: gitlab.dune-project.org/Nonedune-istl/issues/60 [!593]: gitlab.dune-project.org/core/dune-common/merge_requests/593
-
Jö Fahlke authored
Addresses: dune-istl#60
-
Jö Fahlke authored
Merge branch 'fix-vc-index-types-2.6' into 'releases/2.6' ref:core/dune-common These are also used by the new simd interface on master and appear to be more portable between different Vc vector and simdarray implementations. For the mask type, this seems to be unnecessary. Closes: [dune-istl#59] See merge request [!592] [dune-istl#59]: gitlab.dune-project.org/Nonedune-istl/issues/59 [!592]: gitlab.dune-project.org/core/dune-common/merge_requests/592
-
Jö Fahlke authored
These are also used by the new simd interface on master and appear to be more portable between different Vc vector and simdarray implementations. For the mask type, this seems to be unnecessary.
-
- 12 Dec, 2018 2 commits
-
-
Jö Fahlke authored
Merge branch 'debugalign-overload-min-max-2.6' into 'releases/2.6' ref:core/dune-common A superficial reading of the standard's LessThanComparable requirement may suggest that we could actually use std::min() and std::max(). But as it turns out this isn't all that clear, see [https://cplusplus.github.io/LWG/issue2114]. libc++ chose LessThanComparable in a way that requires the result of the comparison to be implicitly convertible to bool, which we cannot guarantee as we do not want the debug type the automatically decay into its underlying type in all kinds of contexts. So we go with the alternative route of overloading min() and max(). Cherry-picks [!550] onto releases/2.6 Closes: [dune-istl#57] See merge request [!590] [https://cplusplus.github.io/LWG/issue2114]: https://cplusplus.github.io/LWG/issue2114 [!550]: gitlab.dune-project.org/NoneNone/merge_requests/550 [dune-istl#57]: gitlab.dune-project.org/core/dune-istl/issues/57 [!590]: gitlab.dune-project.org/core/dune-common/merge_requests/590
-
Jö Fahlke authored
A superficial reading of the standard's LessThanComparable requirement may suggest that we could actually use std::min() and std::max(). But as it turns out this isn't all that clear, see https://cplusplus.github.io/LWG/issue2114. libc++ chose LessThanComparable in a way that requires the result of the comparison to be implicitly convertible to bool, which we cannot guarantee as we do not want the debug type the automatically decay into its underlying type in all kinds of contexts. So we go with the alternative route of overloading min() and max(). Cherry-picks !550 onto releases/2.6 Closes: dune-istl#57
-
- 06 Dec, 2018 4 commits
-
-
Steffen Müthing authored
Merge branch 'ci/centralize-config-2.6' into 'releases/2.6' See merge request [!587] [!587]: Nonecore/dune-common/merge_requests/587
-
Steffen Müthing authored
-
Steffen Müthing authored
-
Steffen Müthing authored
-
- 13 Nov, 2018 1 commit
-
-
Dominic Kempf authored
Merge branch 'backport/cmake-labels' into 'releases/2.6' ref:core/dune-common @timo.koch has a dire need for this on the release branch and I do not see why we shouldnt allow it. See merge request [!575] [!575]: gitlab.dune-project.org/core/dune-common/merge_requests/575
-
- 08 Nov, 2018 6 commits
-
-
Markus Blatt authored
Merge branch 'cherry-pick-5b3ea34f' into 'releases/2.6' ref:core/dune-common \[bugfix\] VariableSizeCommunicator fixes See merge request [!520] (cherry picked from commit 5b3ea34f) 66c0332a Removed bogus assert to allow interface with no elements. 83e9e8d3 Initialize requests with MPI_REQUEST_NULL to ignore invalid ones when waiting. 30e78443 Determine number of requests by checking how many or not MPI_REQUEST_NULL. See merge request [!522] [!520]: gitlab.dune-project.org/core/dune-common/merge_requests/520 [!522]: gitlab.dune-project.org/core/dune-common/merge_requests/522
-
Markus Blatt authored
Merge branch 'cherry-pick-709ea8aa' into 'releases/2.6' ref:core/dune-common Merge branch 'bugfix/add_to_unique_ptr_to_CmakeLists' into 'master' Header was missing in CMakeLists.txt and now breaks code due to usage in dune-grid Needs to be backported to 2.6 See merge request [[!547]] (cherry picked from commit 709ea8aa) 53f306b7 added missing header to_unique_ptr.hh to CMakeLists.txt See merge request [!549] [!547]: gitlab.dune-project.org/core/dune-common/merge_requests/547 [!549]: gitlab.dune-project.org/core/dune-common/merge_requests/549
-
Robert K authored
Merge branch 'cherry-pick-1e7fbb59-3' into 'releases/2.6' ref:core/dune-common Merge branch 'let-cmake-disable-pkgconfig-search' into 'master' For whatever reason we still allow to search for a module with pkg-config if CMake was not successful. This leads to the weired situation that if we pass -DCMAKE_DISABLE_FIND_PACKAGE_dune-uggrid=ON to cmake and dune-uggrid is installed in a default sytem path we will end up with a CMakeCache.txt actually using dune-uggrid. This patch is the minimal change to stop searching for a DUNE module with pkg-config if CMake was instructed not to use it. See merge request [[!569]] (cherry picked from commit 1e7fbb59) df4c73f6 Let cmake disable search for modules with pkg-config. See merge request [!571] [!569]: gitlab.dune-project.org/core/dune-common/merge_requests/569 [!571]: gitlab.dune-project.org/core/dune-common/merge_requests/571
-
Andreas Dedner authored
Merge branch 'cherry-pick-43772da6' into 'releases/2.6' ref:core/dune-common Merge branch 'feature/range-with-enums' into 'master' Fixes the defect of the single argument range(\...) that enum values could not be used without casting. I would like to see this being backported to 2.6. See merge request [[!553]] (cherry picked from commit 43772da6) 48c8702f \[bugfix\] allow single argument range(...) with enum values See merge request [!555] [!553]: gitlab.dune-project.org/core/dune-common/merge_requests/553 [!555]: gitlab.dune-project.org/core/dune-common/merge_requests/555
-
Christian Engwer authored
Merge branch 'backport/dense-vector-assignment' into 'releases/2.6' ref:core/dune-common Please. See merge request [!563] [!563]: gitlab.dune-project.org/core/dune-common/merge_requests/563
-
- 17 Oct, 2018 2 commits
-
-
Jö Fahlke authored
Merge branch 'cherry-pick-b7c41305' into 'releases/2.6' ref:core/dune-common [cmake][dune_add_test] Fix/dune add test cmake guard skip test See merge request [!409] (cherry picked from commit b7c41305) See merge request [!558] [!409]: gitlab.dune-project.org/core/dune-common/merge_requests/409 [!558]: gitlab.dune-project.org/core/dune-common/merge_requests/558
-
Jö Fahlke authored
Merge branch 'cherry-pick-27af4005' into 'releases/2.6' ref:core/dune-common [cmake][dune_add_test] Set test property to depend on existence of target Closes [#100] See merge request [!404] (cherry picked from commit 27af4005) 69efd0be [cmake][dune_add_test] Set test property to depend on existence of target See merge request [!557] [#100]: gitlab.dune-project.org/NoneNone/issues/100 [!404]: gitlab.dune-project.org/core/dune-common/merge_requests/404 [!557]: gitlab.dune-project.org/core/dune-common/merge_requests/557
-
- 04 Oct, 2018 1 commit
-
-
Markus Blatt authored
Merge branch 'let-cmake-disable-pkgconfig-search' into 'master' For whatever reason we still allow to search for a module with pkg-config if CMake was not successful. This leads to the weired situation that if we pass -DCMAKE_DISABLE_FIND_PACKAGE_dune-uggrid=ON to cmake and dune-uggrid is installed in a default sytem path we will end up with a CMakeCache.txt actually using dune-uggrid. This patch is the minimal change to stop searching for a DUNE module with pkg-config if CMake was instructed not to use it. See merge request [!569] [!569]: gitlab.dune-project.org/core/dune-common/merge_requests/569 (cherry picked from commit 1e7fbb59) df4c73f6 Let cmake disable search for modules with pkg-config.
-
- 21 Jul, 2018 2 commits
-
-
Tobias Leibner authored
-
Tobias Leibner authored
-
- 13 Jul, 2018 2 commits
-
- 11 Jul, 2018 2 commits
-
-
Andreas Dedner authored
Merge branch 'cherry-pick-317d5564-2' into 'releases/2.6' fixed typo in variable See merge request [!456] (cherry picked from commit 317d5564) 444bac38 fixed typo in variable See merge request [!556] [!456]: gitlab.dune-project.org/core/dune-common/merge_requests/456 [!556]: gitlab.dune-project.org/core/dune-common/merge_requests/556
-
Andreas Dedner authored
fixed typo in variable See merge request !456 (cherry picked from commit 317d5564) 444bac38 fixed typo in variable
-
- 10 Jul, 2018 1 commit
-
-
Jö Fahlke authored
Merge branch 'feature/range-with-enums' into 'master' Fixes the defect of the single argument range(...) that enum values could not be used without casting. I would like to see this being backported to 2.6. See merge request [!553] [!553]: gitlab.dune-project.org/core/dune-common/merge_requests/553 (cherry picked from commit 43772da6) 48c8702f [bugfix] allow single argument `range(...)` with enum values
-
- 05 Jul, 2018 1 commit
-
-
Oliver Sander authored
Merge branch 'bugfix/add_to_unique_ptr_to_CmakeLists' into 'master' Header was missing in CMakeLists.txt and now breaks code due to usage in dune-grid Needs to be backported to 2.6 See merge request [!547] [!547]: gitlab.dune-project.org/core/dune-common/merge_requests/547 (cherry picked from commit 709ea8aa) 53f306b7 added missing header to_unique_ptr.hh to CMakeLists.txt
-
- 30 Jun, 2018 7 commits
-
-
Steffen Müthing authored
This backports the new options for virtualenv placement to the 2.6 release. While the change is not overly important in everyday use, it is really important for testing modules that use dune-testtools. I changed the default for `DUNE_PYTHON_EXTERNAL_VIRTUALENV_FOR_ABSOLUTE_BUILDDIR` to `OFF` so that users don't get an unexpected change in behavior on the release branch. See merge request !544 See merge request !545
-
Steffen Müthing authored
As we don't want to change the default behavior on a release branch, require users to explicitly enable the new placement for the 2.6 release.
-
Steffen Müthing authored
The current logic for placing / locating the virtualenv is rather flaky in combination with installed modules or when `DUNE_PYTHON_VIRTUALENV_SETUP` was not enabled for all modules (as happens in the CI images). This MR improves the situation in two ways: - It allows users to explicitly set `DUNE_PYTHON_VIRTUALENV_PATH` when running CMake. The build system will then use the given path for the virtualenv instead of guessing a location. - When using an absolute build directory with dunecontrol, the virtualenv will no longer be placed inside the build directory of any module, but in the dedicated top-level directory `dune-python-env` inside the build directory root. This behavior can be disabled by setting `DUNE_PYTHON_EXTERNAL_VIRTUALENV_FOR_ABSOLUTE_BUILDDIR=0`. See merge request !544
-
Steffen Müthing authored
While this change adds new features to the 2.6 release, it is required to later create a stable configuration for CI modules that use dune-testtools. See merge request !542 See merge request !543
-
Steffen Müthing authored
Knowing whether `dunecontrol` was invoked with an absolute build directory can be very useful in CMake, as we can then place state that is shared between multiple modules directly in the build directory, e.g. the Python virtualenv. See merge request !542
-
Steffen Müthing authored
See merge request !541
-
Steffen Müthing authored
pip 10 moved several interfaces to an internal package, causing our pyversion.py script to fail. This patches fixes the issue by getting installed distributions directly from setuptools, as suggested in https://github.com/pypa/pip/issues/5243. See merge request !540 (cherry picked from commit 746aa626) 2443bc4a Make Python package detection work with pip 10
-
- 29 Jun, 2018 1 commit
-
-
Steffen Müthing authored
See merge request !539
-