Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Overhaul package installation | Willem Jan Palenstijn | 2016-11-21 | 3 | -70/+134 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-toolbox | Willem Jan Palenstijn | 2016-11-21 | 1 | -1/+1 |
| | |||||
* | Update tested cuda compute capabilities | Willem Jan Palenstijn | 2016-11-21 | 1 | -2/+2 |
| | |||||
* | Separate python build and install steps | Willem Jan Palenstijn | 2016-11-21 | 1 | -6/+7 |
| | |||||
* | Show NVCCFLAGS help | Willem Jan Palenstijn | 2016-11-21 | 1 | -0/+2 |
| | |||||
* | Fix hardcoded delim in splitString | Willem Jan Palenstijn | 2016-11-21 | 1 | -1/+1 |
| | |||||
* | Add install-octave to .PHONY | Willem Jan Palenstijn | 2016-11-21 | 1 | -1/+1 |
| | |||||
* | Merge pull request #73 from wjp/octave | Willem Jan Palenstijn | 2016-11-18 | 4 | -7/+123 |
|\ | | | | | Add experimental support for Octave | ||||
| * | Add experimental support for Octave | Willem Jan Palenstijn | 2016-11-18 | 4 | -2/+118 |
| | | | | | | | | Based on initial patch by @kalvdans. | ||||
| * | Improve consts in matlab undocumented function declarations | Willem Jan Palenstijn | 2016-11-18 | 1 | -5/+5 |
|/ | |||||
* | Merge pull request #66 from wjp/iter_plugins | Willem Jan Palenstijn | 2016-11-18 | 7 | -1/+234 |
|\ | | | | | Add SIRT, CGLS python plugins | ||||
| * | Use SIRTPlugin, CGLSPlugin in example | Willem Jan Palenstijn | 2016-11-18 | 1 | -0/+12 |
| | | |||||
| * | Add CGLS plugin | Willem Jan Palenstijn | 2016-11-18 | 2 | -0/+100 |
| | | |||||
| * | Add SIRT plugin | Willem Jan Palenstijn | 2016-11-18 | 5 | -1/+122 |
|/ | |||||
* | Merge pull request #72 from buzmakov/master | Willem Jan Palenstijn | 2016-11-18 | 6 | -0/+6 |
|\ | | | | | Fix build with MS VS 2015 CE | ||||
| * | Fix build with MS VS 2015 CE | Alexey Buzmakov | 2016-11-04 | 6 | -0/+6 |
|/ | |||||
* | Update README.md | Jan Sijbers | 2016-10-24 | 1 | -2/+5 |
| | |||||
* | Update README.txt | Jan Sijbers | 2016-10-24 | 1 | -2/+4 |
| | |||||
* | Fix Python create_projector docstring | Willem Jan Palenstijn | 2016-10-19 | 1 | -1/+1 |
| | |||||
* | Clean up unused variables | Willem Jan Palenstijn | 2016-10-13 | 1 | -29/+0 |
| | |||||
* | Increase max angle count for Parker Weighting | Willem Jan Palenstijn | 2016-10-13 | 1 | -1/+1 |
| | |||||
* | Merge pull request #42 from wjp/FDK | Willem Jan Palenstijn | 2016-10-07 | 13 | -254/+208 |
|\ | | | | | Use CompositeGeometryManager for FDK | ||||
| * | Merge branch 'master' into FDK | Willem Jan Palenstijn | 2016-10-07 | 0 | -0/+0 |
| |\ | |/ |/| | |||||
* | | Merge pull request #41 from wjp/aniso | Willem Jan Palenstijn | 2016-10-07 | 19 | -238/+386 |
|\ \ | | | | | | | Add support for non-cube voxels | ||||
| * \ | Merge branch 'master' into aniso | Willem Jan Palenstijn | 2016-04-22 | 5 | -311/+3330 |
| |\ \ | |||||
| | | * | Merge branch 'master' into FDK | Willem Jan Palenstijn | 2016-10-06 | 20 | -408/+450 |
| | | |\ | |_|_|/ |/| | | | |||||
* | | | | Merge pull request #62 from wjp/stringutil | Willem Jan Palenstijn | 2016-07-29 | 4 | -38/+37 |
|\ \ \ \ | | | | | | | | | | | Minor string parsing changes | ||||
| * | | | | Replace use of boost::split by own function | Willem Jan Palenstijn | 2016-07-28 | 4 | -29/+31 |
| | | | | | |||||
| * | | | | Convert one more string parsing function to stringToDouble | Willem Jan Palenstijn | 2016-07-28 | 1 | -9/+6 |
| | | | | | |||||
* | | | | | Merge pull request #58 from wjp/volume_reduction | Willem Jan Palenstijn | 2016-07-29 | 1 | -137/+184 |
|\ \ \ \ \ | | | | | | | | | | | | | Improve efficiency of CGM volume block reduction | ||||
| * | | | | | Fix inefficient block split logic | Willem Jan Palenstijn | 2016-06-20 | 1 | -5/+19 |
| | | | | | | |||||
| * | | | | | Improve volume block reduction | Willem Jan Palenstijn | 2016-06-20 | 1 | -132/+165 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version would make the blocks too large due to inefficient computation of overlap. | ||||
* | | | | | | Remove leftover code from Singleton | Willem Jan Palenstijn | 2016-07-28 | 1 | -5/+1 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #59 from wjp/spatial_filter | Willem Jan Palenstijn | 2016-07-28 | 1 | -7/+39 |
|\ \ \ \ \ | |/ / / / |/| | | | | Compute FBP filter in spatial domain | ||||
| * | | | | Compute FBP filter in spatial domain | Willem Jan Palenstijn | 2016-06-24 | 1 | -7/+39 |
|/ / / / | |||||
* | | | | Merge pull request #55 from wjp/singleton_construction | Willem Jan Palenstijn | 2016-05-17 | 1 | -4/+18 |
|\ \ \ \ | | | | | | | | | | | Avoid defining singleton construction in header file | ||||
| * | | | | Add sanity check | Willem Jan Palenstijn | 2016-05-17 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Avoid defining singleton construction in header file | Willem Jan Palenstijn | 2016-05-17 | 1 | -4/+18 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That way, the call to new is always executed by code inside libastra. This avoids the situation where a singleton gets created by a copy of the constructor linked into an object file outside of libastra, such as a .mex file, which would then also cause the vtable to be outside of libastra. This situation would cause issues when .mex files are unloaded. | ||||
* | | | | Merge pull request #47 from wjp/OpTomo_out | Willem Jan Palenstijn | 2016-04-26 | 2 | -43/+87 |
|\ \ \ \ | | | | | | | | | | | Give OpTomo FP/BP functions with optional out argument | ||||
| * | | | | Use FP/BP out argument in sample plugin | Willem Jan Palenstijn | 2016-04-26 | 1 | -13/+21 |
| | | | | | |||||
| * | | | | Give OpTomo FP/BP functions with optional out argument | Willem Jan Palenstijn | 2016-04-25 | 1 | -30/+66 |
| | | | | | | | | | | | | | | | | | | | | This allows more efficient use of allocated arrays. | ||||
* | | | | | Merge pull request #46 from dmpelt/python_cxx | Willem Jan Palenstijn | 2016-04-25 | 2 | -2/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Use CXX for Python compilation as well | ||||
| * | | | | | Add comment about setting CC to CXX | Daniel M. Pelt | 2016-04-19 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Use CXX for Python compilation as well | Daniel M. Pelt | 2016-04-19 | 2 | -2/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #50 from wjp/data3d_dimensions | Willem Jan Palenstijn | 2016-04-25 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Reverse output of astra.data3d.dimensions | ||||
| * | | | | | Reverse output of astra.data3d.dimensions | Willem Jan Palenstijn | 2016-04-25 | 1 | -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. | ||||
* | | | | | Merge pull request #49 from dmpelt/flatten_to_ravel | Willem Jan Palenstijn | 2016-04-25 | 4 | -7/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | Change flatten to ravel in Python code | ||||
| * | | | | Change flatten to ravel in Python code | Daniel M. Pelt | 2016-04-25 | 4 | -7/+7 |
|/ / / / | |||||
* | | | | Fix build | Willem Jan Palenstijn | 2016-04-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix build | Willem Jan Palenstijn | 2016-04-22 | 3 | -132/+78 |
| | | | |