Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
lbmpy
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
lbmpy
Commits
32d0f124
Commit
32d0f124
authored
11 months ago
by
Frederik Hennig
Browse files
Options
Downloads
Patches
Plain Diff
fix CI and conftest
parent
91688bb2
No related branches found
No related tags found
1 merge request
!172
Draft: Changes for compatibility with pystencils 2.0
Pipeline
#67761
failed
11 months ago
Stage: pretest
Stage: test
Stage: docs
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
conftest.py
+6
-6
6 additions, 6 deletions
conftest.py
with
7 additions
and
7 deletions
.gitlab-ci.yml
+
1
−
1
View file @
32d0f124
...
...
@@ -265,7 +265,7 @@ build-documentation:
pages
:
image
:
i10git.cs.fau.de:5005/pycodegen/pycodegen/full
stage
:
deploy
needs
:
[
"
build-documentation"
]
needs
:
[
"
tests-and-coverage"
,
"
build-documentation"
]
script
:
-
ls -l
-
mv coverage_report html_doc
...
...
This diff is collapsed.
Click to expand it.
conftest.py
+
6
−
6
View file @
32d0f124
...
...
@@ -10,15 +10,15 @@ import pathlib
import
nbformat
from
nbconvert
import
PythonExporter
import
sympy
from
lbmpy._compat
import
IS_PYSTENCILS_2
# Trigger config file reading / creation once - to avoid race conditions when multiple instances are creating it
# at the same time
try
:
# only for pystencils 1.x
if
IS_PYSTENCILS_2
:
from
pystencils.backend.jit
import
legacy_cpu
except
ImportError
:
pass
from
lbmpy._compat
import
IS_PYSTENCILS_2
else
:
from
pystencils.cpu
import
cpujit
# trigger cython imports - there seems to be a problem when multiple processes try to compile the same cython file
# at the same time
...
...
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