Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add utility functions for creating FP/BP JobLists | Willem Jan Palenstijn | 2015-12-04 | 1 | -2/+111 |
| | |||||
* | Add CompositeGeometryManager | Willem Jan Palenstijn | 2015-12-04 | 8 | -14/+1351 |
| | | | | | This handles FP and BP operations on multiple data objects at once, splitting them to fit in GPU memory where necessary. | ||||
* | Disable error-prone checks | Willem Jan Palenstijn | 2015-12-04 | 1 | -0/+2 |
| | |||||
* | Merge branch 'master' into volgeom3d | Willem Jan Palenstijn | 2015-12-02 | 16 | -281/+298 |
|\ | |||||
| * | Merge pull request #94 from wjp/cuda_options2 | Willem Jan Palenstijn | 2015-12-01 | 16 | -281/+298 |
| |\ | | | | | | | Improve option passing via CudaProjector(2D/3D) | ||||
| | * | Fix warning text | Willem Jan Palenstijn | 2015-10-09 | 1 | -3/+3 |
| | | | |||||
| | * | Improve option passing through CudaProjector2D | Willem Jan Palenstijn | 2015-10-09 | 10 | -208/+134 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 6 | -70/+161 |
| | | | | | | | | | | | | | | | | | | | | | Not all constructors were reading options from the projector. Also allow passing GPUIndex via CudaProjector3D. Thanks to Nicola Vigano for part of the patch. | ||||
* | | | Merge branch 'master' into volgeom3d | Willem Jan Palenstijn | 2015-11-18 | 5 | -41/+80 |
|\| | | |||||
| * | | 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 |
| | |/ | |/| | |||||
| * | | Silence bogus warning: | Christian Häggström | 2015-09-16 | 1 | -0/+1 |
| |/ | | | | | | | Warning: CudaSirtAlgorithm3D: unused configuration options: SinogramMaskId | ||||
* | | Merge branch 'master' into volgeom3d | Willem Jan Palenstijn | 2015-09-16 | 42 | -602/+653 |
|\| | | | | | | | | | Conflicts: src/CudaBackProjectionAlgorithm3D.cpp | ||||
| * | Merge pull request #75 from wjp/cuda_options | Willem Jan Palenstijn | 2015-06-26 | 11 | -54/+177 |
| |\ | | | | | | | Move supersampling options from Algorithm to CudaProjector | ||||
| | * | Use supersampling options from CudaProjector2D | Willem Jan Palenstijn | 2015-06-23 | 3 | -36/+73 |
| | | | |||||
| | * | Use supersampling options from CudaProjector3D | Willem Jan Palenstijn | 2015-06-04 | 6 | -18/+88 |
| | | | |||||
| | * | Add supersampling options to Cuda Projectors | Willem Jan Palenstijn | 2015-05-22 | 2 | -0/+16 |
| | | | |||||
| * | | Add extra null check for ExtraDetectorOffset | Daniel M. Pelt | 2015-06-25 | 1 | -3/+5 |
| | | | |||||
| * | | Include ExtraDetectorOffset in returned configuration | Daniel M. Pelt | 2015-06-24 | 1 | -0/+3 |
| |/ | |||||
| * | Make XML array handling consistent | Willem Jan Palenstijn | 2015-05-06 | 1 | -63/+87 |
| | | | | | | | | setContent and getContent were using different XML formats previously. | ||||
| * | Change XMLNode* to XMLNode | Willem Jan Palenstijn | 2015-05-06 | 42 | -506/+410 |
| | | | | | | | | An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes. | ||||
| * | Fix memory leak in the config | Jeroen Bédorf | 2015-04-30 | 1 | -0/+5 |
| | | |||||
| * | Now include path is system-independent. | Valerii Sokolov | 2015-04-29 | 2 | -10/+0 |
| | | |||||
* | | Merge branch 'master' into volgeom3d | Willem Jan Palenstijn | 2015-04-15 | 14 | -92/+272 |
|\| | |||||
| * | Merge pull request #52 from wjp/change_geometry3d | Willem Jan Palenstijn | 2015-04-14 | 2 | -0/+18 |
| |\ | | | | | | | Add data3d('change_geometry') | ||||
| | * | Add changeGeometry function to Data3D classes | Willem Jan Palenstijn | 2015-04-10 | 2 | -0/+18 |
| | | | |||||
| * | | Add 'link' feature to Python (for 2D and 3D data) | Daniel M. Pelt | 2015-04-09 | 2 | -0/+39 |
| |/ | |||||
| * | Fix typo in error message | Willem Jan Palenstijn | 2015-03-30 | 1 | -1/+1 |
| | | |||||
| * | Add missing error on wrong projgeom type in CProjector3D::initialize | Willem Jan Palenstijn | 2015-03-30 | 1 | -0/+1 |
| | | |||||
| * | Only allow stdout and stderr for screen logging | Daniel M. Pelt | 2015-03-13 | 1 | -1/+5 |
| | | |||||
| * | Use a less verbose default fmt for screen logging and cleaner messages | Daniel M. Pelt | 2015-03-13 | 4 | -3/+4 |
| | | |||||
| * | Enable logging to Matlab window using callback function | Daniel M. Pelt | 2015-03-13 | 1 | -2/+6 |
| | | | | | | | | | | Also introduces a mex initialize function that is called at the first invocation of any mex method. | ||||
| * | Adds ASTRA_*** defines for easier logging, and changes internal calls to ↵ | Daniel M. Pelt | 2015-03-13 | 7 | -7/+7 |
| | | | | | | | | these defines | ||||
| * | Use new logging API internally instead of printf / iostream | Daniel M. Pelt | 2015-03-10 | 7 | -7/+24 |
| | | |||||
| * | Adds new logging capabilities (based on clog.h) | Daniel M. Pelt | 2015-03-10 | 1 | -0/+175 |
| | | |||||
| * | Remove old Logging code (only used in fft.cu) | Daniel M. Pelt | 2015-03-09 | 2 | -85/+6 |
| | | |||||
* | | Add flexible volgeom3d support to astraCudaFP | Willem Jan Palenstijn | 2015-03-12 | 1 | -56/+3 |
| | | |||||
* | | Add flexible volgeom3d support to astraCudaBP | Willem Jan Palenstijn | 2015-03-11 | 1 | -51/+3 |
| | | |||||
* | | Add flexible volgeom3d support to astraCudaBP_SIRTWeighted | Willem Jan Palenstijn | 2015-03-11 | 1 | -59/+28 |
| | | |||||
* | | Let astraCudaFDK use utility functions | Willem Jan Palenstijn | 2015-03-11 | 1 | -11/+1 |
| | | |||||
* | | Allow non-centered volume geometry in SIRT3D and CGLS3D | Willem Jan Palenstijn | 2015-03-09 | 2 | -75/+2 |
|/ | |||||
* | Fix getConfiguration type for vec geometries | Willem Jan Palenstijn | 2015-03-03 | 2 | -2/+2 |
| | |||||
* | Fix getConfiguration for vec geometries and non-square detectors | Willem Jan Palenstijn | 2015-03-03 | 2 | -6/+6 |
| | |||||
* | Untangle cuda and astra includes | Willem Jan Palenstijn | 2015-03-02 | 1 | -0/+75 |
| | |||||
* | Merge pull request #20 from wvaarle/matlab-get-geometry | Willem Jan Palenstijn | 2015-02-27 | 13 | -38/+219 |
|\ | | | | | 'get_geometry' functions in the matlab layer | ||||
| * | updated docs | Wim van Aarle | 2015-02-26 | 4 | -43/+0 |
| | |