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
3c6d0dee
Commit
3c6d0dee
authored
4 years ago
by
Samuel Burbulla
Committed by
Andreas Dedner
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add note to CHANGELOG.md
Reset LD_LIBARY_PATH when call deactivate. Fix dynamic_lookup.
parent
8c79cfd0
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!900
Feature/scikit build
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+6
-0
6 additions, 0 deletions
CHANGELOG.md
bin/duneactivate
+23
-1
23 additions, 1 deletion
bin/duneactivate
cmake/modules/DuneAddPybind11Module.cmake
+1
-1
1 addition, 1 deletion
cmake/modules/DuneAddPybind11Module.cmake
with
30 additions
and
2 deletions
CHANGELOG.md
+
6
−
0
View file @
3c6d0dee
...
...
@@ -15,6 +15,12 @@
Furthermore, flags for either shared library or position independent code
needs to be used.
-
Support for distributing DUNE modules as python packages has been added.
Package meta data is parsed in
`packagemetadata.py`
from the dune.module file.
A script
`/bin/dunepackaging.py`
was added to generate package files
(
`setup.py`
,
`pyproject.toml`
) that can also be used to upload packages to
the Python Package Index.
-
Eigenvectors of symmetric 2x2
`FieldMatrix`
es are now computed correctly
even when they have zero eigenvalues.
...
...
This diff is collapsed.
Click to expand it.
bin/duneactivate
+
23
−
1
View file @
3c6d0dee
envpath=`dirname "${BASH_SOURCE[0]}"`
source $envpath/activate
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$VIRTUAL_ENV/lib
_OLD_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
LD_LIBRARY_PATH="$VIRTUAL_ENV/lib:$LD_LIBRARY_PATH"
export LD_LIBRARY_PATH
save_function() {
local ORIG_FUNC=$(declare -f $1)
local NEWNAME_FUNC="$2${ORIG_FUNC#$1}"
eval "$NEWNAME_FUNC"
}
save_function deactivate old_deactivate
deactivate () {
if [ -n "${_OLD_LD_LIBRARY_PATH:-}" ] ; then
LD_LIBRARY_PATH="${_OLD_LD_LIBRARY_PATH:-}"
export LD_LIBRARY_PATH
unset _OLD_LD_LIBRARY_PATH
fi
old_deactivate
unset -f old_deactivate
}
This diff is collapsed.
Click to expand it.
cmake/modules/DuneAddPybind11Module.cmake
+
1
−
1
View file @
3c6d0dee
...
...
@@ -79,7 +79,7 @@ function(dune_add_pybind11_module)
# https://pybind11.readthedocs.io/en/stable/compiling.html#building-manually
if
(
APPLE
)
set_target_properties
(
${
PYBIND11_MODULE_NAME
}
PROPERTIES SUFFIX
".so"
)
target_link_options
(
${
PYBIND11_MODULE_NAME
}
PRIVATE
"
-undefined dynamic_lookup
"
)
target_link_options
(
${
PYBIND11_MODULE_NAME
}
PRIVATE -undefined dynamic_lookup
)
endif
()
target_compile_definitions
(
${
PYBIND11_MODULE_NAME
}
PRIVATE
${
PYBIND11_MODULE_COMPILE_DEFINITIONS
}
)
...
...
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