summaryrefslogtreecommitdiffstats
path: root/python
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Replace use of boost::split by own functionWillem Jan Palenstijn2016-07-281-6/+4
|
* 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
| | |
* | | Remove with-python from libastra conda buildDaniel M. Pelt2016-03-031-1/+1
| | |
* | | Split conda package into c++ lib and python partsDaniel M. Pelt2016-03-034-12/+42
| | |
* | | Fix small Python errorsDaniel M. Pelt2016-03-023-3/+5
| |/ |/|
* | Disable astra.set_gpu_index when building without CUDAWillem Jan Palenstijn2016-02-291-1/+5
| |
* | Merge pull request #111 from wjp/pluginbuildWillem Jan Palenstijn2016-02-2215-227/+696
|\ \ | |/ |/| Remove dependency of libastra on libpython
| * Make copyright/license headers consistent with rest of astraWillem Jan Palenstijn2016-02-0215-228/+224
| |
| * Move fixLapackLoading to astra_mex_pluginWillem Jan Palenstijn2016-01-271-32/+0
| |
| * Decrement refcount of CallMethod return valueWillem Jan Palenstijn2016-01-271-1/+4
| |
| * Fix whitespaceWillem Jan Palenstijn2016-01-211-1/+1
| |
| * Remove dependency of libastra on libpython by refactoring PluginAlgorithmWillem Jan Palenstijn2016-01-214-5/+507
| |
* | Merge pull request #107 from wjp/multiWillem Jan Palenstijn2016-02-023-9/+24
|\ \ | |/ |/| Add multi-GPU support to CompositeGeometryManager
| * Allow multiple GPUs in ASTRA_GPU_INDEX envvarWillem Jan Palenstijn2016-01-191-4/+4
| |
| * Change python set_gpu_index to matchWillem Jan Palenstijn2016-01-192-5/+20
| |
* | Add check for scipyWillem Jan Palenstijn2016-01-201-0/+1
|/ | | | The module matrix_c.pyx uses it.
* Merge pull request #108 from dmpelt/readthedocsWillem Jan Palenstijn2016-01-1988-9950/+0
|\ | | | | Move documentation to readthedocs
| * Remove existing outdated Python API reference documentationDaniel M. Pelt2016-01-1988-9950/+0
| |
* | Fix experimental.pyx for non-CUDA compilationDaniel M. Pelt2016-01-191-47/+49
| |
* | Update creditsWillem Jan Palenstijn2016-01-051-15/+13
|/
* Update version to 1.7.1Willem Jan Palenstijn2015-12-233-5/+5
|
* Fix origin_det name in create_proj_geom docsWillem Jan Palenstijn2015-12-161-7/+7
|
* Use less ambiguous letters for create_vol_geom docsWillem Jan Palenstijn2015-12-101-12/+12
|
* Update version to 1.7Willem Jan Palenstijn2015-12-043-5/+5
|
* Add conda build scriptsDaniel M. Pelt2015-12-042-0/+56
|
* Merge pull request #101 from wjp/compositeWillem Jan Palenstijn2015-12-042-0/+86
|\ | | | | Add CompositeGeometryManager
| * Add sample for experimental composite geometry codeWillem Jan Palenstijn2015-12-042-0/+86
| |
* | Merge pull request #73 from dmpelt/python-pluginsWillem Jan Palenstijn2015-12-048-2/+235
|\ \ | |/ |/| Add support for Python algorithm plugins
| * Reduce dependency of python code on libastraWillem Jan Palenstijn2015-12-041-5/+77
| |
| * Merge branch 'master' into python-pluginsWillem Jan Palenstijn2015-12-018-16/+47
| |\ | | | | | | | | | | | | Conflicts: python/astra/utils.pyx
| * | Also use ProjectorId in ReconstructionAlgorithm3D plugin baseDaniel M. Pelt2015-07-231-0/+1
| | |
| * | Add ReconstructionAlgorithm2D/3D classes for plugins (matching C++ classes)Daniel M. Pelt2015-07-233-1/+55
| | |
| * | Allow registering plugins without explicit name, and fix exception handling ↵Daniel M. Pelt2015-07-232-45/+40
| | | | | | | | | | | | when running in Matlab