From 077061c04f6ba864d9be0a92a413def666e37f35 Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Wed, 10 Jan 2018 10:12:13 +0100
Subject: [PATCH] Fixed / update conda recipes
- fixed problem with new conda by using new compiler mechanism
- added test file that is checked before upload
- open mesh recipe fixed
- force downgrade for conda-build, new tested version(3.2.1) of conda-build leads to an empty
package and then failing test.. perhaps it is fixed with newer conda-build versions?
---
.gitlab-ci.yml | 2 ++
utilities/conda/openmesh/build.sh | 1 +
utilities/conda/openmesh/meta.yaml | 3 ++-
utilities/conda/withLbm/build.sh | 2 +-
utilities/conda/withLbm/meta.yaml | 8 ++++++--
utilities/conda/withoutLbm/build.sh | 2 +-
utilities/conda/withoutLbm/meta.yaml | 10 ++++++++--
utilities/conda/withoutLbm/run_test.py | 7 +++++++
8 files changed, 28 insertions(+), 7 deletions(-)
create mode 100644 utilities/conda/withoutLbm/run_test.py
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b694794c3..01eeb0b04 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1293,9 +1293,11 @@ msvc-14.1_MpiOnly:
stage: deploy
before_script:
- 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
after_script:
- anaconda logout
dependencies: []
diff --git a/utilities/conda/openmesh/build.sh b/utilities/conda/openmesh/build.sh
index 5c3f3acfd..1c62ffbca 100644
--- a/utilities/conda/openmesh/build.sh
+++ b/utilities/conda/openmesh/build.sh
@@ -8,6 +8,7 @@ cmake \
-DBUILD_APPS=OFF \
-DOPENMESH_PYTHON_VERSION=${PY_VER} \
-DOPENMESH_BUILD_PYTHON_UNIT_TESTS=ON \
+ -DCMAKE_CXX_FLAGS="-std=c++11"\
..
make install -j${CPU_COUNT}
diff --git a/utilities/conda/openmesh/meta.yaml b/utilities/conda/openmesh/meta.yaml
index df6a80c45..18b90c4ac 100644
--- a/utilities/conda/openmesh/meta.yaml
+++ b/utilities/conda/openmesh/meta.yaml
@@ -15,9 +15,10 @@ source:
requirements:
build:
- - toolchain [linux]
+ - {{ compiler('cxx') }}
- python
- cmake
+ - make
- boost
run:
- python
diff --git a/utilities/conda/withLbm/build.sh b/utilities/conda/withLbm/build.sh
index 6633c7718..79111539f 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
-CC=mpicc CXX=mpicxx cmake .. -DWALBERLA_BUILD_WITH_PYTHON=1 -DWALBERLA_BUILD_WITH_PYTHON_MODULE=1 -DWALBERLA_BUILD_WITH_PYTHON_LBM=1
+cmake .. -DWALBERLA_BUILD_WITH_PYTHON=1 -DWALBERLA_BUILD_WITH_PYTHON_MODULE=1 -DWALBERLA_BUILD_WITH_PYTHON_LBM=1 -DWALBERLA_BUILD_WITH_OPENMESH=0
make -j 8 pythonModuleInstall
diff --git a/utilities/conda/withLbm/meta.yaml b/utilities/conda/withLbm/meta.yaml
index a9fa613dc..7bba0c1b3 100644
--- a/utilities/conda/withLbm/meta.yaml
+++ b/utilities/conda/withLbm/meta.yaml
@@ -1,6 +1,8 @@
about:
home: www.walberla.net
license: GPLv3
+ summary: High Performance, Multi-physics Simulation Framework
+
package:
name: walberla-lbm
version: {{ GIT_DESCRIBE_TAG }}
@@ -10,17 +12,19 @@ build:
requirements:
build:
+ - {{ compiler('cxx') }}
- python
- git
- boost
- cmake
- - gcc [linux]
+ - make
- mpich2 [linux]
+ #- openmesh
run:
- python >=3.6
- boost
- numpy
- mpich2 [linux]
-
+ #- openmesh
source:
path: ../../..
diff --git a/utilities/conda/withoutLbm/build.sh b/utilities/conda/withoutLbm/build.sh
index 7839cb748..114fa1dac 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
-CC=mpicc CXX=mpicxx cmake .. -DWALBERLA_BUILD_WITH_PYTHON=1 -DWALBERLA_BUILD_WITH_PYTHON_MODULE=1
+cmake .. -DWALBERLA_BUILD_WITH_PYTHON=1 -DWALBERLA_BUILD_WITH_PYTHON_MODULE=1 -DWALBERLA_BUILD_WITH_OPENMESH=0
make -j 8 pythonModuleInstall
diff --git a/utilities/conda/withoutLbm/meta.yaml b/utilities/conda/withoutLbm/meta.yaml
index eb37c049a..1931c4527 100644
--- a/utilities/conda/withoutLbm/meta.yaml
+++ b/utilities/conda/withoutLbm/meta.yaml
@@ -1,6 +1,8 @@
about:
home: www.walberla.net
license: GPLv3
+ summary: High Performance, Multi-physics Simulation Framework
+
package:
name: walberla
version: {{ GIT_DESCRIBE_TAG }}
@@ -10,18 +12,22 @@ build:
requirements:
build:
+ - {{ compiler('cxx') }}
- python
- git
- boost
- cmake [linux]
- cmake >=3.7.0 [win]
- - gcc [linux]
+ - make
- mpich2 [linux]
run:
- python
- boost
- numpy
- mpich2 [linux]
-
source:
path: ../../..
+
+test:
+ imports:
+ - waLBerla
\ No newline at end of file
diff --git a/utilities/conda/withoutLbm/run_test.py b/utilities/conda/withoutLbm/run_test.py
new file mode 100644
index 000000000..045930c4c
--- /dev/null
+++ b/utilities/conda/withoutLbm/run_test.py
@@ -0,0 +1,7 @@
+import waLBerla
+
+# Check that C++ exports are available
+assert waLBerla.cpp_available
+
+# Test calling of a function taking a string (fails if there is a ABI compatibility issue)
+waLBerla.log_devel("Test successful")
--
GitLab