Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ | |||||
| * | 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 |
|\ \ | |||||
| * | | 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 |
| * | | Improve option passing through CudaProjector3D | Willem Jan Palenstijn | 2015-10-09 | 12 | -70/+172 |
| * | | Add options passing to projectors from matlab | Nicola Vigano | 2015-10-09 | 1 | -2/+7 |
* | | | Merge pull request #95 from wjp/mex_direct | Willem Jan Palenstijn | 2015-12-01 | 8 | -3/+1349 |
|\ \ \ | |||||
| * | | | astra_mex_direct: Don't initialize newly allocated mxArray | Nicola Vigano | 2015-10-09 | 1 | -2/+18 |
| * | | | 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. | Willem Jan Palenstijn | 2015-10-09 | 1 | -4/+12 |
* | | | | 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 | 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 |
* | | | | Fix loop bounds in (unused) Float32ProjectionData3D arithmetic functions | Willem Jan Palenstijn | 2015-10-09 | 1 | -16/+20 |
| |/ / |/| | | |||||
* | | | Use mxLogical instead of bool. | Willem Jan Palenstijn | 2015-09-17 | 2 | -3/+3 |
* | | | Silence bogus warning: | Christian Häggström | 2015-09-16 | 1 | -0/+1 |
* | | | Merge pull request #90 from wjp/opTomo_leak | Willem Jan Palenstijn | 2015-09-09 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix algorithm leak in opTomo | Willem Jan Palenstijn | 2015-09-04 | 1 | -0/+2 |
|/ / | |||||
| * | Let astra_create_vol_geom also generate flexible volume geometries | Willem Jan Palenstijn | 2015-09-25 | 2 | -0/+30 |
| * | Merge branch 'master' into volgeom3d | Willem Jan Palenstijn | 2015-09-16 | 101 | -1304/+2196 |
| |\ | |/ |/| | |||||
* | | Fix algorithm object leak in astra_create_fbp_reconstruction.m | Willem Jan Palenstijn | 2015-08-12 | 1 | -0/+1 |
* | | Merge pull request #88 from dmpelt/nogil | Willem Jan Palenstijn | 2015-08-11 | 2 | -2/+4 |
|\ \ | |||||
| * | | Release the gil in algorithm.run | Daniel M. Pelt | 2015-08-10 | 2 | -2/+4 |
|/ / | |||||
* | | Merge pull request #86 from dmpelt/scipy-0.16-optomo-fix | Willem Jan Palenstijn | 2015-08-03 | 1 | -1/+17 |
|\ \ | |||||
| * | | Define a transpose for the OpTomo transpose as well | Daniel M. Pelt | 2015-07-30 | 1 | -0/+8 |
| * | | Fix Python OpTomo for scipy 0.16 | Daniel M. Pelt | 2015-07-30 | 1 | -1/+9 |
|/ / | |||||
* | | Merge pull request #84 from dmpelt/log-highlevel-fix | Willem Jan Palenstijn | 2015-07-17 | 3 | -9/+9 |
|\ \ | |||||
| * | | Fix formatting when passing strings to log from high-level code | Daniel M. Pelt | 2015-07-17 | 3 | -9/+9 |
|/ / | |||||
* | | Merge pull request #75 from wjp/cuda_options | Willem Jan Palenstijn | 2015-06-26 | 14 | -73/+197 |
|\ \ | |||||
| * | | Update sample | Willem Jan Palenstijn | 2015-06-23 | 1 | -18/+10 |
| * | | 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 | 4 | -1/+26 |
* | | | Merge pull request #76 from dmpelt/projector-configuration-fix | Willem Jan Palenstijn | 2015-06-26 | 7 | -11/+42 |
|\ \ \ | |||||
| * | | | Fix memory leak in configuration code | Daniel M. Pelt | 2015-06-25 | 4 | -9/+28 |
| * | | | 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 |
| * | | | Fix config to struct/dict translation for array options | Daniel M. Pelt | 2015-06-24 | 2 | -2/+9 |
|/ / / | |||||
* | | | Add some common temporary file patterns to .gitignore. | Willem Jan Palenstijn | 2015-06-23 | 1 | -22/+30 |
* | | | Merge pull request #74 from dmpelt/small-fixes | Willem Jan Palenstijn | 2015-06-23 | 4 | -5/+28 |
|\ \ \ | |||||
| * | | | Additional module name fix in documentation | Daniel M. Pelt | 2015-06-22 | 1 | -1/+1 |
| * | | | Add a .gitignore to ignore build files | Daniel M. Pelt | 2015-06-20 | 1 | -0/+23 |
| * | | | Actually use the rec_type argument in astra_create_reconstruction_cuda | Daniel M. Pelt | 2015-06-20 | 1 | -1/+1 |