Skip to content
Snippets Groups Projects
Commit 6a4c5270 authored by Hkorb's avatar Hkorb
Browse files

WIP fix python install

parent 323638b0
No related branches found
No related tags found
1 merge request!170Kernel templetization and efficiency improvements
...@@ -133,7 +133,7 @@ gcc_9_python: ...@@ -133,7 +133,7 @@ gcc_9_python:
- export CCACHE_DIR=$CI_PROJECT_DIR/cache - export CCACHE_DIR=$CI_PROJECT_DIR/cache
script: script:
- python3 setup.py bdist_wheel build_ext --build-temp=build -- -DBUILD_VF_CPU=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache - python3 setup.py develop -- -DBUILD_VF_CPU=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache
############################################################################### ###############################################################################
## Container Upload ## ## Container Upload ##
...@@ -195,8 +195,7 @@ gcc_9_python_bindings_test: ...@@ -195,8 +195,7 @@ gcc_9_python_bindings_test:
before_script: before_script:
- export PYTHONPATH="Python" - export PYTHONPATH="Python"
- export VF_WHEEL=$(find dist/*.whl) - pip3 install -e .
- pip3 install $VF_WHEEL
- pip3 install -r Python/requirements.txt - pip3 install -r Python/requirements.txt
script: script:
......
import sys import sys
from pathlib import Path from pathlib import Path
import setuptools
import skbuild import skbuild
""" """
Install python wrapper of virtual fluids Install python wrapper of virtual fluids
install via python: install via python:
python setup.py install build_ext python setup.py develop
set CMAKE Flags via -DBUILD_VF_GPU:BOOL=1 set CMAKE Flags via -DBUILD_VF_GPU:BOOL=1
CMAKE flags have to be separated by -- CMAKE flags have to be separated by --
example: python setup.py install build_ext -- VBUILD_VF_CPU:BOOL=ON example: python setup.py develop -- VBUILD_VF_CPU:BOOL=ON
then run pip install -e . to add to environment
or install via pip: or install via pip:
pip install -e . pip install -e .
set CMAKE Flags via --config-settings -DBUILD_VF_GPU=1 set CMAKE Flags via --config-settings "-DBUILD_VF_GPU=1"
example: pip install -e . --config-settings="-DBUILD_VF_GPU=ON"
""" """
init_py = "from .bindings import *" init_py = "from .bindings import *"
...@@ -28,11 +31,26 @@ init_file.write_text(init_py) ...@@ -28,11 +31,26 @@ init_file.write_text(init_py)
# create build_dir # create build_dir
name_of_build_dir = "build" name_of_build_dir = "build"
build_dir = (top_dir/name_of_build_dir).mkdir(exist_ok=True) build_dir = top_dir/name_of_build_dir
extra_args = [] build_dir.mkdir(exist_ok=True)
target = "python_bindings"
config_args = []
if("cmake_args" in locals()): if("cmake_args" in locals()):
extra_args.extend([f"{k}={v}" for k,v in locals()["cmake_args"].items()]) 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 = [ cmake_args = [
f"-DPython3_ROOT_DIR={Path(sys.prefix)}", f"-DPython3_ROOT_DIR={Path(sys.prefix)}",
"-DBUILD_VF_PYTHON_BINDINGS=ON", "-DBUILD_VF_PYTHON_BINDINGS=ON",
...@@ -40,13 +58,21 @@ cmake_args = [ ...@@ -40,13 +58,21 @@ cmake_args = [
"-DBUILD_VF_DOUBLE_ACCURACY=OFF", "-DBUILD_VF_DOUBLE_ACCURACY=OFF",
"-DBUILD_VF_UNIT_TESTS:BOOL=OFF", "-DBUILD_VF_UNIT_TESTS:BOOL=OFF",
"-DBUILD_WARNINGS_AS_ERRORS=OFF", "-DBUILD_WARNINGS_AS_ERRORS=OFF",
] + extra_args ] + config_args + sys_args
maker = skbuild.cmaker.CMaker()
maker.configure(clargs=cmake_args, cmake_install_dir=build_dir)
maker.make(install_target=target)
skbuild.setup( # skbuild.setup(
name="pyfluids", # name="pyfluids",
# packages=["pyfluids"],
# package_dir={"": "pythonbindings"},
# cmake_args = cmake_args,
# cmake_install_target=target
# )
setuptools.setup(
name="pyfluids",
packages=["pyfluids"], packages=["pyfluids"],
package_dir={"": "pythonbindings"}, package_dir={"": "pythonbindings"},
cmake_args = cmake_args,
cmake_install_dir=str(build_dir),
cmake_install_target="python_bindings"
) )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment