diff options
author | Holger Kohr <h.kohr@cwi.nl> | 2016-11-23 10:21:55 +0100 |
---|---|---|
committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-11-25 13:04:36 +0100 |
commit | eeffd2d9748b8912b384a5764b808f5bfc850ade (patch) | |
tree | 5d257bcde2688d3d4ec84191cd5ac60af918f85a /python/conda/meta.yaml | |
parent | 3a68fbe656c1984b6cf1b921d29225807d4d4ca0 (diff) | |
download | astra-eeffd2d9748b8912b384a5764b808f5bfc850ade.tar.gz astra-eeffd2d9748b8912b384a5764b808f5bfc850ade.tar.bz2 astra-eeffd2d9748b8912b384a5764b808f5bfc850ade.tar.xz astra-eeffd2d9748b8912b384a5764b808f5bfc850ade.zip |
Separate C++ and python builds & make conda work nicely
- make builder (= advanced user or us ourselves) choose compilers
and CUDA
- add a check for the C++11 flag for nvcc to work around the
infamous boost bug if necessary
- use conda boost to build the C++ library
- simplify python bindings conda recipe to only build the bindings;
the C++ library is now a build and runtime dependency
- add runtime dependencies to python bindings recipe
- some small adjustments to builder.py
Diffstat (limited to 'python/conda/meta.yaml')
-rw-r--r-- | python/conda/meta.yaml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/python/conda/meta.yaml b/python/conda/meta.yaml index e6a7f52..94ce12f 100644 --- a/python/conda/meta.yaml +++ b/python/conda/meta.yaml @@ -4,32 +4,39 @@ package: source: git_url: https://github.com/astra-toolbox/astra-toolbox.git - #git_tag: v1.7.1 # Change to 1.8 after release + git_rev: master # for testing + # git_tag: 1.8 # TODO: change to this for next release build: number: 0 script_env: + - CC - CUDA_ROOT - - MAKEOPTS test: imports: - astra + requires: + # To avoid large downloads just for testing after build phase + - nomkl # [not win] + requirements: build: - python - cython >=0.13 + - nomkl # [not win] - numpy - scipy - six + - libastra ==1.8b # TODO: change to release version run: - python - numpy - scipy - six - - libastra ==1.8b + - libastra ==1.8b # TODO: change to release version about: |