diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-09-15 16:38:08 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-09-15 16:38:08 +0200 |
| commit | aa31a06235496c0d808e57c8ce914cb4b640bc6e (patch) | |
| tree | 33385e828ddca0b2857bac9e3dac4dd3723a3eee /python/astra/astra_c.pyx | |
| parent | f6aa2db83dfea89f9d2cfc6fcbd3da141ee77e02 (diff) | |
| parent | 00a1c6118b2d64b867c8e640c295462bcccfc7c9 (diff) | |
| download | astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.gz astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.bz2 astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.xz astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.zip | |
Merge branch 'master' into parallel_vec
Diffstat (limited to 'python/astra/astra_c.pyx')
| -rw-r--r-- | python/astra/astra_c.pyx | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/python/astra/astra_c.pyx b/python/astra/astra_c.pyx index 8e30e69..6de10da 100644 --- a/python/astra/astra_c.pyx +++ b/python/astra/astra_c.pyx @@ -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. # @@ -37,8 +37,6 @@ cimport PyIndexManager from .PyIndexManager cimport CAstraObjectManagerBase cdef extern from "astra/Globals.h" namespace "astra": - int getVersion() - string getVersionString() bool cudaEnabled() IF HAVE_CUDA==True: @@ -74,13 +72,6 @@ def credits(): def use_cuda(): return cudaEnabled() - -def version(printToScreen=False): - if printToScreen: - six.print_(wrap_from_bytes(getVersionString())) - else: - return getVersion() - IF HAVE_CUDA==True: def set_gpu_index(idx, memory=0): import collections |