Skip to content
Snippets Groups Projects
Commit 4f29c212 authored by Simon Praetorius's avatar Simon Praetorius
Browse files

Update compiler toolchain

parent 65585764
No related branches found
No related tags found
2 merge requests!1470Fix wrong variable name to make target hash (2.10),!1445Update compiler toolchain
......@@ -21,15 +21,15 @@ variables:
DUNECI_CMAKE_FLAGS: '-DDUNE_RUNNING_IN_CI=TRUE'
DUNE_LOG_LEVEL: DEBUG
ubuntu:20.04 gcc-9-17-expensive:
debian:11 gcc-10-20-expensive:
extends: .common
# This image has Vc
image: registry.dune-project.org/docker/ci/ubuntu:20.04
image: registry.dune-project.org/docker/ci/debian:11
# allow expensive tests
variables:
DUNECI_CXXFLAGS: -mavx
DUNECI_TEST_LABELS: ""
DUNECI_TOOLCHAIN: gcc-9-17
DUNECI_TOOLCHAIN: gcc-10-20
DUNE_TEST_EXPECTED_VC_IMPLEMENTATION: AVX
# require AVX to properly test Vc
tags: [duneci, "iset:avx"]
......@@ -37,20 +37,6 @@ ubuntu:20.04 gcc-9-17-expensive:
# is unavailable
allow_failure: true
ubuntu:20.04 gcc-9-17-nopython:
extends: .common
image: registry.dune-project.org/docker/ci/ubuntu:20.04
variables:
DUNECI_TOOLCHAIN: gcc-9-17
DUNECI_CMAKE_FLAGS: '-DCMAKE_DISABLE_FIND_PACKAGE_Python3=TRUE'
debian:11 clang-11-20-nobindings:
extends: .common
image: registry.dune-project.org/docker/ci/debian:11
variables:
DUNECI_TOOLCHAIN: clang-11-20
DUNECI_CMAKE_FLAGS: '-DDUNE_ENABLE_PYTHONBINDINGS=OFF'
core-modules-test:
stage: downstream
variables:
......
......@@ -67,11 +67,11 @@ by the --opts=<file> option. Specify the options via the variable
An example of an options file is
# use a special compiler (g++ version 5.0),
# use a special compiler (g++ version 14.0),
# install to a custom directory, default is /usr/local/bin,
# disable the external library SuperLU,
# and use Ninja-build instead of make as the build-tool
CMAKE_FLAGS="-DCMAKE_CXX_COMPILER=g++-5 -DCMAKE_INSTALL_PREFIX='/tmp/HuHu' -DCMAKE_DISABLE_FIND_PACKAGE_SuperLU=true -GNinja"
CMAKE_FLAGS="-DCMAKE_CXX_COMPILER=g++-14 -DCMAKE_INSTALL_PREFIX='/tmp/HuHu' -DCMAKE_DISABLE_FIND_PACKAGE_SuperLU=true -GNinja"
Links
-----
......
......@@ -28,10 +28,13 @@ Dependencies
dune-common depends on the following software packages
- CMake >= 3.16
- Compiler (C, C++): GNU >= 9 or Clang >= 10
- Compiler (C, C++): GNU >= 10 or Clang >= 13
- Library: GNU libstdc++ >= 10 or Clang libc++ >= 13
Other compilers might work too, they need to support C++17 to the extent the
ones above do.
Other compilers may also work, but they must support C++20 to the same extent as
the above. For an overview of the C++20 features supported by these versions, see
https://en.cppreference.com/w/cpp/compiler_support. For compiling the Python
bindings, libc++ is not currently supported.
The following software is recommended but optional:
......
......@@ -375,9 +375,9 @@ An example options file might look like this:
#use this options to configure and make if no other options are given
CMAKE_FLAGS=" \\
-DCMAKE_CXX_COMPILER=g++-5 \\
-DCMAKE_CXX_COMPILER=g++-14 \\
-DCMAKE_CXX_FLAGS='-Wall -pedantic' \\
-DCMAKE_INSTALL_PREFIX=/install/path" #Force g++-5 and set compiler flags
-DCMAKE_INSTALL_PREFIX=/install/path" #Force g++-14 and set compiler flags
If you save this information into example.opts you can pass the opts file to
dunecontrol via the --opts option, e. g.
......
......@@ -195,7 +195,7 @@ Set options for \fICOMMAND\fP, e.g. CMAKE_FLAGS, to specify parameters
passed to the specific command. In case of cmake this might look as
follows
CMAKE_FLAGS="-DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_CXX_FLAGS='-fPIC -g -O3' -DFOO_PREFIX=/path/to/libfoo"
CMAKE_FLAGS="-DCMAKE_CXX_COMPILER=g++-14 -DCMAKE_CXX_FLAGS='-fPIC -g -O3' -DFOO_PREFIX=/path/to/libfoo"
In case of make a common use case is to enable concurrency, e.g.
......@@ -206,7 +206,7 @@ MAKE_FLAGS="-j4"
.HP
.B DUNE_CONTROL_PATH
.IP
Colon-separated list to specify where
Colon-separated list to specify where
.B dunecontrol
searches for Dune modules.
Entries are either directories, which are then used recursively for
......
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