summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add conda build scriptsDaniel M. Pelt2015-12-043-0/+60
* Merge pull request #101 from wjp/compositeWillem Jan Palenstijn2015-12-0428-107/+2306
|\
| * Add sample for experimental composite geometry codeWillem Jan Palenstijn2015-12-043-0/+170
| * Add utility functions for creating FP/BP JobListsWillem Jan Palenstijn2015-12-042-2/+113
| * Add CompositeGeometryManagerWillem Jan Palenstijn2015-12-0424-107/+2023
| * Disable error-prone checksWillem Jan Palenstijn2015-12-041-0/+2
* | Merge pull request #73 from dmpelt/python-pluginsWillem Jan Palenstijn2015-12-0418-18/+1077
|\ \ | |/ |/|
| * Reduce dependency of python code on libastraWillem Jan Palenstijn2015-12-041-5/+77
| * Fix Windows buildWillem Jan Palenstijn2015-12-021-1/+1
| * Avoid unnecessary include in headerWillem Jan Palenstijn2015-12-022-4/+11
| * Merge branch 'master' into python-pluginsWillem Jan Palenstijn2015-12-0166-397/+1995
| |\
| * | Ensure we have acquired the GIL before calling Python plugin 'run' methodDaniel M. Pelt2015-08-101-3/+8
| * | Fix get_help for classes without docstringDaniel M. Pelt2015-08-051-5/+7
| * | Add matlab plugin .m fileDaniel M. Pelt2015-07-231-0/+24
| * | Fix 'get_registered' in Matlab with Python 3Daniel M. Pelt2015-07-231-5/+18
| * | Also use ProjectorId in ReconstructionAlgorithm3D plugin baseDaniel M. Pelt2015-07-231-0/+1
| * | Clear Python error when plugin is not find in getHelpDaniel M. Pelt2015-07-231-0/+1
| * | Normalize Python exceptions (needed for some)Daniel 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 w...Daniel M. Pelt2015-07-236-91/+138
| * | Always log Python errors when importing/creating pluginsDaniel M. Pelt2015-07-231-4/+8
| * | Also log Python errors when importing and creating Python pluginsDaniel M. Pelt2015-07-231-0/+48
| * | Fix numpy lapack loading when running in MatlabDaniel M. Pelt2015-07-234-0/+37
| * | Remove config text file loading for pluginsDaniel M. Pelt2015-07-232-69/+6
| * | Also allow tuples to be passed in a config dictDaniel M. Pelt2015-07-231-2/+2
| * | Show more useful information when a plugin raises an exceptionDaniel M. Pelt2015-07-231-4/+5
| * | Allow plugins without keywordsDaniel M. Pelt2015-07-231-1/+4
| * | Log error when running Python plugin algorithmDaniel M. Pelt2015-07-232-1/+8
| * | Fix passing a python list as optionDaniel M. Pelt2015-07-231-0/+2
| * | Fix config to dict translation for array optionsDaniel M. Pelt2015-07-231-1/+6
| * | Better way of passing options to Python plugin using inspectDaniel M. Pelt2015-07-232-21/+16
| * | Add support for Python algorithm pluginsDaniel M. Pelt2015-07-2312-70/+851
| * | Add hooks for plugin support to AstraObjectFactoryWillem Jan Palenstijn2015-07-231-0/+19
| * | Fix commentsWillem Jan Palenstijn2015-07-231-5/+5
| * | Reduce code duplicationWillem Jan Palenstijn2015-07-231-8/+5
* | | Detect ASTRA_CUDA in Windows CL flags for Python as wellWillem Jan Palenstijn2015-12-031-0/+6
* | | Merge pull request #91 from wjp/volgeom3dWillem Jan Palenstijn2015-12-0230-1149/+600
|\ \ \
| * \ \ Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-12-0241-350/+1728
| |\ \ \ | |/ / / |/| | |
* | | | Fix Windows builds of astra_mex_directWillem Jan Palenstijn2015-12-023-0/+24
| |_|/ |/| |
* | | Merge pull request #94 from wjp/cuda_options2Willem Jan Palenstijn2015-12-0133-347/+355
|\ \ \
| * | | Fix warning textWillem Jan Palenstijn2015-10-091-3/+3
| * | | Fix whitespaceWillem Jan Palenstijn2015-10-094-8/+8
| * | | Improve option passing through CudaProjector2DWillem Jan Palenstijn2015-10-0920-268/+169
| * | | Improve option passing through CudaProjector3DWillem Jan Palenstijn2015-10-0912-70/+172
| * | | Add options passing to projectors from matlabNicola Vigano2015-10-091-2/+7
* | | | Merge pull request #95 from wjp/mex_directWillem Jan Palenstijn2015-12-018-3/+1349
|\ \ \ \
| * | | | astra_mex_direct: Don't initialize newly allocated mxArrayNicola Vigano2015-10-091-2/+18
| * | | | Build astra_mex_direct in MSVCWillem Jan Palenstijn2015-10-075-2/+975
| * | | | Add astra_mex_direct('FP3D'/'BP3D', ...)Willem Jan Palenstijn2015-10-073-1/+358
| |/ / /
| | * | Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-11-188-44/+85
| | |\ \ | |_|/ / |/| | |