Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #73 from dmpelt/python-plugins | Willem Jan Palenstijn | 2015-12-04 | 18 | -18/+1077 |
|\ | | | | | Add support for Python algorithm plugins | ||||
| * | Reduce dependency of python code on libastra | Willem Jan Palenstijn | 2015-12-04 | 1 | -5/+77 |
| | | |||||
| * | Fix Windows build | Willem Jan Palenstijn | 2015-12-02 | 1 | -1/+1 |
| | | |||||
| * | Avoid unnecessary include in header | Willem Jan Palenstijn | 2015-12-02 | 2 | -4/+11 |
| | | |||||
| * | Merge branch 'master' into python-plugins | Willem Jan Palenstijn | 2015-12-01 | 66 | -397/+1995 |
| |\ | | | | | | | | | | | | | Conflicts: python/astra/utils.pyx | ||||
| * | | Ensure we have acquired the GIL before calling Python plugin 'run' method | Daniel M. Pelt | 2015-08-10 | 1 | -3/+8 |
| | | | |||||
| * | | Fix get_help for classes without docstring | Daniel M. Pelt | 2015-08-05 | 1 | -5/+7 |
| | | | |||||
| * | | Add matlab plugin .m file | Daniel M. Pelt | 2015-07-23 | 1 | -0/+24 |
| | | | |||||
| * | | Fix 'get_registered' in Matlab with Python 3 | Daniel M. Pelt | 2015-07-23 | 1 | -5/+18 |
| | | | |||||
| * | | Also use ProjectorId in ReconstructionAlgorithm3D plugin base | Daniel M. Pelt | 2015-07-23 | 1 | -0/+1 |
| | | | |||||
| * | | Clear Python error when plugin is not find in getHelp | Daniel M. Pelt | 2015-07-23 | 1 | -0/+1 |
| | | | |||||
| * | | Normalize Python exceptions (needed for some) | Daniel M. Pelt | 2015-07-23 | 1 | -0/+1 |
| | | | |||||
| * | | Add ReconstructionAlgorithm2D/3D classes for plugins (matching C++ classes) | Daniel M. Pelt | 2015-07-23 | 3 | -1/+55 |
| | | | |||||
| * | | Allow registering plugins without explicit name, and fix exception handling ↵ | Daniel M. Pelt | 2015-07-23 | 6 | -91/+138 |
| | | | | | | | | | | | | when running in Matlab | ||||
| * | | Always log Python errors when importing/creating plugins | Daniel M. Pelt | 2015-07-23 | 1 | -4/+8 |
| | | | |||||
| * | | Also log Python errors when importing and creating Python plugins | Daniel M. Pelt | 2015-07-23 | 1 | -0/+48 |
| | | | |||||
| * | | Fix numpy lapack loading when running in Matlab | Daniel M. Pelt | 2015-07-23 | 4 | -0/+37 |
| | | | |||||
| * | | Remove config text file loading for plugins | Daniel M. Pelt | 2015-07-23 | 2 | -69/+6 |
| | | | |||||
| * | | Also allow tuples to be passed in a config dict | Daniel M. Pelt | 2015-07-23 | 1 | -2/+2 |
| | | | |||||
| * | | Show more useful information when a plugin raises an exception | Daniel M. Pelt | 2015-07-23 | 1 | -4/+5 |
| | | | |||||
| * | | Allow plugins without keywords | Daniel M. Pelt | 2015-07-23 | 1 | -1/+4 |
| | | | |||||
| * | | Log error when running Python plugin algorithm | Daniel M. Pelt | 2015-07-23 | 2 | -1/+8 |
| | | | |||||
| * | | Fix passing a python list as option | Daniel M. Pelt | 2015-07-23 | 1 | -0/+2 |
| | | | |||||
| * | | Fix config to dict translation for array options | Daniel M. Pelt | 2015-07-23 | 1 | -1/+6 |
| | | | |||||
| * | | Better way of passing options to Python plugin using inspect | Daniel M. Pelt | 2015-07-23 | 2 | -21/+16 |
| | | | |||||
| * | | Add support for Python algorithm plugins | Daniel M. Pelt | 2015-07-23 | 12 | -70/+851 |
| | | | |||||
| * | | Add hooks for plugin support to AstraObjectFactory | Willem Jan Palenstijn | 2015-07-23 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | To use these hooks, add a specialization of findPlugin for the desired type of object (e.g., Algorithms). | ||||
| * | | Fix comments | Willem Jan Palenstijn | 2015-07-23 | 1 | -5/+5 |
| | | | |||||
| * | | Reduce code duplication | Willem Jan Palenstijn | 2015-07-23 | 1 | -8/+5 |
| | | | |||||
* | | | Detect ASTRA_CUDA in Windows CL flags for Python as well | Willem Jan Palenstijn | 2015-12-03 | 1 | -0/+6 |
| | | | |||||
* | | | Merge pull request #91 from wjp/volgeom3d | Willem Jan Palenstijn | 2015-12-02 | 30 | -1149/+600 |
|\ \ \ | | | | | | | | | Remove restrictions on volgeom3d | ||||
| * \ \ | Merge branch 'master' into volgeom3d | Willem Jan Palenstijn | 2015-12-02 | 41 | -350/+1728 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Fix Windows builds of astra_mex_direct | Willem Jan Palenstijn | 2015-12-02 | 3 | -0/+24 |
| |_|/ |/| | | |||||
* | | | Merge pull request #94 from wjp/cuda_options2 | Willem Jan Palenstijn | 2015-12-01 | 33 | -347/+355 |
|\ \ \ | | | | | | | | | Improve option passing via CudaProjector(2D/3D) | ||||
| * | | | Fix warning text | Willem Jan Palenstijn | 2015-10-09 | 1 | -3/+3 |
| | | | | |||||
| * | | | Fix whitespace | Willem Jan Palenstijn | 2015-10-09 | 4 | -8/+8 |
| | | | | |||||
| * | | | Improve option passing through CudaProjector2D | Willem Jan Palenstijn | 2015-10-09 | 20 | -268/+169 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all constructors were reading options from the projector. Also allow passing GPUIndex via CudaProjector2D. Also refactor CudaReconstructionAlgorithm::initialize/check to avoid code duplication with ReconstructionAlgorithm. | ||||
| * | | | Improve option passing through CudaProjector3D | Willem Jan Palenstijn | 2015-10-09 | 12 | -70/+172 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all constructors were reading options from the projector. Also allow passing GPUIndex via CudaProjector3D. Thanks to Nicola Vigano for part of the patch. | ||||
| * | | | Add options passing to projectors from matlab | Nicola Vigano | 2015-10-09 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr> | ||||
* | | | | Merge pull request #95 from wjp/mex_direct | Willem Jan Palenstijn | 2015-12-01 | 8 | -3/+1349 |
|\ \ \ \ | | | | | | | | | | | astra_mex_direct | ||||
| * | | | | astra_mex_direct: Don't initialize newly allocated mxArray | Nicola Vigano | 2015-10-09 | 1 | -2/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This avoids letting matlab initialize the memory we will overwrite shortly after. | ||||
| * | | | | Build astra_mex_direct in MSVC | Willem Jan Palenstijn | 2015-10-07 | 5 | -2/+975 |
| | | | | | |||||
| * | | | | Add astra_mex_direct('FP3D'/'BP3D', ...) | Willem Jan Palenstijn | 2015-10-07 | 3 | -1/+358 |
| |/ / / | |||||
| | * | | Merge branch 'master' into volgeom3d | Willem Jan Palenstijn | 2015-11-18 | 8 | -44/+85 |
| | |\ \ | |_|/ / |/| | | | |||||
* | | | | Merge pull request #96 from wjp/cuda_constraint_warning | Willem Jan Palenstijn | 2015-10-15 | 1 | -4/+12 |
|\ \ \ \ | | | | | | | | | | | Give a warning on ignored Min/MaxContraint in some CUDA algorithms. | ||||
| * | | | | Give a warning on ignored Min/MaxContraint in some CUDA algorithms. | Willem Jan Palenstijn | 2015-10-09 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | | | | | | Previously it would fail an assertion. | ||||
* | | | | | Merge pull request #97 from dmpelt/log_valist_fix | Willem Jan Palenstijn | 2015-10-14 | 1 | -16/+44 |
|\ \ \ \ \ | |/ / / / |/| | | | | Do not reuse va_list when logging both to screen and file | ||||
| * | | | | Do not reuse va_list when logging both to screen and file | Daniel M. Pelt | 2015-10-13 | 1 | -16/+44 |
| | | | | | |||||
* | | | | | Call check() function after initializing CUDA_FBP | Willem Jan Palenstijn | 2015-10-09 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | This would cause crashes when specifying invalid data. | ||||
* | | | | | Fix loop bounds in (unused) Float32ProjectionData3D arithmetic functions | Willem Jan Palenstijn | 2015-10-09 | 1 | -16/+20 |
| |/ / / |/| | | |