Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-codegen
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
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Christian Heinigk
dune-codegen
Commits
38002169
Commit
38002169
authored
8 years ago
by
Dominic Kempf
Browse files
Options
Downloads
Patches
Plain Diff
Update to comply with refactoring of dune-python
parent
d651eb54
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmake/modules/DunePerftoolMacros.cmake
+1
-1
1 addition, 1 deletion
cmake/modules/DunePerftoolMacros.cmake
python/CMakeLists.txt
+6
-9
6 additions, 9 deletions
python/CMakeLists.txt
python/setup.py
+1
-1
1 addition, 1 deletion
python/setup.py
with
8 additions
and
11 deletions
cmake/modules/DunePerftoolMacros.cmake
+
1
−
1
View file @
38002169
...
...
@@ -102,7 +102,7 @@ function(add_generated_executable)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/cmake/modules/StandardMain.cmake
${
GEN_MAIN
}
)
add_custom_command
(
OUTPUT
${
GEN_OPERATOR
}
${
GEN_DRIVER
}
COMMAND
${
CMAKE_BINARY_DIR
}
/dune-env
-2
ufl2pdelab
COMMAND
${
CMAKE_BINARY_DIR
}
/dune-env ufl2pdelab
--project-basedir
${
CMAKE_BINARY_DIR
}
--operator-file
${
GEN_OPERATOR
}
--driver-file
${
GEN_DRIVER
}
...
...
This diff is collapsed.
Click to expand it.
python/CMakeLists.txt
+
6
−
9
View file @
38002169
...
...
@@ -10,16 +10,13 @@ create_virtualenv_wrapper(ENVPATH ${dune-python_DIR}/python2-env
NAME notebook
)
# Install all the external packages that we have as submodules
dune_install_python_package
(
PATH pymbolic
)
dune_install_python_package
(
PATH cgen
)
dune_install_python_package
(
PATH loopy
)
dune_install_python_package
(
PATH ufl
)
dune_install_python_package
(
PATH pymbolic MAJOR_VERSION 2
)
# islpy has some serious bug: it cannot be installed with pip
dune_install_python_package
(
PATH cgen MAJOR_VERSION 2
)
# --no-deps to avoid reinstallation of islpy through pip...argh!
dune_install_python_package
(
PATH loopy MAJOR_VERSION 2 ADDITIONAL_PIP_PARAMS --no-deps
)
dune_install_python_package
(
PATH ufl MAJOR_VERSION 2
)
# Install out python package
dune_install_python_package
(
PATH . MAJOR_VERSION 2
)
# Install our python package
dune_install_python_package
(
PATH .
)
add_python_test_command
(
COMMAND python -m pytest --pep8 VIRTUALENV dune-env-2
WORKING_DIRECTORY
${
CMAKE_SOURCE_DIR
}
/python/dune/perftool
...
...
This diff is collapsed.
Click to expand it.
python/setup.py
+
1
−
1
View file @
38002169
...
...
@@ -30,7 +30,7 @@ setup(name='dune.perftool',
author
=
'
Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>
'
,
url
=
'
http://conan2.iwr.uni-heidelberg.de/git/dominic/dune-perftool
'
,
packages
=
[
'
dune.perftool
'
],
install_requires
=
[
'
sympy
'
],
install_requires
=
[
'
dune.testtools
'
,
'
sympy
'
],
tests_require
=
[
'
pytest
'
],
cmdclass
=
{
'
test
'
:
PyTest
},
entry_points
=
{
...
...
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