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/build.sh | |
| 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/build.sh')
| -rw-r--r-- | python/conda/build.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/python/conda/build.sh b/python/conda/build.sh index fb3760c..951fd88 100644 --- a/python/conda/build.sh +++ b/python/conda/build.sh @@ -1,8 +1,4 @@ -cd build/linux -./autogen.sh -./configure --with-python --with-cuda=$CUDA_ROOT --prefix=$PREFIX -if [ $MAKEOPTS == '<UNDEFINED>' ] - then - MAKEOPTS="" -fi -make $MAKEOPTS install +#!/bin/sh + +cd $SRC_DIR/python/ +CPPFLAGS="-DASTRA_CUDA -DASTRA_PYTHON $CPPFLAGS -I$SRC_DIR/ -I$SRC_DIR/include -I$CUDA_ROOT/include" CC=$CC python ./builder.py build install |