summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Separate C++ and python builds & make conda work nicelyHolger Kohr2016-11-256-82/+90
| * | | Merge pull request #77 from wjp/singletonWillem Jan Palenstijn2016-11-254-15/+21
| |\ \ \
| | * | | Add travis clang buildWillem Jan Palenstijn2016-11-251-0/+6
| | * | | Change order of template instantiations for clangWillem Jan Palenstijn2016-11-253-15/+15
| |/ / /
| * | | Merge pull request #74 from wjp/windowsWillem Jan Palenstijn2016-11-2436-10106/+741
| |\ \ \
| | * | | Add automated Windows build scriptsWillem Jan Palenstijn2016-11-249-22/+318
| | * | | Add VS2015 build filesWillem Jan Palenstijn2016-11-2412-0/+4626
| | * | | Remove VS2008/VS2012 build filesWillem Jan Palenstijn2016-11-2424-13968/+0
| | * | | Update gen.py for VS2015Willem Jan Palenstijn2016-11-241-39/+78
| | * | | Update CUDA archsWillem Jan Palenstijn2016-11-241-1/+1
| | * | | Switch to CUDA 8.0Willem Jan Palenstijn2016-11-241-2/+2
| | * | | Remove unused Cuda.rules fileWillem Jan Palenstijn2016-11-241-358/+0
| |/ / /
| * | | Merge pull request #75 from wjp/installWillem Jan Palenstijn2016-11-247-113/+263
| |\ \ \
| | * | | Fix conda build.shWillem Jan Palenstijn2016-11-231-1/+1
| | * | | Make shared objects 755Willem Jan Palenstijn2016-11-231-5/+5
| | * | | Remove resolved TODOWillem Jan Palenstijn2016-11-221-1/+0
| | * | | Rename python-root-install to install-python-site-packagesWillem Jan Palenstijn2016-11-221-5/+5
| | * | | Avoid six for PYINCDIR in Makefile.inWillem Jan Palenstijn2016-11-221-2/+1
| | * | | Simplify default build instructionsWillem Jan Palenstijn2016-11-222-17/+63
| | * | | Simplify travis build using new install typeWillem Jan Palenstijn2016-11-221-2/+2
| | * | | Show installation paths at end of configureWillem Jan Palenstijn2016-11-221-7/+42
| | * | | Clean up linking against libpython for oct/mexWillem Jan Palenstijn2016-11-221-13/+4
| | * | | Disable octave interface by defaultWillem Jan Palenstijn2016-11-221-2/+2
| | * | | Build astra_mex_plugin for octaveWillem Jan Palenstijn2016-11-221-5/+18
| | * | | Overhaul package installationWillem Jan Palenstijn2016-11-213-70/+134
| | * | | Update python package name from PyASTRAToolbox to astra-toolboxWillem Jan Palenstijn2016-11-211-1/+1
| | * | | Update tested cuda compute capabilitiesWillem Jan Palenstijn2016-11-211-2/+2
| | * | | Separate python build and install stepsWillem Jan Palenstijn2016-11-211-6/+7
| | * | | Show NVCCFLAGS helpWillem Jan Palenstijn2016-11-211-0/+2
| |/ / /
| * | | Fix hardcoded delim in splitStringWillem Jan Palenstijn2016-11-211-1/+1
| * | | Add install-octave to .PHONYWillem Jan Palenstijn2016-11-211-1/+1
| * | | Merge pull request #73 from wjp/octaveWillem Jan Palenstijn2016-11-184-7/+123
| |\ \ \
| | * | | Add experimental support for OctaveWillem Jan Palenstijn2016-11-184-2/+118
| | * | | Improve consts in matlab undocumented function declarationsWillem Jan Palenstijn2016-11-181-5/+5
| |/ / /
| * | | Merge pull request #66 from wjp/iter_pluginsWillem Jan Palenstijn2016-11-187-1/+234
| |\ \ \
| | * | | Use SIRTPlugin, CGLSPlugin in exampleWillem Jan Palenstijn2016-11-181-0/+12
| | * | | Add CGLS pluginWillem Jan Palenstijn2016-11-182-0/+100
| | * | | Add SIRT pluginWillem Jan Palenstijn2016-11-185-1/+122
| |/ / /
| * | | Merge pull request #72 from buzmakov/masterWillem Jan Palenstijn2016-11-186-0/+6
| |\ \ \
| | * | | Fix build with MS VS 2015 CEAlexey Buzmakov2016-11-046-0/+6
| |/ / /
| * | | Update README.mdJan Sijbers2016-10-241-2/+5
| * | | Update README.txtJan Sijbers2016-10-241-2/+4
| * | | Fix Python create_projector docstringWillem Jan Palenstijn2016-10-191-1/+1
| | |/ | |/|
| * | Clean up unused variablesWillem Jan Palenstijn2016-10-131-29/+0
| * | Increase max angle count for Parker WeightingWillem Jan Palenstijn2016-10-131-1/+1
* | | Merge branch 'master' into parallel_vecWillem Jan Palenstijn2016-10-0729-661/+809
|\| |
| * | Merge pull request #42 from wjp/FDKWillem Jan Palenstijn2016-10-0713-254/+208
| |\ \
| | * \ Merge branch 'master' into FDKWillem Jan Palenstijn2016-10-070-0/+0
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #41 from wjp/anisoWillem Jan Palenstijn2016-10-0719-238/+386
| |\ \ \
| | * \ \ Merge branch 'master' into anisoWillem Jan Palenstijn2016-04-225-311/+3330
| | |\ \ \