Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #84 from wjp/expose_ConeBP_density_weighting | Willem Jan Palenstijn | 2016-12-01 | 5 | -3/+20 | |
|\ | | | | | Expose the density weighting option of cone_bp | |||||
| * | Expose the density weighting option of cone_bp | Willem Jan Palenstijn | 2016-12-01 | 5 | -3/+20 | |
| | | | | | | | | It is now exposed via the new DensityWeighting option of CudaProjector3D. | |||||
* | | Tune cone_fp block size | Willem Jan Palenstijn | 2016-11-30 | 1 | -1/+1 | |
|/ | ||||||
* | Enable 'make test' on travis-ci | Willem Jan Palenstijn | 2016-11-28 | 1 | -0/+1 | |
| | ||||||
* | Fix Fourier test | Willem Jan Palenstijn | 2016-11-28 | 1 | -135/+12 | |
| | ||||||
* | Fix AstraObjectManager test | Willem Jan Palenstijn | 2016-11-28 | 1 | -6/+22 | |
| | ||||||
* | Fix warnings | Willem Jan Palenstijn | 2016-11-28 | 3 | -6/+4 | |
| | ||||||
* | Update .gitignore | Willem Jan Palenstijn | 2016-11-28 | 1 | -0/+2 | |
| | ||||||
* | Update headers (website+2016) | Willem Jan Palenstijn | 2016-11-28 | 353 | -2066/+1083 | |
| | ||||||
* | Update python headers | Willem Jan Palenstijn | 2016-11-28 | 66 | -857/+828 | |
| | ||||||
* | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make builder (= advanced user or us ourselves) choose compilers and CUDA - add a check for the C++11 flag for nvcc to work around the infamous boost bug if necessary - use conda boost to build the C++ library - simplify python bindings conda recipe to only build the bindings; the C++ library is now a build and runtime dependency - add runtime dependencies to python bindings recipe - some small adjustments to builder.py | |||||
* | | | Merge pull request #77 from wjp/singleton | Willem Jan Palenstijn | 2016-11-25 | 4 | -15/+21 | |
|\ \ \ | | | | | | | | | Change order of template instantiations | |||||
| * | | | 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 | |
|/ / / | | | | | | | | | | 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 | |
| | | | |