Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dune-fem-dg
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
Container Registry
Model registry
Operate
Environments
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
dune-fem
dune-fem-dg
Commits
75bc78b6
Commit
75bc78b6
authored
4 years ago
by
Robert K
Browse files
Options
Downloads
Patches
Plain Diff
[bugfix][ci] Try to fix python tests.
parent
686de918
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!23
Singleton and python with clang
Pipeline
#31274
failed
4 years ago
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+17
-15
17 additions, 15 deletions
.gitlab-ci.yml
pydemo/euler/main.py
+1
-1
1 addition, 1 deletion
pydemo/euler/main.py
scripts/build-dune-fem-dg.sh
+9
-3
9 additions, 3 deletions
scripts/build-dune-fem-dg.sh
with
27 additions
and
19 deletions
.gitlab-ci.yml
+
17
−
15
View file @
75bc78b6
...
...
@@ -9,11 +9,8 @@ variables:
PYTHONPATH
:
"
/duneci/modules/dune-common/build-cmake/python:/duneci/modules/dune-geometry/build-cmake/python:/duneci/modules/dune-grid/build-cmake/python:/duneci/modules/dune-istl/build-cmake/python:/duneci/modules/dune-alugrid/build-cmake/python:/duneci/modules/dune-fem/build-cmake/python:$CI_PROJECT_DIR/build-cmake/python"
before_script
:
-
. /duneci/bin/duneci-init-job
#- python3 -m venv /duneci/modules/dune-pip
#- source /duneci/modules/dune-pip/bin/activate
#- pip install --upgrade pip
#- pip install ufl numpy matplotlib mpi4py portalocker
-
export TORTURE_TESTS=off
-
source /duneci/bin/duneci-init-job
-
duneci-install-module https://gitlab.dune-project.org/core/dune-common.git
-
duneci-install-module https://gitlab.dune-project.org/core/dune-geometry.git
-
duneci-install-module https://gitlab.dune-project.org/core/dune-grid.git
...
...
@@ -25,31 +22,36 @@ before_script:
debian-11-gcc-9-17
:
image
:
registry.dune-project.org/docker/ci/debian:11
script
:
#- source /duneci/modules/dune-pip/bin/activate
# issue with setup-dunepy: dune-fem-dg not yet build so dependency in dune-fem-dg fails
# - python /duneci/modules/dune-python/bin/setup-dunepy.py --opts=$CI_PROJECT_DIR/scripts/opts/ci-gcc.opts install
-
export TORTURE_TESTS=off
-
duneci-standard-test
variables
:
DUNECI_TOOLCHAIN
:
gcc-9-20
# DUNE_CONTROL_PATH: /duneci/modules:$CI_PROJECT_DIR
DUNE_CMAKE_FLAGS
:
"
-DCMAKE_DISABLE_FIND_PACKAGE_PETSc=TRUE
-DDUNE_ENABLE_PYTHONBINDINGS=ON
-DDUNE_GRID_GRIDTYPE_SELECTOR=ON
-DDUNE_MAX_TEST_CORES=4
-DBUILD_SHARED_LIBS=TRUE
-DDUNE_PYTHON_INSTALL_LOCATION=none
-DCMAKE_POSITION_INDEPENDENT_CODE=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_Alberta=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE
-DCMAKE_DISABLE_DOCUMENTATION=TRUE"
# tags: [stuttgart2]
DUNE_CMAKE_FLAGS
:
"
-DDUNE_GRID_GRIDTYPE_SELECTOR=ON
-DCMAKE_CXX_FLAGS='-std=c++17
-O2
-g
-Wall
-fdiagnostics-color=always'
-DDUNE_ENABLE_PYTHONBINDINGS=ON
-DDUNE_MAX_TEST_CORES=4
-DBUILD_SHARED_LIBS=TRUE
-DDUNE_PYTHON_INSTALL_LOCATION=none
-DCMAKE_POSITION_INDEPENDENT_CODE=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_Alberta=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE
-DCMAKE_DISABLE_DOCUMENTATION=TRUE"
#DUNE_CMAKE_FLAGS: "-DCMAKE_DISABLE_FIND_PACKAGE_PETSc=TRUE -DDUNE_ENABLE_PYTHONBINDINGS=ON -DDUNE_GRID_GRIDTYPE_SELECTOR=ON -DDUNE_MAX_TEST_CORES=4 -DBUILD_SHARED_LIBS=TRUE -DDUNE_PYTHON_INSTALL_LOCATION=none -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Alberta=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE -DCMAKE_DISABLE_DOCUMENTATION=TRUE"
DUNECI_TOOLCHAIN
:
gcc-10-17
DUNE_CONTROL_PATH
:
/duneci/modules:$CI_PROJECT_DIR
tags
:
[
stuttgart2
]
ubuntu-20.04-clang-10-17
:
image
:
registry.dune-project.org/docker/ci/ubuntu:20.04
script
:
-
export TORTURE_TESTS=off
-
duneci-standard-test
variables
:
DUNECI_TOOLCHAIN
:
clang-10-20
# bug in CI clang-10-17 and clang-10-20 are mixed up
DUNECI_TOOLCHAIN
:
clang-10-20
DUNE_CONTROL_PATH
:
/duneci/modules:$CI_PROJECT_DIR
#DUNE_CMAKE_FLAGS: "-DDUNE_ENABLE_PYTHONBINDINGS=OFF -DDUNE_MAX_TEST_CORES=4 -DBUILD_SHARED_LIBS=TRUE -DDUNE_PYTHON_INSTALL_LOCATION=none -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Alberta=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE -DCMAKE_DISABLE_DOCUMENTATION=TRUE"
tags
:
[
stuttgart1
]
DUNE_CMAKE_FLAGS
:
"
-DDUNE_ENABLE_PYTHONBINDINGS=ON
-DCMAKE_CXX_COMPILER=clang++-10
-DCMAKE_C_COMPILER=clang-10
-DDUNE_GRID_GRIDTYPE_SELECTOR=ON
-DCMAKE_CXX_FLAGS='-std=c++17
-O2
-g
-Wall
-fdiagnostics-color=always'
-DDUNE_MAX_TEST_CORES=4
-DBUILD_SHARED_LIBS=TRUE
-DDUNE_PYTHON_INSTALL_LOCATION=none
-DCMAKE_POSITION_INDEPENDENT_CODE=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_Alberta=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE
-DCMAKE_DISABLE_DOCUMENTATION=TRUE"
DUNECI_CMAKE_FLAGS
:
$DUNE_CMAKE_FLAGS
tags
:
[
stuttgart3
]
ubuntu-20.04-gcc-9-17
:
image
:
registry.dune-project.org/docker/ci/ubuntu:20.04
script
:
-
duneci-standard-test
variables
:
DUNECI_TOOLCHAIN
:
gcc-9-17
DUNE_CONTROL_PATH
:
/duneci/modules:$CI_PROJECT_DIR
DUNE_CMAKE_FLAGS
:
"
-DDUNE_ENABLE_PYTHONBINDINGS=ON
-DCMAKE_CXX_COMPILER=clang++-10
-DCMAKE_C_COMPILER=clang-10
-DDUNE_GRID_GRIDTYPE_SELECTOR=ON
-DCMAKE_CXX_FLAGS='-std=c++17
-O2
-g
-Wall
-fdiagnostics-color=always'
-DDUNE_MAX_TEST_CORES=4
-DBUILD_SHARED_LIBS=TRUE
-DDUNE_PYTHON_INSTALL_LOCATION=none
-DCMAKE_POSITION_INDEPENDENT_CODE=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_Alberta=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE
-DCMAKE_DISABLE_DOCUMENTATION=TRUE"
DUNECI_CMAKE_FLAGS
:
$DUNE_CMAKE_FLAGS
tags
:
[
stuttgart1
]
This diff is collapsed.
Click to expand it.
pydemo/euler/main.py
+
1
−
1
View file @
75bc78b6
...
...
@@ -34,7 +34,7 @@ Model.endTime = 0.01
run
(
Model
,
startLevel
=
0
,
polOrder
=
2
,
limiter
=
"
default
"
,
primitive
=
primitive
,
saveStep
=
0.05
,
subsamp
=
2
,
dt
=
None
,
threading
=
False
,
grid
=
"
alucube
"
,
dt
=
None
,
threading
=
False
,
grid
=
"
yasp
"
,
space
=
"
dgonb
"
,
#space="dglagrange",
#space=("dglagrange","lobatto"),
...
...
This diff is collapsed.
Click to expand it.
scripts/build-dune-fem-dg.sh
+
9
−
3
View file @
75bc78b6
...
...
@@ -33,9 +33,10 @@ DUNEVERSION=
FLAGS
=
"-O3 -DNDEBUG -funroll-loops -finline-functions -Wall -ftree-vectorize -fno-stack-protector -mtune=native"
DUNECOREMODULES
=
"dune-common dune-istl dune-geometry dune-grid"
DUNECOREMODULES
=
"dune-common dune-istl dune-geometry dune-grid
dune-localfunctions
"
DUNEEXTMODULES
=
"dune-alugrid dune-spgrid"
DUNEFEMMODULES
=
"dune-fem dune-fempy dune-fem-dg"
DUNEFEMMODULES
=
"dune-fem dune-fem-dg"
EXTRAFEMMODULES
=
"dune-fempy"
# build flags for all DUNE modules
# change according to your needs
...
...
@@ -73,7 +74,7 @@ export DUNE_PY_DIR=\${DUNE_CONTROL_PATH}/cache/
export DUNE_CMAKE_FLAGS="
\$
{
CMAKE_FLAGS
}
"
MODULES=
\
`\
$
DUNE
_
CO
NTROL_PATH/dune-common/bin/dunecontrol --print
\`
MODULES=
\
"
$DUNECO
REMODULES
$DUNEEXTMODULES
$DUNEFEMMODULES
\"
for MOD in
\$
MODULES; do
MODPATH=
\"\$
{PWD}/
\$
{MOD}/build-cmake/python
\"
MODFOUND=
\`
echo
\$
PYTHONPATH | grep
\$
MODPATH
\`
...
...
@@ -110,6 +111,11 @@ for MOD in $DUNEFEMMODULES ; do
git clone
$DUNEBRANCH
https://gitlab.dune-project.org/dune-fem/
$MOD
.git
done
# get all dune extension modules necessary
for
MOD
in
$EXTRAFEMMODULES
;
do
git clone
$DUNEBRANCH
https://gitlab.dune-project.org/dune-fem/
$MOD
.git
done
# load environment variables
source
activate.sh
...
...
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