Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Core Modules
dune-common
Commits
4f29c212
Commit
4f29c212
authored
5 months ago
by
Simon Praetorius
Browse files
Options
Downloads
Patches
Plain Diff
Update compiler toolchain
parent
65585764
No related branches found
No related tags found
2 merge requests
!1470
Fix wrong variable name to make target hash (2.10)
,
!1445
Update compiler toolchain
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.gitlab-ci.yml
+3
-17
3 additions, 17 deletions
.gitlab-ci.yml
INSTALL
+2
-2
2 additions, 2 deletions
INSTALL
README.md
+6
-3
6 additions, 3 deletions
README.md
bin/duneproject
+2
-2
2 additions, 2 deletions
bin/duneproject
doc/dunecontrol.1
+2
-2
2 additions, 2 deletions
doc/dunecontrol.1
with
15 additions
and
26 deletions
.gitlab-ci.yml
+
3
−
17
View file @
4f29c212
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
INSTALL
+
2
−
2
View file @
4f29c212
...
...
@@ -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
-----
...
...
This diff is collapsed.
Click to expand it.
README.md
+
6
−
3
View file @
4f29c212
...
...
@@ -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:
...
...
This diff is collapsed.
Click to expand it.
bin/duneproject
+
2
−
2
View file @
4f29c212
...
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
doc/dunecontrol.1
+
2
−
2
View file @
4f29c212
...
...
@@ -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++-1
1
-DCMAKE_CXX_FLAGS='-fPIC -g -O3' -DFOO_PREFIX=/path/to/libfoo"
CMAKE_FLAGS="-DCMAKE_CXX_COMPILER=g++-1
4
-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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment