Skip to content
Snippets Groups Projects
Commit 077061c0 authored by Martin Bauer's avatar Martin Bauer
Browse files

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?
parent 121d0f65
No related merge requests found
......@@ -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: []
......
......@@ -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}
......
......@@ -15,9 +15,10 @@ source:
requirements:
build:
- toolchain [linux]
- {{ compiler('cxx') }}
- python
- cmake
- make
- boost
run:
- python
......
......@@ -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
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: ../../..
......@@ -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
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
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")
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment