From ba0895b5299512e5028429e9e0111ab9944899cc Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Tue, 26 Apr 2016 16:45:33 +0200 Subject: Add SIRT plugin --- python/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python/builder.py') diff --git a/python/builder.py b/python/builder.py index dcd62d8..243888b 100644 --- a/python/builder.py +++ b/python/builder.py @@ -87,6 +87,6 @@ setup (name = 'PyASTRAToolbox', include_dirs=[np.get_include()], cmdclass = cmdclass, #ext_modules = [Extension("astra","astra/astra.pyx")], - packages=['astra'], + packages=['astra', 'astra.plugins'], requires=["numpy"], ) -- cgit v1.2.3 From a99c472c5dce7f16822294521ab6f33e01864052 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 21 Nov 2016 17:00:20 +0100 Subject: Update python package name from PyASTRAToolbox to astra-toolbox --- python/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python/builder.py') diff --git a/python/builder.py b/python/builder.py index 243888b..7c55054 100644 --- a/python/builder.py +++ b/python/builder.py @@ -74,7 +74,7 @@ for m in ext_modules: if m.name == 'astra.plugin_c': m.sources.append('astra/src/PythonPluginAlgorithm.cpp') -setup (name = 'PyASTRAToolbox', +setup (name = 'astra-toolbox', version = '1.7.1', description = 'Python interface to the ASTRA-Toolbox', author='D.M. Pelt', -- cgit v1.2.3 From 7e10c16eee71c608a1dba1dd2fec8471567f6b61 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 21 Nov 2016 17:00:50 +0100 Subject: Overhaul package installation There are now three ways of installing from configure/make: ./configure --with-install-type=prefix (default) libraries go into @libdir@ matlab tools/mex go into @datadir@/astra/matlab octave tools/mex go into @datadir@/astra/octave python module goes into site-packages ./configure --with-install-type=dir libraries go into @prefix@/lib matlab tools/mex go into @prefix@/matlab octave tools/mex go into @prefix@/octave python module goes into @prefix@/python ./configure --with-install-type=module matlab tools/mex go into @prefix@/matlab octave tools/mex go into @prefix@/octave python module goes into site-packages library is installed along with the matlab/octave/python module(s), with rpath --- python/builder.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'python/builder.py') diff --git a/python/builder.py b/python/builder.py index 7c55054..1105169 100644 --- a/python/builder.py +++ b/python/builder.py @@ -64,6 +64,14 @@ if cfgHasToBeUpdated: cfg.write(cfgToWrite) cfg.close() + +pkgdata = { } +try: + if os.environ['ASTRA_INSTALL_LIBRARY_AS_DATA']: + pkgdata['astra'] = [os.environ['ASTRA_INSTALL_LIBRARY_AS_DATA']] +except KeyError: + pass + cmdclass = { } ext_modules = [ ] @@ -88,5 +96,6 @@ setup (name = 'astra-toolbox', cmdclass = cmdclass, #ext_modules = [Extension("astra","astra/astra.pyx")], packages=['astra', 'astra.plugins'], + package_data=pkgdata, requires=["numpy"], ) -- cgit v1.2.3 From eeffd2d9748b8912b384a5764b808f5bfc850ade Mon Sep 17 00:00:00 2001 From: Holger Kohr Date: Wed, 23 Nov 2016 10:21:55 +0100 Subject: 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 --- python/builder.py | 105 +++++++++++++++++++++++++----------------------------- 1 file changed, 48 insertions(+), 57 deletions(-) (limited to 'python/builder.py') 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 . # -#----------------------------------------------------------------------- +# ----------------------------------------------------------------------- -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__) Date: Mon, 28 Nov 2016 15:40:59 +0100 Subject: Update python headers --- python/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python/builder.py') diff --git a/python/builder.py b/python/builder.py index 218b427..f6732ac 100644 --- a/python/builder.py +++ b/python/builder.py @@ -3,7 +3,7 @@ # 2013-2016, CWI, Amsterdam # # Contact: astra@uantwerpen.be -# Website: http://sf.net/projects/astra-toolbox +# Website: http://www.astra-toolbox.com/ # # This file is part of the ASTRA Toolbox. # -- cgit v1.2.3 From 77f2cedaac088da5107dcfb37ae62d8f3a56f335 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 5 Dec 2016 14:44:09 +0100 Subject: Update version to 1.8 --- python/builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python/builder.py') diff --git a/python/builder.py b/python/builder.py index f6732ac..ec0bd23 100644 --- a/python/builder.py +++ b/python/builder.py @@ -71,7 +71,7 @@ for m in ext_modules: 'PythonPluginAlgorithm.cpp')) setup(name='astra-toolbox', - version='1.7.1', + version='1.8', description='Python interface to the ASTRA Toolbox', author='D.M. Pelt', author_email='D.M.Pelt@cwi.nl', -- cgit v1.2.3