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
f441811f
Commit
f441811f
authored
3 years ago
by
Andreas Dedner
Browse files
Options
Downloads
Patches
Plain Diff
disable haveAssert for now. It doesn't work as advertised for now
parent
f1e21976
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!960
refactor the way python is used in dune
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
python/dune/common/checkconfiguration.py
+6
-0
6 additions, 0 deletions
python/dune/common/checkconfiguration.py
python/dune/generator/cmakebuilder.py
+4
-3
4 additions, 3 deletions
python/dune/generator/cmakebuilder.py
with
10 additions
and
3 deletions
python/dune/common/checkconfiguration.py
+
6
−
0
View file @
f441811f
...
...
@@ -16,6 +16,12 @@ def assertHave(identifier):
provided the config file by calling
assertHave(
"
HAVE_DUNE_COMMON
"
)
'''
# the following simply will not work anymore - the issue is that the
# approach used here requires dune-py to have already been setup before
# calling 'assertHave' that is not guaranteed to be the case.
# Possibly we can use the 'metadata' file instead.
# We simply return for now
return
config
=
os
.
path
.
join
(
dune
.
common
.
module
.
get_dune_py_dir
(),
"
config.h
"
)
if
not
os
.
path
.
isfile
(
config
):
raise
ConfigurationError
(
"
dune-py not configured yet
"
)
...
...
This diff is collapsed.
Click to expand it.
python/dune/generator/cmakebuilder.py
+
4
−
3
View file @
f441811f
...
...
@@ -197,7 +197,7 @@ class Builder:
if
nlines
>
1
:
self
.
savedOutput
[
1
].
write
(
"
\n
###############################
\n
"
)
def
load
(
self
,
moduleName
,
source
,
pythonName
,
extraCMake
):
def
load
(
self
,
moduleName
,
source
,
pythonName
,
extraCMake
=
None
):
## TODO replace if rank with something better
## and remove barrier further down
if
not
self
.
initialized
:
...
...
@@ -227,8 +227,9 @@ class Builder:
# store original file size
origPos
=
out
.
tell
()
out
.
write
(
line
+
"
\n
"
)
for
x
in
extraCMake
:
out
.
write
(
x
.
replace
(
"
TARGET
"
,
moduleName
)
+
"
\n
"
)
if
extraCMake
is
not
None
:
for
x
in
extraCMake
:
out
.
write
(
x
.
replace
(
"
TARGET
"
,
moduleName
)
+
"
\n
"
)
# update build system
logger
.
debug
(
"
Rebuilding module
"
)
try
:
...
...
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