From 54b46f05ad7d3483f31e30a415d0449e25809655 Mon Sep 17 00:00:00 2001
From: Henry <henry.korb@geo.uu.se>
Date: Fri, 7 Oct 2022 11:11:37 +0200
Subject: [PATCH] update CI after update of python install process
---
.gitlab-ci.yml | 2 +-
setup.py | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c2cfa45ae..8d84e7c6c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -132,7 +132,7 @@ gcc_9_python:
- export CCACHE_DIR=$CI_PROJECT_DIR/cache
script:
- - python3 setup.py bdist_wheel build_ext --build-temp=build
+ - python3 setup.py bdist_wheel build_ext --build-temp=build -DBUILD_VF_CPU=ON
###############################################################################
## Container Upload ##
diff --git a/setup.py b/setup.py
index 52dc347f1..b5cd97056 100644
--- a/setup.py
+++ b/setup.py
@@ -7,8 +7,12 @@ import setuptools
"""
Install python wrapper of virtual fluids
-install via python setup.py install build_ext
-set CMAKE Flags via -DBUILD_VF_GPU:BOOL=1
+install via python:
+ python setup.py install build_ext
+ set CMAKE Flags via -DBUILD_VF_GPU:BOOL=1
+or install via pip:
+ pip install -e .
+ set CMAKE Flags via --configure-settings -DBUILD_VF_GPU=1
"""
init_py = inspect.cleandoc(
--
GitLab