summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Kohr <h.kohr@cwi.nl>2016-11-23 10:21:55 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2016-11-25 13:04:36 +0100
commiteeffd2d9748b8912b384a5764b808f5bfc850ade (patch)
tree5d257bcde2688d3d4ec84191cd5ac60af918f85a
parent3a68fbe656c1984b6cf1b921d29225807d4d4ca0 (diff)
downloadastra-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
-rw-r--r--build/linux/configure.ac4
-rw-r--r--python/builder.py105
-rw-r--r--python/conda/build.sh12
-rw-r--r--python/conda/libastra/build.sh28
-rw-r--r--python/conda/libastra/meta.yaml10
-rw-r--r--python/conda/meta.yaml13
6 files changed, 90 insertions, 82 deletions
diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index e562e77..3a2a92b 100644
--- a/build/linux/configure.ac
+++ b/build/linux/configure.ac
@@ -228,8 +228,8 @@ if test x"$with_python" != x -a x"$with_python" != xno; then
AC_MSG_CHECKING(for Cython module)
ASTRA_TRY_PYTHON([
import Cython
-from distutils.version import LooseVersion
-assert(LooseVersion(Cython.__version__)>=LooseVersion("0.13"))
+from pkg_resources import parse_version
+assert(parse_version(Cython.__version__) >= parse_version("0.13"))
],,HAVEPYTHON=no)
if test x$HAVEPYTHON = xno; then
AC_MSG_RESULT(no)
diff --git a/python/builder.py b/python/builder.py
index 1105169..218b427 100644
--- a/python/builder.py
+++ b/python/builder.py
@@ -21,81 +21,72 @@
# You should have received a copy of the GNU General Public License
# along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
#
-#-----------------------------------------------------------------------
+# -----------------------------------------------------------------------
-import sys
import os
import numpy as np
-from distutils.version import LooseVersion
from distutils.core import setup
-from distutils.extension import Extension
+from pkg_resources import parse_version
from Cython.Distutils import build_ext
from Cython.Build import cythonize
import Cython
-if LooseVersion(Cython.__version__)<LooseVersion('0.13'): raise ImportError("Cython version should be at least 0.13")
-usecuda=False
-try:
- if os.environ['CPPFLAGS'].find('-DASTRA_CUDA')!=-1:
- usecuda=True
-except KeyError:
- pass
-try:
- if os.environ['CL'].find('/DASTRA_CUDA')!=-1:
- usecuda=True
-except KeyError:
- pass
+if parse_version(Cython.__version__) < parse_version('0.13'):
+ raise ImportError('Cython version should be at least 0.13')
+use_cuda = ('-DASTRA_CUDA' in os.environ.get('CPPFLAGS', '') or
+ '/DASTRA_CUDA' in os.environ.get('CL', ''))
-cfgToWrite = 'DEF HAVE_CUDA=' + str(usecuda) + "\n"
-cfgHasToBeUpdated = True
+self_path = os.path.dirname(os.path.abspath(__file__))
+
+cfg_string = 'DEF HAVE_CUDA=' + str(use_cuda) + '\n'
+update_cfg = True
try:
- cfg = open('astra/config.pxi','r')
- cfgIn = cfg.read()
- cfg.close()
- if cfgIn==cfgToWrite:
- cfgHasToBeUpdated = False
+ with open(os.path.join(self_path, 'astra', 'config.pxi'), 'r') as cfg:
+ cfg_fromfile = cfg.read()
+ if cfg_fromfile == cfg_string:
+ update_cfg = False
except IOError:
pass
-if cfgHasToBeUpdated:
- cfg = open('astra/config.pxi','w')
- cfg.write(cfgToWrite)
- cfg.close()
-
+if update_cfg:
+ with open(os.path.join(self_path, 'astra', 'config.pxi'), 'w') as cfg:
+ cfg.write(cfg_string)
-pkgdata = { }
-try:
- if os.environ['ASTRA_INSTALL_LIBRARY_AS_DATA']:
- pkgdata['astra'] = [os.environ['ASTRA_INSTALL_LIBRARY_AS_DATA']]
-except KeyError:
- pass
+pkgdata = {}
+if os.environ.get('ASTRA_INSTALL_LIBRARY_AS_DATA', ''):
+ pkgdata['astra'] = [os.environ['ASTRA_INSTALL_LIBRARY_AS_DATA']]
-cmdclass = { }
-ext_modules = [ ]
+cmdclass = {}
+ext_modules = []
-ext_modules = cythonize("astra/*.pyx", language_level=2)
-cmdclass = { 'build_ext': build_ext }
+ext_modules = cythonize(os.path.join(self_path, 'astra', '*.pyx'),
+ language_level=2)
+cmdclass = {'build_ext': build_ext}
for m in ext_modules:
- if m.name == 'astra.plugin_c':
- m.sources.append('astra/src/PythonPluginAlgorithm.cpp')
+ if m.name == 'astra.plugin_c':
+ m.sources.append(os.path.join(self_path, 'astra', 'src',
+ 'PythonPluginAlgorithm.cpp'))
-setup (name = 'astra-toolbox',
- version = '1.7.1',
- description = 'Python interface to the ASTRA-Toolbox',
- author='D.M. Pelt',
- author_email='D.M.Pelt@cwi.nl',
- url='http://sf.net/projects/astra-toolbox',
- #ext_package='astra',
- #ext_modules = cythonize(Extension("astra/*.pyx",extra_compile_args=extra_compile_args,extra_linker_args=extra_compile_args)),
- license='GPLv3',
- ext_modules = ext_modules,
- include_dirs=[np.get_include()],
- cmdclass = cmdclass,
- #ext_modules = [Extension("astra","astra/astra.pyx")],
- packages=['astra', 'astra.plugins'],
- package_data=pkgdata,
- requires=["numpy"],
- )
+setup(name='astra-toolbox',
+ version='1.7.1',
+ description='Python interface to the ASTRA Toolbox',
+ author='D.M. Pelt',
+ author_email='D.M.Pelt@cwi.nl',
+ url='https://github.com/astra-toolbox/astra-toolbox',
+ # ext_package='astra',
+ # ext_modules = cythonize(
+ # Extension("astra/*.pyx",
+ # extra_compile_args=extra_compile_args,
+ # extra_linker_args=extra_compile_args)),
+ license='GPLv3',
+ ext_modules=ext_modules,
+ include_dirs=[np.get_include()],
+ cmdclass=cmdclass,
+ # ext_modules = [Extension("astra","astra/astra.pyx")],
+ packages=['astra', 'astra.plugins'],
+ package_data=pkgdata,
+ requires=['numpy', 'scipy', 'six'],
+ )
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
diff --git a/python/conda/libastra/build.sh b/python/conda/libastra/build.sh
index e1d9700..5807697 100644
--- a/python/conda/libastra/build.sh
+++ b/python/conda/libastra/build.sh
@@ -1,15 +1,23 @@
-cd build/linux
-./autogen.sh
-./configure --with-cuda=$CUDA_ROOT --prefix=$PREFIX
-if [ $MAKEOPTS == '<UNDEFINED>' ]
- then
- MAKEOPTS=""
-fi
-make $MAKEOPTS install-libraries
+#!/bin/sh
+
+cd $SRC_DIR/build/linux
+
+$SRC_DIR/build/linux/autogen.sh
+
+# Add C++11 to compiler flags if nvcc supports it, mostly to work around a boost bug
+NVCC=$CUDA_ROOT/bin/nvcc
+echo "int main(){return 0;}" > $CONDA_PREFIX/test.cu
+$NVCC $CONDA_PREFIX/test.cu -ccbin $CC --std=c++11 -o $CONDA_PREFIX/test.out > /dev/null && EXTRA_NVCCFLAGS="--std=c++11" || /bin/true
+rm -f $CONDA_PREFIX/test.out
+
+$SRC_DIR/build/linux/configure --with-install-type=prefix --with-cuda=$CUDA_ROOT --prefix=$CONDA_PREFIX NVCCFLAGS="-ccbin $CC $EXTRA_NVCCFLAGS" CC=$CC CXX=$CXX CFLAGS="-I$CONDA_PREFIX/include/boost" CXXFLAGS="-I$CONDA_PREFIX/include/boost"
+
+make install-libraries
+
LIBPATH=lib
if [ $ARCH == 64 ]
then
LIBPATH+=64
fi
-cp -P $CUDA_ROOT/$LIBPATH/libcudart.so.* $PREFIX/lib
-cp -P $CUDA_ROOT/$LIBPATH/libcufft.so.* $PREFIX/lib
+cp -P $CUDA_ROOT/$LIBPATH/libcudart.so.* $CONDA_PREFIX/lib
+cp -P $CUDA_ROOT/$LIBPATH/libcufft.so.* $CONDA_PREFIX/lib
diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml
index 73fa0d7..7c92e04 100644
--- a/python/conda/libastra/meta.yaml
+++ b/python/conda/libastra/meta.yaml
@@ -4,13 +4,19 @@ 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
+ - CXX
- CUDA_ROOT
- - MAKEOPTS
+
+requirements:
+ build:
+ - boost
about:
home: http://www.astra-toolbox.com
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: