Merge branch 'master' into parvec

1 files changed, 29 insertions, 19 deletions

diff --git a/python/builder.py b/python/builder.py
index cfdb7d1..dcd62d8 100644
--- a/python/builder.py
+++ b/python/builder.py
@@ -1,28 +1,28 @@
-#-----------------------------------------------------------------------
-#Copyright 2013 Centrum Wiskunde & Informatica, Amsterdam
+# -----------------------------------------------------------------------
+# Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp
+#            2013-2016, CWI, Amsterdam
 #
-#Author: Daniel M. Pelt
-#Contact: D.M.Pelt@cwi.nl
-#Website: http://dmpelt.github.io/pyastratoolbox/
+# Contact: astra@uantwerpen.be
+# Website: http://sf.net/projects/astra-toolbox
 #
+# This file is part of the ASTRA Toolbox.
 #
-#This file is part of the Python interface to the
-#All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox").
 #
-#The Python interface to the ASTRA Toolbox is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
+# The ASTRA Toolbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-#The Python interface to the ASTRA Toolbox is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#GNU General Public License for more details.
+# The ASTRA Toolbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-#You should have received a copy of the GNU General Public License
-#along with the Python interface to the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
+# 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
@@ -41,6 +41,12 @@ try:
         usecuda=True
 except KeyError:
     pass
+try:
+    if os.environ['CL'].find('/DASTRA_CUDA')!=-1:
+        usecuda=True
+except KeyError:
+    pass
+
 
 cfgToWrite = 'DEF HAVE_CUDA=' + str(usecuda) + "\n"
 cfgHasToBeUpdated = True
@@ -64,12 +70,16 @@ ext_modules = [ ]
 ext_modules = cythonize("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')
+
 setup (name = 'PyASTRAToolbox',
-       version = '1.6',
+       version = '1.7.1',
        description = 'Python interface to the ASTRA-Toolbox',
        author='D.M. Pelt',
        author_email='D.M.Pelt@cwi.nl',
-       url='http://dmpelt.github.io/pyastratoolbox/',
+       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',