Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change order of template instantiations for clang | Willem Jan Palenstijn | 2016-11-25 | 3 | -15/+15 |
| | | | | At least Apple's clang-703.0.31 needs this. | ||||
* | Merge pull request #74 from wjp/windows | Willem Jan Palenstijn | 2016-11-24 | 36 | -10106/+741 |
|\ | | | | | Move to VS2015+CUDA8 and automate Windows builds | ||||
| * | 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 |
|\ | | | | | Overhaul package installation | ||||
| * | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | |