Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into logging | Willem Jan Palenstijn | 2015-03-20 | 40 | -5326/+7465 |
|\ | |||||
| * | Merge pull request #34 from wjp/msvc_gen | Willem Jan Palenstijn | 2015-03-20 | 20 | -5241/+7014 |
| |\ | | | | | | | Generate MSVC 2008/2012 project files with a Python script | ||||
| | * | 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 | 20 | -5241/+7005 |
| |/ | |||||
| * | Merge pull request #28 from dmpelt/projector3d-python | Willem Jan Palenstijn | 2015-03-18 | 18 | -83/+410 |
| |\ | | | | | | | Add projector3d and CUDA projectors to Python (to match new Matlab code) | ||||
| | * | Adjust docstring and samples to new python create_sino function | Willem Jan Palenstijn | 2015-03-06 | 8 | -23/+19 |
| | | | |||||
| | * | Avoid Python recompilation during installation | Daniel M. Pelt | 2015-03-05 | 1 | -3/+16 |
| | | | |||||
| | * | Added Python support for CUDA projectors | Daniel M. Pelt | 2015-03-05 | 10 | -57/+375 |
| | | | |||||
| * | | Merge pull request #29 from wjp/optional_boostutf | Willem Jan Palenstijn | 2015-03-10 | 2 | -2/+26 |
| |\ \ | | | | | | | | | Improve configure checks for boost | ||||
| | * | | 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 |
| |/ | |||||
* | | Fix windows build | Willem Jan Palenstijn | 2015-03-19 | 2 | -1/+14 |
| | | |||||
* | | Only allow stdout and stderr for screen logging | Daniel M. Pelt | 2015-03-13 | 1 | -1/+5 |
| | | |||||
* | | Use a less verbose default fmt for screen logging and cleaner messages | Daniel M. Pelt | 2015-03-13 | 5 | -7/+8 |
| | | |||||
* | | Enable logging to Matlab window using callback function | Daniel M. Pelt | 2015-03-13 | 15 | -3/+125 |
| | | | | | | | | | | 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 | 3 | -0/+336 |
| | | |||||
* | | Adds ASTRA_*** defines for easier logging, and changes internal calls to ↵ | Daniel M. Pelt | 2015-03-13 | 12 | -29/+32 |
| | | | | | | | | these defines | ||||
* | | Use new logging API internally instead of printf / iostream | Daniel M. Pelt | 2015-03-10 | 11 | -31/+55 |
| | | |||||
* | | Add logging support to Python | Daniel M. Pelt | 2015-03-10 | 3 | -0/+250 |
| | | |||||
* | | Adds new logging capabilities (based on clog.h) | Daniel M. Pelt | 2015-03-10 | 4 | -0/+945 |
| | | |||||
* | | Remove old Logging code (only used in fft.cu) | Daniel M. Pelt | 2015-03-09 | 6 | -167/+10 |
|/ | |||||
* | Also clean up generated Cython files during `make clean` | Daniel M. Pelt | 2015-03-04 | 1 | -0/+2 |
| | |||||
* | Fix getConfiguration type for vec geometries | Willem Jan Palenstijn | 2015-03-03 | 2 | -2/+2 |
| | |||||
* | Merge pull request #25 from dmpelt/python-get-geometry | Willem Jan Palenstijn | 2015-03-03 | 8 | -187/+181 |
|\ | | | | | Make Python get_geometry code match Matlab (after 03a9dd9) | ||||
| * | Make Python get_geometry code match Matlab (after ↵ | Daniel M. Pelt | 2015-03-03 | 8 | -187/+181 |
| | | | | | | | | 03a9dd972ada50eedb83386910cecf02fe8d0e35) | ||||
* | | Fix getConfiguration for vec geometries and non-square detectors | Willem Jan Palenstijn | 2015-03-03 | 2 | -6/+6 |
|/ | |||||
* | Merge pull request #24 from wjp/cuda_includes | Willem Jan Palenstijn | 2015-03-02 | 11 | -64/+151 |
|\ | | | | | Untangle cuda and astra includes | ||||
| * | Untangle cuda and astra includes | Willem Jan Palenstijn | 2015-03-02 | 11 | -64/+151 |
|/ | |||||
* | Merge pull request #23 from dmpelt/cython0.22-fix | Willem Jan Palenstijn | 2015-02-27 | 1 | -2/+1 |
|\ | | | | | Force Cython to use language level 2 to avoid error with Cython 0.22 and python3 | ||||
| * | Force Cython to use language level 2 to avoid error with Cython 0.22 and python3 | Daan Pelt | 2015-02-27 | 1 | -2/+1 |
|/ | |||||
* | Merge pull request #20 from wvaarle/matlab-get-geometry | Willem Jan Palenstijn | 2015-02-27 | 38 | -702/+724 |
|\ | | | | | 'get_geometry' functions in the matlab layer | ||||
| * | code cleanup | Wim van Aarle | 2015-02-26 | 12 | -519/+288 |
| | | |||||
| * | updated docs | Wim van Aarle | 2015-02-26 | 10 | -83/+19 |
| | | |||||
| * | get_geometry now uses XML config object (for projections) | Wim van Aarle | 2015-02-26 | 25 | -274/+328 |
| | | |||||
| * | get_geometry now uses XML config object (for volumes) | Wim van Aarle | 2015-02-25 | 12 | -39/+160 |
| | | |||||
| * | deleted tmp test file | Wim van Aarle | 2015-02-24 | 1 | -50/+0 |
| | | |||||
| * | re-enabled get_geometry for 3d projectors | Wim van Aarle | 2015-02-24 | 3 | -10/+10 |
| | | |||||
| * | added get_geometry for 3d projection data objects | Wim van Aarle | 2015-02-24 | 6 | -20/+141 |
| | | |||||
| * | fixed get_geometry for fanflat_vec | Wim van Aarle | 2015-02-24 | 3 | -35/+59 |
| | | |||||
| * | added get_geometry for 3d volume objects | Wim van Aarle | 2015-02-24 | 4 | -53/+100 |
| | | |||||
* | | Merge pull request #16 from dmpelt/python-interface | Willem Jan Palenstijn | 2015-02-26 | 155 | -9/+15448 |
|\ \ | | | | | | | Add Python interface | ||||
| * | | 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 | 21 | -179/+1081 |
| |\ \ | |/ / |/| | | |||||
* | | | Fix include order | Willem Jan Palenstijn | 2015-02-26 | 1 | -1/+1 |
| | | | |||||
* | | | 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 |
| | | | |