Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make Python get_geometry code match Matlab (after ↵ | Daniel M. Pelt | 2015-03-03 | 8 | -187/+181 |
| | | | | 03a9dd972ada50eedb83386910cecf02fe8d0e35) | ||||
* | 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 |
| | | | | |||||
| * | | | 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 |
| | |/ | |/| | |||||
* | | | Merge pull request #19 from wjp/osx-support | Willem Jan Palenstijn | 2015-02-25 | 6 | -62/+14 |
|\ \ \ | |/ / |/| | | Improve support for OS X | ||||
| * | | Moved pthreads defines to Globals.h | Daan Pelt | 2015-02-25 | 3 | -4/+9 |
| | | | |||||
| * | | Added libtool check for OSX | Daniel M. Pelt | 2015-02-25 | 1 | -2/+5 |
| | | | |||||
| * | | Remove CAsyncAlgorithm::timedJoin | Willem Jan Palenstijn | 2015-02-25 | 3 | -56/+0 |
|/ / | | | | | | | It is currently unused, and its current implementation is not very portable. | ||||
* | | Merge pull request #13 from astra-toolbox/matlab-data3d-logical | Willem Jan Palenstijn | 2015-02-24 | 5 | -23/+53 |
|\ \ | | | | | | | Added support for logical matrices in mex_data3d | ||||
| * | | Added support for logical matrices in mex_data3d | Wim van Aarle | 2015-02-24 | 5 | -23/+53 |
|/ / | | | | | | | | | Did not accelerate using sse2, as no intrinsics exist to convert 8-bit to 32-bit. | ||||
* | | fixed matlab DART implementation | Wim van Aarle | 2015-02-23 | 6 | -82/+885 |
| | | | | | | | | some files were missing, cleaned up the rest | ||||
* | | Updated Visual Studio 2012 project file | Wim van Aarle | 2015-02-23 | 1 | -2/+2 |
| | | | | | | | | removed freeimage.dll | ||||
* | | Check if we need librt for clock_gettime in configure script | Willem Jan Palenstijn | 2015-02-20 | 2 | -1/+30 |
| | | |||||
* | | added markdown readme file | Wim van Aarle | 2015-02-20 | 1 | -0/+82 |
| | | |||||
| * | Added Python interface | Daniel M. Pelt | 2015-02-24 | 154 | -9/+15404 |
|/ | |||||
* | Update version | Willem Jan Palenstijn | 2015-01-30 | 2 | -3/+3 |
| | |||||
* | Update NEWS | Willem Jan Palenstijn | 2015-01-30 | 1 | -3/+5 |
| | |||||
* | Sync DART version | Willem Jan Palenstijn | 2015-01-30 | 22 | -1303/+680 |
| | |||||
* | Store result of nvcc tests in config.log | Willem Jan Palenstijn | 2015-01-30 | 1 | -2/+23 |
| | |||||
* | Make astra_clear clear projector3d too | Willem Jan Palenstijn | 2015-01-30 | 1 | -0/+1 |
| | |||||
* | Greatly speed up CUDA par3d_bp | Willem Jan Palenstijn | 2015-01-29 | 1 | -53/+48 |
| | | | | These are the changes to cone_bp applied to par3d_bp. | ||||
* | Greatly speed up CUDA cone_bp | Willem Jan Palenstijn | 2015-01-29 | 1 | -99/+96 |
| | | | | | This improves speed by a factor of 10. Tested on Kepler. Joint with Jeroen Bédorf. | ||||
* | Update copyright to -2015 | Willem Jan Palenstijn | 2015-01-26 | 291 | -582/+582 |
| | |||||
* | Update copyright headers | Willem Jan Palenstijn | 2015-01-19 | 291 | -1575/+1593 |
| | |||||
* | Implement loading geometries into Projector3D | Willem Jan Palenstijn | 2014-12-08 | 4 | -18/+44 |
| | |||||
* | Remove unused stubs from mex_data3d | Willem Jan Palenstijn | 2014-12-05 | 1 | -430/+2 |
| | |||||
* | Remove unused files | Willem Jan Palenstijn | 2014-12-04 | 4 | -417/+0 |
| |