From 79755b5b11a00b48cdb4bc10e26d4fc84b064d98 Mon Sep 17 00:00:00 2001
From: Christian Godenschwager <christian.godenschwager@fau.de>
Date: Mon, 15 Jan 2018 16:27:26 +0100
Subject: [PATCH] Enable openmesh in conda packages
Updated conda packages to cond build > 3.1.4 using host section
See https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#host
---
.gitlab-ci.yml | 6 ++++--
utilities/conda/openmesh/build.sh | 4 ++++
utilities/conda/openmesh/meta.yaml | 3 ++-
utilities/conda/withLbm/build.sh | 4 ++--
utilities/conda/withLbm/meta.yaml | 9 +++++----
utilities/conda/withoutLbm/build.sh | 4 ++--
utilities/conda/withoutLbm/meta.yaml | 9 ++++++---
7 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a82405706..3927d8812 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1348,12 +1348,14 @@ msvc-14.1_MpiOnly:
.conda-deploy: &conda_deploy_definition
stage: deploy
before_script:
+ - conda update -y conda
+ - conda update -y python
- conda install -y conda-build anaconda-client
- - conda install conda-build==3.0.27 # building with conda-build version 3.2.1 leads to empty package
- anaconda login --username $CONDA_DEPLOY_USER --password $CONDA_DEPLOY_PASSWORD --hostname $CI_JOB_ID
- conda config --set anaconda_upload yes
- conda config --add channels lssfau
- - conda
+ - conda -V
+ - conda build -V
after_script:
- anaconda logout
dependencies: []
diff --git a/utilities/conda/openmesh/build.sh b/utilities/conda/openmesh/build.sh
index 1c62ffbca..4db2de35d 100644
--- a/utilities/conda/openmesh/build.sh
+++ b/utilities/conda/openmesh/build.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+sed -i '93a#include <sys/time.h>' src/OpenMesh/Tools/Utils/conio.cc
+
mkdir -p build && cd build
cmake \
@@ -11,6 +13,8 @@ cmake \
-DCMAKE_CXX_FLAGS="-std=c++11"\
..
+#cat src/Python/PythonLog.txt
+
make install -j${CPU_COUNT}
mv ${PREFIX}/lib/python/* ${SP_DIR}
diff --git a/utilities/conda/openmesh/meta.yaml b/utilities/conda/openmesh/meta.yaml
index 18b90c4ac..c47c97fa4 100644
--- a/utilities/conda/openmesh/meta.yaml
+++ b/utilities/conda/openmesh/meta.yaml
@@ -16,9 +16,10 @@ source:
requirements:
build:
- {{ compiler('cxx') }}
- - python
- cmake
- make
+ host:
+ - python
- boost
run:
- python
diff --git a/utilities/conda/withLbm/build.sh b/utilities/conda/withLbm/build.sh
index 79111539f..4a5e9048c 100644
--- a/utilities/conda/withLbm/build.sh
+++ b/utilities/conda/withLbm/build.sh
@@ -2,6 +2,6 @@ mkdir build
cd build
export BOOST_ROOT=$PREFIX
-cmake .. -DWALBERLA_BUILD_WITH_PYTHON=1 -DWALBERLA_BUILD_WITH_PYTHON_MODULE=1 -DWALBERLA_BUILD_WITH_PYTHON_LBM=1 -DWALBERLA_BUILD_WITH_OPENMESH=0
+cmake .. -DWALBERLA_BUILD_WITH_PYTHON=ON -DWALBERLA_BUILD_WITH_PYTHON_MODULE=ON -DWALBERLA_BUILD_WITH_PYTHON_LBM=ON
-make -j 8 pythonModuleInstall
+make -j ${CPU_COUNT} pythonModuleInstall
diff --git a/utilities/conda/withLbm/meta.yaml b/utilities/conda/withLbm/meta.yaml
index 7bba0c1b3..b4b263edf 100644
--- a/utilities/conda/withLbm/meta.yaml
+++ b/utilities/conda/withLbm/meta.yaml
@@ -13,18 +13,19 @@ build:
requirements:
build:
- {{ compiler('cxx') }}
- - python
- git
- - boost
- cmake
- make
+ host:
+ - python
+ - boost
- mpich2 [linux]
- #- openmesh
+ - openmesh
run:
- python >=3.6
- boost
- numpy
- mpich2 [linux]
- #- openmesh
+ - openmesh
source:
path: ../../..
diff --git a/utilities/conda/withoutLbm/build.sh b/utilities/conda/withoutLbm/build.sh
index 114fa1dac..7fc4cc7c0 100644
--- a/utilities/conda/withoutLbm/build.sh
+++ b/utilities/conda/withoutLbm/build.sh
@@ -2,6 +2,6 @@ mkdir build
cd build
export BOOST_ROOT=$PREFIX
-cmake .. -DWALBERLA_BUILD_WITH_PYTHON=1 -DWALBERLA_BUILD_WITH_PYTHON_MODULE=1 -DWALBERLA_BUILD_WITH_OPENMESH=0
+cmake .. -DWALBERLA_BUILD_WITH_PYTHON=ON -DWALBERLA_BUILD_WITH_PYTHON_MODULE=ON -DWALBERLA_BUILD_WITH_OPENMESH=ON
-make -j 8 pythonModuleInstall
+make -j ${CPU_COUNT} pythonModuleInstall
diff --git a/utilities/conda/withoutLbm/meta.yaml b/utilities/conda/withoutLbm/meta.yaml
index 1931c4527..06276f733 100644
--- a/utilities/conda/withoutLbm/meta.yaml
+++ b/utilities/conda/withoutLbm/meta.yaml
@@ -13,21 +13,24 @@ build:
requirements:
build:
- {{ compiler('cxx') }}
- - python
- git
- - boost
- cmake [linux]
- cmake >=3.7.0 [win]
- make
+ host:
+ - python
+ - boost
- mpich2 [linux]
+ - openmesh
run:
- python
- boost
- numpy
- mpich2 [linux]
+ - openmesh
source:
path: ../../..
test:
imports:
- - waLBerla
\ No newline at end of file
+ - waLBerla
--
GitLab