Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | 2 | -1/+7 | |
| |\ | | | | | | | Add CompositeGeometryManager | |||||
| | * | Add CompositeGeometryManager | Willem Jan Palenstijn | 2015-12-04 | 2 | -1/+7 | |
| | | | | | | | | | | | | | | | This handles FP and BP operations on multiple data objects at once, splitting them to fit in GPU memory where necessary. | |||||
| * | | Merge pull request #73 from dmpelt/python-plugins | Willem Jan Palenstijn | 2015-12-04 | 1 | -3/+13 | |
| |\ \ | | |/ | |/| | Add support for Python algorithm plugins | |||||
| | * | Merge branch 'master' into python-plugins | Willem Jan Palenstijn | 2015-12-01 | 2 | -3/+15 | |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: python/astra/utils.pyx | |||||
| | * | | Add support for Python algorithm plugins | Daniel M. Pelt | 2015-07-23 | 1 | -3/+13 | |
| | | | | ||||||
| * | | | Fix Windows builds of astra_mex_direct | Willem Jan Palenstijn | 2015-12-02 | 1 | -0/+4 | |
| | |/ | |/| | ||||||
| * | | Build astra_mex_direct in MSVC | Willem Jan Palenstijn | 2015-10-07 | 1 | -2/+13 | |
| | | | ||||||
| * | | Add astra_mex_direct('FP3D'/'BP3D', ...) | Willem Jan Palenstijn | 2015-10-07 | 1 | -1/+2 | |
| |/ | ||||||
| * | Increment version to 1.6 | Willem Jan Palenstijn | 2015-05-29 | 1 | -1/+1 | |
| | | ||||||
| * | Fix vs2008 build | Willem Jan Palenstijn | 2015-05-29 | 1 | -2/+3 | |
| | | ||||||
| * | 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 | 3 | -3/+1132 | |
|\| | | | | | | | | | | | | | | | 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 | |
| | | ||||||
| * | Add MSVC project files | Willem Jan Palenstijn | 2015-03-20 | 1 | -4/+34 | |
| | | ||||||
| * | Merge branch 'master' into logging | Willem Jan Palenstijn | 2015-03-20 | 3 | -2/+1138 | |
| |\ | ||||||
| | * | Add command line option to generate vc09/vc11/all files | Willem Jan Palenstijn | 2015-03-20 | 1 | -24/+33 | |
| | | | ||||||
| | * | Generate MSVC 2008/2012 project files with a Python script | Willem Jan Palenstijn | 2015-03-19 | 1 | -0/+1088 | |
| | | | ||||||
| * | | 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 | |
| | | | ||||||
| * | | Adds new logging capabilities (based on clog.h) | Daniel M. Pelt | 2015-03-10 | 1 | -0/+1 | |
| | | | ||||||
| * | | Remove old Logging code (only used in fft.cu) | Daniel M. Pelt | 2015-03-09 | 1 | -1/+0 | |
| | | | ||||||
* | | | updated makefile | Wim van Aarle | 2015-03-18 | 2 | -2/+44 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Add check for required boost headers | Willem Jan Palenstijn | 2015-03-09 | 1 | -0/+11 | |
| | | | ||||||
| * | | Make boost-unit-test-framework optional in configure | Willem Jan Palenstijn | 2015-03-06 | 2 | -2/+15 | |
| | | | ||||||
| * | | Force clang to use libstdc++ on OSX (fixes Cython compilation) | Daniel M. Pelt | 2015-03-05 | 2 | -0/+15 | |
| |/ | ||||||
| * | Also clean up generated Cython files during `make clean` | Daniel M. Pelt | 2015-03-04 | 1 | -0/+2 | |
|/ | ||||||
* | Untangle cuda and astra includes | Willem Jan Palenstijn | 2015-03-02 | 1 | -1/+1 | |
| | ||||||
* | Add logging for python module checks | Willem Jan Palenstijn | 2015-02-26 | 2 | -12/+28 | |
| | ||||||
* | Simplify with-python handling | Willem Jan Palenstijn | 2015-02-26 | 1 | -2/+13 | |
| | ||||||
* | Better Python configure checks | Daniel M. Pelt | 2015-02-26 | 1 | -7/+24 | |
| | ||||||
* | Merge branch 'master' into python-interface | Willem Jan Palenstijn | 2015-02-26 | 4 | -37/+49 | |
|\ | ||||||
| * | Merge pull request #17 from wjp/nvcc_config | Willem Jan Palenstijn | 2015-02-25 | 2 | -34/+40 | |
| |\ | | | | | | | Clean up and improve nvcc/cuda configure checks | |||||
| | * | Also output prefix at end of configure | Willem Jan Palenstijn | 2015-02-25 | 1 | -4/+4 | |
| | | | ||||||
| | * | Output summary of results at end of configure | Willem Jan Palenstijn | 2015-02-25 | 1 | -1/+7 | |
| | | | ||||||
| | * | Clean up configure check for nvcc | Willem Jan Palenstijn | 2015-02-25 | 1 | -26/+19 | |
| | | | ||||||
| | * | Fix copy-paste error in boost-unit-test-framework check | Willem Jan Palenstijn | 2015-02-25 | 1 | -1/+1 | |
| | | | ||||||
| | * | Improve logging for nvcc hack | Willem Jan Palenstijn | 2015-02-25 | 1 | -4/+11 | |
| | | | ||||||
| * | | Added libtool check for OSX | Daniel M. Pelt | 2015-02-25 | 1 | -2/+5 | |
| | | | ||||||
| * | | Remove CAsyncAlgorithm::timedJoin | Willem Jan Palenstijn | 2015-02-25 | 1 | -26/+0 | |
| |/ | | | | | | | It is currently unused, and its current implementation is not very portable. | |||||
| * | Check if we need librt for clock_gettime in configure script | Willem Jan Palenstijn | 2015-02-20 | 2 | -1/+30 | |
| | | ||||||
* | | Added Python interface | Daniel M. Pelt | 2015-02-24 | 2 | -9/+67 | |
|/ | ||||||
* | Update version | Willem Jan Palenstijn | 2015-01-30 | 1 | -1/+1 | |
| | ||||||
* | Store result of nvcc tests in config.log | Willem Jan Palenstijn | 2015-01-30 | 1 | -2/+23 | |
| | ||||||
* | Update copyright to -2015 | Willem Jan Palenstijn | 2015-01-26 | 1 | -2/+2 | |
| | ||||||
* | Update copyright headers | Willem Jan Palenstijn | 2015-01-19 | 1 | -5/+5 | |
| | ||||||
* | Refactor astra_mex_data3d | Willem Jan Palenstijn | 2014-12-04 | 1 | -1/+5 | |
| | | | | (Modified) patch by Nicola ViganĂ² | |||||
* | Move BP coordinate transformation to utility function | Willem Jan Palenstijn | 2014-12-03 | 1 | -0/+1 | |
| |