Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
VirtualFluids
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
iRMB
VirtualFluids
Commits
14a97c8b
Commit
14a97c8b
authored
2 years ago
by
Hkorb
Browse files
Options
Downloads
Patches
Plain Diff
WIP fix pipeline
parent
09ec1d5a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!170
Kernel templetization and efficiency improvements
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-1
2 additions, 1 deletion
.gitlab-ci.yml
setup.py
+11
-13
11 additions, 13 deletions
setup.py
with
13 additions
and
14 deletions
.gitlab-ci.yml
+
2
−
1
View file @
14a97c8b
...
...
@@ -195,7 +195,8 @@ gcc_9_python_bindings_test:
before_script
:
-
export PYTHONPATH="Python"
-
pip3 install -e . --global-option="-DBUILD_VF_CPU=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache"
-
pip3 --version
-
pip3 install -e . --config-setting="-DBUILD_VF_CPU=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache"
-
pip3 install -r Python/requirements.txt
script
:
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
11
−
13
View file @
14a97c8b
...
...
@@ -11,11 +11,14 @@ install via python:
set CMAKE Flags via -DBUILD_VF_GPU:BOOL=1
CMAKE flags have to be separated by --
example: python setup.py develop -- VBUILD_VF_CPU:BOOL=ON
then run pip install -e . to add to environment
or install via pip:
pip install -e .
set CMAKE Flags via --config-settings
"
-DBUILD_VF_GPU=1
"
example: pip install -e . --config-settings=
"
-DBUILD_VF_GPU=ON
"
for pip>21:
set CMAKE Flags via --config-settings
"
-DBUILD_VF_GPU=ON
"
example: pip install -e . --config-settings=
"
-DBUILD_VF_GPU=ON
"
for pip <21:
set CMAKE Flags via --global-option =
"
-DBUILD_VF_GPU=ON
"
example: pip install -e . --global-option=
"
-DBUILD_VF_GPU=ON
"
"""
init_py
=
"
from .bindings import *
"
...
...
@@ -41,15 +44,6 @@ config_args = []
if
(
"
cmake_args
"
in
locals
()):
config_args
.
extend
([
f
"
{
k
}
=
{
v
}
"
for
k
,
v
in
locals
()[
"
cmake_args
"
].
items
()])
# if __name__ == "__main__":
# args = sys.argv.copy()
# args.append("--")
# ind = args.index("--")
# sys_args = args[ind+1:-1]
# for arg in sys_args:
# sys.argv.remove(arg)
cmake_args
=
[
f
"
-DPython3_ROOT_DIR=
{
Path
(
sys
.
prefix
)
}
"
,
...
...
@@ -69,7 +63,11 @@ skbuild.setup(
packages
=
[
"
pyfluids
"
],
package_dir
=
{
""
:
"
pythonbindings
"
},
cmake_args
=
cmake_args
,
cmake_install_target
=
target
cmake_install_target
=
target
,
# package_data={"pyfluids": ["bindings.*"]},
include_package_data
=
True
,
# cmake_install_dir="pythonbindings"
# data_files=[("python_bindings/pyfluids", ["bindings.*"])]
)
# setuptools.setup(
# name="pyfluids",
...
...
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