summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #108 from wjp/travisWillem Jan Palenstijn2017-05-231-12/+32
|\ | | | | Travis: only install cuda packages for cuda builds
| * Travis: only install cuda packages for cuda buildsWillem Jan Palenstijn2017-05-231-11/+31
| | | | | | | | | | This way non-cuda build failures caused by missing cuda header files will be detected.
| * Travis: Update python version to 3.6Willem Jan Palenstijn2017-05-231-2/+2
|/ | | | | Effectively it was already running 3.6 anyway, since we are using Miniconda-latest.
* 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
| | | | Signed-off-by: Nicola VIGANO <N.R.Vigano@cwi.nl>
* 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
| | | | | | | | | | Recent versions of conda-build (2.1.1 at least) seem to automatically build packages in subdirectories (after the main directory).
| * 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
| | | | | | | | macOS CUDA uses lib even on 64 bit
| * Fix conda boost include flagsWillem Jan Palenstijn2017-03-201-1/+1
| |
| * Use true instead of /bin/trueWillem Jan Palenstijn2017-03-201-1/+1
| | | | | | | | It's in /usr/bin/ on macOS.
| * Let autogen.sh use either glibtoolize or libtoolize on macOSWillem Jan Palenstijn2017-03-201-2/+5
|/ | | | This is necessary since conda's libtool installs libtoolize on macOS.
* 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
| | | | | It was computing weights for angles in [0,2pi) but using them on angles in (-2pi,0].
* Merge pull request #93 from wjp/GPULinkWillem Jan Palenstijn2017-02-0946-1370/+1328
|\ | | | | GPULink support
| * 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
| | | | | | | | The matlab interface already behaves like this.
| * 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
| | | | This fixes the CUDA .d file fixup for macOS.
* Fix warningsWillem Jan Palenstijn2017-01-171-5/+5
|
* Fix copy/paste mistake.Willem Jan Palenstijn2017-01-171-4/+0
| | | | Thanks @adler-j.
* Add conda install instructions to READMEWillem Jan Palenstijn2017-01-172-0/+28
|
* Fix VolumeGeometry class name in error messagesWillem Jan Palenstijn2017-01-122-5/+5
|
* Build conda packages for linux-64/np111/py36Willem Jan Palenstijn2017-01-021-0/+1
|
* Mention VS redistributableWillem Jan Palenstijn2016-12-092-4/+9
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 01:56:29 +0000