summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #84 from wjp/expose_ConeBP_density_weightingWillem Jan Palenstijn2016-12-015-3/+20
|\
| * Expose the density weighting option of cone_bpWillem Jan Palenstijn2016-12-015-3/+20
* | Tune cone_fp block sizeWillem Jan Palenstijn2016-11-301-1/+1
|/
* Enable 'make test' on travis-ciWillem Jan Palenstijn2016-11-281-0/+1
* Fix Fourier testWillem Jan Palenstijn2016-11-281-135/+12
* Fix AstraObjectManager testWillem Jan Palenstijn2016-11-281-6/+22
* Fix warningsWillem Jan Palenstijn2016-11-283-6/+4
* Update .gitignoreWillem Jan Palenstijn2016-11-281-0/+2
* Update headers (website+2016)Willem Jan Palenstijn2016-11-28353-2066/+1083
* Update python headersWillem Jan Palenstijn2016-11-2866-857/+828
* Merge branch 'fdk_custom_filter'Willem Jan Palenstijn2016-11-289-14/+57
|\
| * Merge branch 'master' into fdk_custom_filterWillem Jan Palenstijn2016-10-1330-714/+863
| |\
| * | Add option to specify custom filter for FDKDaniel M. Pelt2016-05-206-7/+48
* | | 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