summaryrefslogtreecommitdiffstats
path: root/python
Commit message (Collapse)AuthorAgeFilesLines
* Fix spaces/tabsWillem Jan Palenstijn2017-09-191-2/+2
|
* Merge branch 'master' into parallel_vecWillem Jan Palenstijn2017-09-1557-876/+1301
|\
| * Fix conda buildWillem Jan Palenstijn2017-03-291-0/+1
| |
| * Update create_projector docstringWillem Jan Palenstijn2017-03-291-1/+2
| |
| * Python: added options for projector creation, like for the matlab interfaceNicola VIGANO2017-03-291-1/+4
| | | | | | | | Signed-off-by: Nicola VIGANO <N.R.Vigano@cwi.nl>
| * Move conda astra-toolbox package files to own subdirectoryWillem Jan Palenstijn2017-03-204-12/+12
| | | | | | | | | | Recent versions of conda-build (2.1.1 at least) seem to automatically build packages in subdirectories (after the main directory).
| * Add autotools and boost to macOS conda libastra dependenciesWillem Jan Palenstijn2017-03-201-0/+4
| |
| * Silence errors from nvcc test runWillem Jan Palenstijn2017-03-201-1/+1
| |
| * Change lib/lib64 logicWillem Jan Palenstijn2017-03-201-7/+12
| | | | | | | | macOS CUDA uses lib even on 64 bit
| * Fix conda boost include flagsWillem Jan Palenstijn2017-03-201-1/+1
| |
| * Use true instead of /bin/trueWillem Jan Palenstijn2017-03-201-1/+1
| | | | | | | | It's in /usr/bin/ on macOS.
| * Fix python buildWillem Jan Palenstijn2017-03-011-1/+1
| |
| * Add np112 to conda build scriptWillem Jan Palenstijn2017-02-241-0/+3
| |
| * Remove tabs from python codeWillem Jan Palenstijn2017-02-083-202/+202
| |
| * Improve data2d/data3d error messagesWillem Jan Palenstijn2017-02-083-61/+70
| |
| * Make typechecks in data3d.create more robustWillem Jan Palenstijn2017-02-081-10/+18
| |
| * Start work on CFloat32Data3DGPU to allow persistent/external GPU memoryWillem Jan Palenstijn2017-02-085-38/+113
| |
| * Make python -sinocone a synonym of -sino.Willem Jan Palenstijn2017-02-081-13/+1
| | | | | | | | The matlab interface already behaves like this.
| * Remove unused 3d global min/maxWillem Jan Palenstijn2017-02-081-1/+0
| |
| * Build conda packages for linux-64/np111/py36Willem Jan Palenstijn2017-01-021-0/+1
| |
| * Use external boost for conda/win-64Willem Jan Palenstijn2016-12-094-17/+13
| | | | | | | | This enables py27 conda packages for win-64.
| * Build conda packages for multiple conda versionsWillem Jan Palenstijn2016-12-092-4/+10
| |
| * Use specific numpy version in conda packageDaniel M. Pelt2016-12-081-1/+1
| |
| * Update version to 1.8Willem Jan Palenstijn2016-12-054-10/+8
| |
| * Update versions for 1.8rc1 conda packageWillem Jan Palenstijn2016-12-022-3/+3
| |
| * Add astra.__version__ (PEP396)Willem Jan Palenstijn2016-12-015-22/+4
| |
| * Add conda build scripts for win-64/py35Willem Jan Palenstijn2016-12-014-6/+79
| |
| * Add scripts for building conda packages using DockerWillem Jan Palenstijn2016-12-014-0/+44
| |
| * Update python headersWillem Jan Palenstijn2016-11-2846-495/+488
| |
| * Separate C++ and python builds & make conda work nicelyHolger Kohr2016-11-255-80/+88
| | | | | | | | | | | | | | | | | | | | | | | | - 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
| * Fix conda build.shWillem Jan Palenstijn2016-11-231-1/+1
| |
| * Overhaul package installationWillem Jan Palenstijn2016-11-211-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update python package name from PyASTRAToolbox to astra-toolboxWillem Jan Palenstijn2016-11-211-1/+1
| |
| * Add CGLS pluginWillem Jan Palenstijn2016-11-182-0/+100
| |
| * Add SIRT pluginWillem Jan Palenstijn2016-11-184-1/+120
| |
| * Fix Python create_projector docstringWillem Jan Palenstijn2016-10-191-1/+1
| |
* | Merge branch 'master' into parallel_vecWillem Jan Palenstijn2016-10-071-6/+4
|\|
| * Replace use of boost::split by own functionWillem Jan Palenstijn2016-07-281-6/+4
| |
* | Merge branch 'master' into parvecWillem Jan Palenstijn2016-07-28115-10233/+1361
|\|
| * Merge pull request #47 from wjp/OpTomo_outWillem Jan Palenstijn2016-04-261-30/+66
| |\ | | | | | | Give OpTomo FP/BP functions with optional out argument
| | * Give OpTomo FP/BP functions with optional out argumentWillem Jan Palenstijn2016-04-251-30/+66
| | | | | | | | | | | | This allows more efficient use of allocated arrays.
| * | Merge pull request #46 from dmpelt/python_cxxWillem Jan Palenstijn2016-04-251-0/+2
| |\ \ | | | | | | | | Use CXX for Python compilation as well
| | * | Use CXX for Python compilation as wellDaniel M. Pelt2016-04-191-0/+2
| | | |
| * | | Merge pull request #50 from wjp/data3d_dimensionsWillem Jan Palenstijn2016-04-251-1/+1
| |\ \ \ | | |_|/ | |/| | Reverse output of astra.data3d.dimensions
| | * | Reverse output of astra.data3d.dimensionsWillem Jan Palenstijn2016-04-251-1/+1
| | |/ | | | | | | | | | | | | | | | This makes the output directly usable in numpy commands like zeros, reshape. We were not using data3d.dimensions ourselves, as far as I can tell.
| * / Change flatten to ravel in Python codeDaniel M. Pelt2016-04-251-2/+2
| |/
| * Merge pull request #29 from wjp/indexmanagerWillem Jan Palenstijn2016-04-153-2/+86
| |\ | | | | | | Add an AstraIndexManager
| | * Merge branch 'master' into indexmanagerWillem Jan Palenstijn2016-03-0115-230/+701
| | |\
| | * | Add python astra.astra delete/info based on index managerWillem Jan Palenstijn2016-02-173-2/+88
| | | |
| * | | Encode Python bool as int in XML instead of strDaniel M. Pelt2016-03-041-4/+8
| | | |