summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Homogenize styleWillem Jan Palenstijn2017-09-151-31/+11
* Fix boundary issues in par_lineWillem Jan Palenstijn2017-09-151-14/+14
* Merge branch 'master' into parallel_vecWillem Jan Palenstijn2017-09-15476-15063/+5292
|\
| * Add macOS noteWillem Jan Palenstijn2017-09-081-1/+3
| * Merge pull request #108 from wjp/travisWillem Jan Palenstijn2017-05-231-12/+32
| |\
| | * Travis: only install cuda packages for cuda buildsWillem Jan Palenstijn2017-05-231-11/+31
| | * Travis: Update python version to 3.6Willem Jan Palenstijn2017-05-231-2/+2
| |/
| * Fix misleading indentationWillem Jan Palenstijn2017-05-221-2/+2
| * Fix build without CUDAWillem Jan Palenstijn2017-05-222-0/+8
| * Fix conda buildWillem Jan Palenstijn2017-03-291-0/+1
| * Update create_projector docstringWillem Jan Palenstijn2017-03-291-1/+2
| * Python: added options for projector creation, like for the matlab interfaceNicola VIGANO2017-03-291-1/+4
| * Fix compile errorWillem Jan Palenstijn2017-03-271-1/+1
| * Merge branch 'macOS'Willem Jan Palenstijn2017-03-2012-39/+86
| |\
| | * Add basic macOS/homebrew build instructionsWillem Jan Palenstijn2017-03-202-0/+28
| | * Set stdlib to libstdc++ on macOS consistentlyWillem Jan Palenstijn2017-03-202-4/+8
| | * Use @loader_path to make mex files find libastra.0.dylib in cwdWillem Jan Palenstijn2017-03-201-0/+6
| | * Disable openmp on macOSWillem Jan Palenstijn2017-03-202-0/+6
| | * Use standard _OPENMP directive for checking openmpWillem Jan Palenstijn2017-03-201-4/+2
| | * Move conda astra-toolbox package files to own subdirectoryWillem Jan Palenstijn2017-03-204-12/+12
| | * Add autotools and boost to macOS conda libastra dependenciesWillem Jan Palenstijn2017-03-201-0/+4
| | * Silence errors from nvcc test runWillem Jan Palenstijn2017-03-201-1/+1
| | * Change lib/lib64 logicWillem Jan Palenstijn2017-03-202-15/+13
| | * Fix conda boost include flagsWillem Jan Palenstijn2017-03-201-1/+1
| | * Use true instead of /bin/trueWillem Jan Palenstijn2017-03-201-1/+1
| | * Let autogen.sh use either glibtoolize or libtoolize on macOSWillem Jan Palenstijn2017-03-201-2/+5
| |/
| * Fix python buildWillem Jan Palenstijn2017-03-011-1/+1
| * Add np112 to conda build scriptWillem Jan Palenstijn2017-02-241-0/+3
| * Fix cuda3d geometry memory leaksWillem Jan Palenstijn2017-02-172-5/+47
| * Remove using namespace astra; from headersWillem Jan Palenstijn2017-02-166-66/+57
| * Remove using namespace std; from headersWillem Jan Palenstijn2017-02-1629-74/+70
| * Fix FDK shortscan weightingWillem Jan Palenstijn2017-02-141-14/+7
| * Merge pull request #93 from wjp/GPULinkWillem Jan Palenstijn2017-02-0946-1370/+1328
| |\
| | * Remove tabs from python codeWillem Jan Palenstijn2017-02-083-202/+202
| | * Improve data2d/data3d error messagesWillem Jan Palenstijn2017-02-083-61/+70
| | * Make typechecks in data3d.create more robustWillem Jan Palenstijn2017-02-081-10/+18
| | * Update commentsWillem Jan Palenstijn2017-02-086-30/+27
| | * Add pygpu sample scriptWillem Jan Palenstijn2017-02-081-0/+72
| | * Fix warningsWillem Jan Palenstijn2017-02-081-8/+9
| | * Start work on CFloat32Data3DGPU to allow persistent/external GPU memoryWillem Jan Palenstijn2017-02-0830-139/+990
| | * Make python -sinocone a synonym of -sino.Willem Jan Palenstijn2017-02-082-14/+2
| | * Remove unused 3d global min/maxWillem Jan Palenstijn2017-02-087-112/+2
| | * Remove unused data3d functionsWillem Jan Palenstijn2017-02-088-847/+0
| | * Remove unused functionWillem Jan Palenstijn2017-02-082-12/+1
| |/
| * Clean up symlink after failed python buildWillem Jan Palenstijn2017-02-081-1/+1
| * Fix warningWillem Jan Palenstijn2017-01-241-2/+2
| * Add small portability comment about CUDA 5.5Willem Jan Palenstijn2017-01-191-0/+1
| * Avoid 'echo -e' for improved sh portabilityWillem Jan Palenstijn2017-01-191-1/+1
| * Fix warningsWillem Jan Palenstijn2017-01-171-5/+5
| * Fix copy/paste mistake.Willem Jan Palenstijn2017-01-171-4/+0