Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fdk_custom_filter' | Willem Jan Palenstijn | 2016-11-28 | 9 | -14/+57 |
|\ | |||||
| * | Merge branch 'master' into fdk_custom_filter | Willem Jan Palenstijn | 2016-10-13 | 30 | -714/+863 |
| |\ | |||||
| * | | Add option to specify custom filter for FDK | Daniel M. Pelt | 2016-05-20 | 6 | -7/+48 |
* | | | Separate C++ and python builds & make conda work nicely | Holger Kohr | 2016-11-25 | 6 | -82/+90 |
* | | | Merge pull request #77 from wjp/singleton | Willem Jan Palenstijn | 2016-11-25 | 4 | -15/+21 |
|\ \ \ | |||||
| * | | | Add travis clang build | Willem Jan Palenstijn | 2016-11-25 | 1 | -0/+6 |
| * | | | Change order of template instantiations for clang | Willem Jan Palenstijn | 2016-11-25 | 3 | -15/+15 |
|/ / / | |||||
* | | | Merge pull request #74 from wjp/windows | Willem Jan Palenstijn | 2016-11-24 | 36 | -10106/+741 |
|\ \ \ | |||||
| * | | | Add automated Windows build scripts | Willem Jan Palenstijn | 2016-11-24 | 9 | -22/+318 |
| * | | | Add VS2015 build files | Willem Jan Palenstijn | 2016-11-24 | 12 | -0/+4626 |
| * | | | Remove VS2008/VS2012 build files | Willem Jan Palenstijn | 2016-11-24 | 24 | -13968/+0 |
| * | | | Update gen.py for VS2015 | Willem Jan Palenstijn | 2016-11-24 | 1 | -39/+78 |
| * | | | Update CUDA archs | Willem Jan Palenstijn | 2016-11-24 | 1 | -1/+1 |
| * | | | Switch to CUDA 8.0 | Willem Jan Palenstijn | 2016-11-24 | 1 | -2/+2 |
| * | | | Remove unused Cuda.rules file | Willem Jan Palenstijn | 2016-11-24 | 1 | -358/+0 |
|/ / / | |||||
* | | | Merge pull request #75 from wjp/install | Willem Jan Palenstijn | 2016-11-24 | 7 | -113/+263 |
|\ \ \ | |||||
| * | | | Fix conda build.sh | Willem Jan Palenstijn | 2016-11-23 | 1 | -1/+1 |
| * | | | Make shared objects 755 | Willem Jan Palenstijn | 2016-11-23 | 1 | -5/+5 |
| * | | | Remove resolved TODO | Willem Jan Palenstijn | 2016-11-22 | 1 | -1/+0 |
| * | | | Rename python-root-install to install-python-site-packages | Willem Jan Palenstijn | 2016-11-22 | 1 | -5/+5 |
| * | | | Avoid six for PYINCDIR in Makefile.in | Willem Jan Palenstijn | 2016-11-22 | 1 | -2/+1 |
| * | | | Simplify default build instructions | Willem Jan Palenstijn | 2016-11-22 | 2 | -17/+63 |
| * | | | Simplify travis build using new install type | Willem Jan Palenstijn | 2016-11-22 | 1 | -2/+2 |
| * | | | Show installation paths at end of configure | Willem Jan Palenstijn | 2016-11-22 | 1 | -7/+42 |
| * | | | Clean up linking against libpython for oct/mex | Willem Jan Palenstijn | 2016-11-22 | 1 | -13/+4 |
| * | | | Disable octave interface by default | Willem Jan Palenstijn | 2016-11-22 | 1 | -2/+2 |
| * | | | Build astra_mex_plugin for octave | Willem Jan Palenstijn | 2016-11-22 | 1 | -5/+18 |
| * | | | Overhaul package installation | Willem Jan Palenstijn | 2016-11-21 | 3 | -70/+134 |
| * | | | 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 | Willem Jan Palenstijn | 2016-11-18 | 4 | -2/+118 |
| * | | | 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 |
|\ \ \ | |||||
| * | | | 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 | 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 |
|\ \ | |||||
| * \ | Merge branch 'master' into FDK | Willem Jan Palenstijn | 2016-10-07 | 0 | -0/+0 |
| |\ \ | |/ / |/| | |