summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move CUDA algorithm initialization to its own functionWillem Jan Palenstijn2016-03-234-33/+31
|
* Fix Windows buildWillem Jan Palenstijn2016-03-081-10/+10
|
* Remove outdated cuda pathsWillem Jan Palenstijn2016-03-031-2/+2
|
* Merge pull request #32 from dmpelt/split-condaWillem Jan Palenstijn2016-03-035-13/+43
|\ | | | | Split conda package into c++ lib and python parts
| * Remove with-python from libastra conda buildDaniel M. Pelt2016-03-031-1/+1
| |
| * Include PluginAlgorithm in non-Python builds as wellDaniel M. Pelt2016-03-031-1/+1
| |
| * Split conda package into c++ lib and python partsDaniel M. Pelt2016-03-034-12/+42
| |
* | Merge pull request #33 from wjp/travis-testWillem Jan Palenstijn2016-03-032-5/+9
|\ \ | |/ |/| Use travis-ci's apt packages for cuda
| * Use travis-ci's apt packages for cudaWillem Jan Palenstijn2016-03-031-3/+5
| |
| * Revert "Use nvcc's -MT option"Willem Jan Palenstijn2016-03-031-2/+4
| | | | | | | | | | | | This reverts commit 29c5c86e56697286a92031aaa9fdd903b3bcc426. This fixes building with CUDA 5.5.
* | Merge pull request #31 from dmpelt/small-fixesWillem Jan Palenstijn2016-03-023-3/+5
|\ \ | |/ |/| Fix small Python errors
| * Fix small Python errorsDaniel M. Pelt2016-03-023-3/+5
|/
* Fix buildWillem Jan Palenstijn2016-03-011-6/+6
|
* Merge pull request #28 from dmpelt/travis-ciWillem Jan Palenstijn2016-03-011-0/+43
|\ | | | | Add Travis CI configuration file
| * Add Travis CI configuration fileDaniel M. Pelt2016-03-011-0/+43
| |
* | Disable astra.set_gpu_index when building without CUDAWillem Jan Palenstijn2016-02-291-1/+5
| |
* | Merge pull request #111 from wjp/pluginbuildWillem Jan Palenstijn2016-02-2221-648/+814
|\ \ | | | | | | Remove dependency of libastra on libpython
| * | Make copyright/license headers consistent with rest of astraWillem Jan Palenstijn2016-02-0215-228/+224
| | |
| * | Move fixLapackLoading to astra_mex_pluginWillem Jan Palenstijn2016-01-272-32/+33
| | |
| * | Decrement refcount of CallMethod return valueWillem Jan Palenstijn2016-01-271-1/+4
| | |
| * | Use Py_XDECREF to guard against nullWillem Jan Palenstijn2016-01-271-1/+1
| | |
| * | Add missing .PHONY targetsWillem Jan Palenstijn2016-01-211-1/+1
| | |
| * | Initialize Python plugins when available in MatlabWillem Jan Palenstijn2016-01-213-1/+42
| | |
| * | Fix whitespaceWillem Jan Palenstijn2016-01-212-7/+7
| | |
| * | Remove dependency of libastra on libpython by refactoring PluginAlgorithmWillem Jan Palenstijn2016-01-219-419/+544
| | |
* | | Query max texture size instead of hardcoding itWillem Jan Palenstijn2016-02-163-6/+26
| | |
* | | Merge pull request #113 from wjp/splitXYWillem Jan Palenstijn2016-02-162-25/+257
|\ \ \ | | | | | | | | Also split volumes in X/Y directions to respect CUDA limits
| * | | Avoid (unlikely) integer overflowWillem Jan Palenstijn2016-02-151-1/+5
| | | |
| * | | Skip some unnecessary splittingWillem Jan Palenstijn2016-02-151-5/+8
| | | |
| * | | Also split volumes in X/Y directions to respect CUDA limitsWillem Jan Palenstijn2016-02-152-24/+249
|/ / /
* | | Update gen.py to work on more python versionsWillem Jan Palenstijn2016-02-101-1/+6
| | |
* | | Refactor FP and BP jobs creation in the composite geometry managerNicola Vigano2016-02-102-14/+32
| | |
* | | Merge pull request #107 from wjp/multiWillem Jan Palenstijn2016-02-0211-152/+518
|\ \ \ | |/ / |/| | Add multi-GPU support to CompositeGeometryManager
| * | Add multi-GPU sampleWillem Jan Palenstijn2016-01-192-0/+95
| | |
| * | Rename sample with conflicting filenameWillem Jan Palenstijn2016-01-191-0/+0
| | |
| * | Allow multiple GPUs in ASTRA_GPU_INDEX envvarWillem Jan Palenstijn2016-01-191-4/+4
| | |
| * | Change python set_gpu_index to matchWillem Jan Palenstijn2016-01-192-5/+20
| | |
| * | Add multi-GPU support to CompositeGeometryManagerWillem Jan Palenstijn2016-01-194-119/+378
| | |
| * | Remove noisy debugging outputWillem Jan Palenstijn2016-01-191-3/+0
| | |
| * | Fix whitespaceWillem Jan Palenstijn2016-01-191-21/+21
| |/
* | Merge pull request #110 from wjp/buildWillem Jan Palenstijn2016-01-214-40/+76
|\ \ | |/ |/| Build system improvements
| * Fix VPATH problem with older autoconf versionsWillem Jan Palenstijn2016-01-212-1/+7
| |
| * Fix file permissionsWillem Jan Palenstijn2016-01-211-0/+0
| |
| * Don't build cuda non-PIC object if static libs are disabledWillem Jan Palenstijn2016-01-201-2/+10
| | | | | | | | | | This significantly speeds up builds since we usually pass disable-static to libtool.
| * Try to improve nvcc dependency file generationWillem Jan Palenstijn2016-01-201-0/+3
| | | | | | | | | | | | We now append empty targets for all dependencies listed in the .d file generated by nvcc. This mimics the behaviour of gcc's -MP option, and prevents deleted header files from breaking the build.
| * Use nvcc's -MT optionWillem Jan Palenstijn2016-01-201-4/+2
| |
| * Avoid incorrect include dirs when building python modulesWillem Jan Palenstijn2016-01-201-2/+5
| |
| * Add check for scipyWillem Jan Palenstijn2016-01-202-0/+8
| | | | | | | | The module matrix_c.pyx uses it.
| * Fail when python six module is not foundWillem Jan Palenstijn2016-01-201-1/+1
| |
| * Place Python build/temporary files in build directoryWillem Jan Palenstijn2016-01-201-9/+12
| | | | | | | | This also allows out-of-tree builds for Python.