Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
pystencils
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pycodegen
pystencils
Merge requests
!39
Conftest: waLBerla, kerncraft
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Conftest: waLBerla, kerncraft
seitz/pystencils:conftest-waLBerla-kerncraft
into
master
Overview
0
Commits
2
Pipelines
1
Changes
1
Merged
Stephan Seitz
requested to merge
seitz/pystencils:conftest-waLBerla-kerncraft
into
master
5 years ago
Overview
0
Commits
2
Pipelines
1
Changes
1
Expand
Add
waLBerla
to conftest
Add missing file to conftest for
kerncraft
Edited
5 years ago
by
Stephan Seitz
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
7922fd83
2 commits,
5 years ago
1 file
+
9
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
conftest.py
+
9
−
1
Options
@@ -48,9 +48,17 @@ except ImportError:
try
:
import
kerncraft
except
ImportError
:
collect_ignore
+=
[
os
.
path
.
join
(
SCRIPT_FOLDER
,
"
pystencils_tests/test_kerncraft_coupling.py
"
)]
collect_ignore
+=
[
os
.
path
.
join
(
SCRIPT_FOLDER
,
"
pystencils_tests/test_kerncraft_coupling.py
"
),
os
.
path
.
join
(
SCRIPT_FOLDER
,
"
pystencils_tests/benchmark/benchmark.py
"
)]
add_path_to_ignore
(
'
pystencils/kerncraft_coupling
'
)
try
:
import
waLBerla
except
ImportError
:
collect_ignore
+=
[
os
.
path
.
join
(
SCRIPT_FOLDER
,
"
pystencils_tests/test_aligned_array.py
"
),
os
.
path
.
join
(
SCRIPT_FOLDER
,
"
pystencils_tests/test_datahandling_parallel.py
"
),
os
.
path
.
join
(
SCRIPT_FOLDER
,
"
pystencils_tests/test_small_block_benchmark.ipynb
"
)]
try
:
import
blitzdb
except
ImportError
:
Loading