Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | 2 | -70/+125 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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 | |
| | | ||||||
| * | Add install-octave to .PHONY | Willem Jan Palenstijn | 2016-11-21 | 1 | -1/+1 | |
| | | ||||||
| * | Add experimental support for Octave | Willem Jan Palenstijn | 2016-11-18 | 2 | -1/+73 | |
| | | | | | | | | Based on initial patch by @kalvdans. | |||||
| * | Add SIRT plugin | Willem Jan Palenstijn | 2016-11-18 | 1 | -0/+2 | |
| | | ||||||
* | | Add CUDA parvec support | Willem Jan Palenstijn | 2016-07-29 | 1 | -0/+2 | |
| | | ||||||
* | | Merge branch 'master' into parvec | Willem Jan Palenstijn | 2016-07-28 | 7 | -338/+556 | |
|\| | ||||||
| * | Add comment about setting CC to CXX | Daniel M. Pelt | 2016-04-19 | 1 | -0/+2 | |
| | | ||||||
| * | Use CXX for Python compilation as well | Daniel M. Pelt | 2016-04-19 | 1 | -2/+2 | |
| | | ||||||
| * | Merge pull request #32 from dmpelt/split-conda | Willem Jan Palenstijn | 2016-03-03 | 1 | -1/+1 | |
| |\ | | | | | | | Split conda package into c++ lib and python parts | |||||
| | * | Include PluginAlgorithm in non-Python builds as well | Daniel M. Pelt | 2016-03-03 | 1 | -1/+1 | |
| | | | ||||||
| * | | Revert "Use nvcc's -MT option" | Willem Jan Palenstijn | 2016-03-03 | 1 | -2/+4 | |
| |/ | | | | | | | | | | | This reverts commit 29c5c86e56697286a92031aaa9fdd903b3bcc426. This fixes building with CUDA 5.5. | |||||
| * | Add missing .PHONY targets | Willem Jan Palenstijn | 2016-01-21 | 1 | -1/+1 | |
| | | ||||||
| * | Initialize Python plugins when available in Matlab | Willem Jan Palenstijn | 2016-01-21 | 1 | -0/+10 | |
| | | ||||||
| * | Remove dependency of libastra on libpython by refactoring PluginAlgorithm | Willem Jan Palenstijn | 2016-01-21 | 1 | -2/+0 | |
| | | ||||||
| * | Fix VPATH problem with older autoconf versions | Willem Jan Palenstijn | 2016-01-21 | 2 | -1/+7 | |
| | | ||||||
| * | Don't build cuda non-PIC object if static libs are disabled | Willem Jan Palenstijn | 2016-01-20 | 1 | -2/+10 | |
| | | | | | | | | | | This significantly speeds up builds since we usually pass disable-static to libtool. | |||||
| * | Try to improve nvcc dependency file generation | Willem Jan Palenstijn | 2016-01-20 | 1 | -0/+3 | |
| | | | | | | | | | | | | We now append empty targets for all dependencies listed in the .d file generated by nvcc. This mimics the behaviour of gcc's -MP option, and prevents deleted header files from breaking the build. | |||||
| * | Use nvcc's -MT option | Willem Jan Palenstijn | 2016-01-20 | 1 | -4/+2 | |
| | | ||||||
| * | Avoid incorrect include dirs when building python modules | Willem Jan Palenstijn | 2016-01-20 | 1 | -2/+5 | |
| | | ||||||
| * | Add check for scipy | Willem Jan Palenstijn | 2016-01-20 | 1 | -0/+7 | |
| | | | | | | | | The module matrix_c.pyx uses it. | |||||
| * | Fail when python six module is not found | Willem Jan Palenstijn | 2016-01-20 | 1 | -1/+1 | |
| | | ||||||
| * | Place Python build/temporary files in build directory | Willem Jan Palenstijn | 2016-01-20 | 1 | -9/+12 | |
| | | | | | | | | This also allows out-of-tree builds for Python. | |||||
| * | Allow out-of-tree builds | Willem Jan Palenstijn | 2016-01-20 | 1 | -30/+37 | |
| | | ||||||
| * | Merge pull request #105 from wjp/strings | Willem Jan Palenstijn | 2016-01-18 | 1 | -1/+0 | |
| |\ | | | | | | | Replace boost::lexical_cast by stringstreams | |||||
| | * | Replace boost::lexical_cast by stringstreams | Willem Jan Palenstijn | 2016-01-05 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | This is to avoid the dependence of lexical_cast on the current locale. The stringstreams used for the new string parsing/output functions are explicitly imbued with the C/classic locale. | |||||
| * | | Allow user to pass NVCCFLAGS to configure | Willem Jan Palenstijn | 2016-01-18 | 3 | -8/+10 | |
| |/ | ||||||
| * | Update version to 1.7.1 | Willem Jan Palenstijn | 2015-12-23 | 1 | -1/+1 | |
| | | ||||||
| * | Update version to 1.7 | Willem Jan Palenstijn | 2015-12-04 | 1 | -1/+1 | |
| | | ||||||
| * | Add conda build scripts | Daniel M. Pelt | 2015-12-04 | 1 | -0/+4 | |
| | | ||||||
| * | Merge pull request #101 from wjp/composite | Willem Jan Palenstijn | 2015-12-04 | 1 | -1/+3 | |
| |\ | | | | | | | Add CompositeGeometryManager | |||||
| | * | Add CompositeGeometryManager | Willem Jan Palenstijn | 2015-12-04 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | This handles FP and BP operations on multiple data objects at once, splitting them to fit in GPU memory where necessary. | |||||
| * | | Merge branch 'master' into python-plugins | Willem Jan Palenstijn | 2015-12-01 | 1 | -1/+2 | |
| |\| | | | | | | | | | | | | | Conflicts: python/astra/utils.pyx | |||||
| | * | Add astra_mex_direct('FP3D'/'BP3D', ...) | Willem Jan Palenstijn | 2015-10-07 | 1 | -1/+2 | |
| | | | ||||||
| * | | Add support for Python algorithm plugins | Daniel M. Pelt | 2015-07-23 | 1 | -3/+13 | |
| |/ | ||||||
| * | Increment version to 1.6 | Willem Jan Palenstijn | 2015-05-29 | 1 | -1/+1 | |
| | | ||||||
| * | Update utility files | Willem Jan Palenstijn | 2015-05-29 | 3 | -287/+438 | |
| | | ||||||
| * | Update README, NEWS | Willem Jan Palenstijn | 2015-05-29 | 1 | -2/+4 | |
| | | ||||||
* | | Merge remote-tracking branch 'upstream/master' into parallel_vec | Wim van Aarle | 2015-05-26 | 2 | -3/+5 | |
|\| | | | | | | | | | | | | | | | Conflicts: astra_vc11.vcxproj.filters python/astra/functions.py src/ParallelBeamBlobKernelProjector2D.cpp src/ProjectionGeometry2D.cpp | |||||
| * | Now include path is system-independent. | Valerii Sokolov | 2015-04-29 | 1 | -1/+1 | |
| | | ||||||
| * | Fix typo in configure python check | Willem Jan Palenstijn | 2015-04-16 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'master' into logging | Willem Jan Palenstijn | 2015-03-20 | 2 | -2/+41 | |
| |\ | ||||||
| * | | Enable logging to Matlab window using callback function | Daniel M. Pelt | 2015-03-13 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | Also introduces a mex initialize function that is called at the first invocation of any mex method. | |||||
| * | | Add logging support to Matlab | Daniel M. Pelt | 2015-03-13 | 1 | -0/+1 | |
| | | |