Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix Windows build | Willem Jan Palenstijn | 2016-03-08 | 1 | -10/+10 |
| | |||||
* | Remove outdated cuda paths | Willem Jan Palenstijn | 2016-03-03 | 1 | -2/+2 |
| | |||||
* | Merge pull request #32 from dmpelt/split-conda | Willem Jan Palenstijn | 2016-03-03 | 5 | -13/+43 |
|\ | | | | | Split conda package into c++ lib and python parts | ||||
| * | Remove with-python from libastra conda build | Daniel M. Pelt | 2016-03-03 | 1 | -1/+1 |
| | | |||||
| * | Include PluginAlgorithm in non-Python builds as well | Daniel M. Pelt | 2016-03-03 | 1 | -1/+1 |
| | | |||||
| * | Split conda package into c++ lib and python parts | Daniel M. Pelt | 2016-03-03 | 4 | -12/+42 |
| | | |||||
* | | Merge pull request #33 from wjp/travis-test | Willem Jan Palenstijn | 2016-03-03 | 2 | -5/+9 |
|\ \ | |/ |/| | Use travis-ci's apt packages for cuda | ||||
| * | Use travis-ci's apt packages for cuda | Willem Jan Palenstijn | 2016-03-03 | 1 | -3/+5 |
| | | |||||
| * | Revert "Use nvcc's -MT option" | Willem Jan Palenstijn | 2016-03-03 | 1 | -2/+4 |
| | | | | | | | | | | | | This reverts commit 29c5c86e56697286a92031aaa9fdd903b3bcc426. This fixes building with CUDA 5.5. | ||||
* | | Merge pull request #31 from dmpelt/small-fixes | Willem Jan Palenstijn | 2016-03-02 | 3 | -3/+5 |
|\ \ | |/ |/| | Fix small Python errors | ||||
| * | Fix small Python errors | Daniel M. Pelt | 2016-03-02 | 3 | -3/+5 |
|/ | |||||
* | Fix build | Willem Jan Palenstijn | 2016-03-01 | 1 | -6/+6 |
| | |||||
* | Merge pull request #28 from dmpelt/travis-ci | Willem Jan Palenstijn | 2016-03-01 | 1 | -0/+43 |
|\ | | | | | Add Travis CI configuration file | ||||
| * | Add Travis CI configuration file | Daniel M. Pelt | 2016-03-01 | 1 | -0/+43 |
| | | |||||
* | | Disable astra.set_gpu_index when building without CUDA | Willem Jan Palenstijn | 2016-02-29 | 1 | -1/+5 |
| | | |||||
* | | Merge pull request #111 from wjp/pluginbuild | Willem Jan Palenstijn | 2016-02-22 | 21 | -648/+814 |
|\ \ | | | | | | | Remove dependency of libastra on libpython | ||||
| * | | Make copyright/license headers consistent with rest of astra | Willem Jan Palenstijn | 2016-02-02 | 15 | -228/+224 |
| | | | |||||
| * | | Move fixLapackLoading to astra_mex_plugin | Willem Jan Palenstijn | 2016-01-27 | 2 | -32/+33 |
| | | | |||||
| * | | Decrement refcount of CallMethod return value | Willem Jan Palenstijn | 2016-01-27 | 1 | -1/+4 |
| | | | |||||
| * | | Use Py_XDECREF to guard against null | Willem Jan Palenstijn | 2016-01-27 | 1 | -1/+1 |
| | | | |||||
| * | | Add missing .PHONY targets | Willem Jan Palenstijn | 2016-01-21 | 1 | -1/+1 |
| | | | |||||
| * | | Initialize Python plugins when available in Matlab | Willem Jan Palenstijn | 2016-01-21 | 3 | -1/+42 |
| | | | |||||
| * | | Fix whitespace | Willem Jan Palenstijn | 2016-01-21 | 2 | -7/+7 |
| | | | |||||
| * | | Remove dependency of libastra on libpython by refactoring PluginAlgorithm | Willem Jan Palenstijn | 2016-01-21 | 9 | -419/+544 |
| | | | |||||
* | | | Query max texture size instead of hardcoding it | Willem Jan Palenstijn | 2016-02-16 | 3 | -6/+26 |
| | | | |||||
* | | | Merge pull request #113 from wjp/splitXY | Willem Jan Palenstijn | 2016-02-16 | 2 | -25/+257 |
|\ \ \ | | | | | | | | | Also split volumes in X/Y directions to respect CUDA limits | ||||
| * | | | Avoid (unlikely) integer overflow | Willem Jan Palenstijn | 2016-02-15 | 1 | -1/+5 |
| | | | | |||||
| * | | | Skip some unnecessary splitting | Willem Jan Palenstijn | 2016-02-15 | 1 | -5/+8 |
| | | | | |||||
| * | | | Also split volumes in X/Y directions to respect CUDA limits | Willem Jan Palenstijn | 2016-02-15 | 2 | -24/+249 |
|/ / / | |||||
* | | | Update gen.py to work on more python versions | Willem Jan Palenstijn | 2016-02-10 | 1 | -1/+6 |
| | | | |||||
* | | | Refactor FP and BP jobs creation in the composite geometry manager | Nicola Vigano | 2016-02-10 | 2 | -14/+32 |
| | | | |||||
* | | | Merge pull request #107 from wjp/multi | Willem Jan Palenstijn | 2016-02-02 | 11 | -152/+518 |
|\ \ \ | |/ / |/| | | Add multi-GPU support to CompositeGeometryManager | ||||
| * | | Add multi-GPU sample | Willem Jan Palenstijn | 2016-01-19 | 2 | -0/+95 |
| | | | |||||
| * | | Rename sample with conflicting filename | Willem Jan Palenstijn | 2016-01-19 | 1 | -0/+0 |
| | | | |||||
| * | | Allow multiple GPUs in ASTRA_GPU_INDEX envvar | Willem Jan Palenstijn | 2016-01-19 | 1 | -4/+4 |
| | | | |||||
| * | | Change python set_gpu_index to match | Willem Jan Palenstijn | 2016-01-19 | 2 | -5/+20 |
| | | | |||||
| * | | Add multi-GPU support to CompositeGeometryManager | Willem Jan Palenstijn | 2016-01-19 | 4 | -119/+378 |
| | | | |||||
| * | | Remove noisy debugging output | Willem Jan Palenstijn | 2016-01-19 | 1 | -3/+0 |
| | | | |||||
| * | | Fix whitespace | Willem Jan Palenstijn | 2016-01-19 | 1 | -21/+21 |
| |/ | |||||
* | | Merge pull request #110 from wjp/build | Willem Jan Palenstijn | 2016-01-21 | 4 | -40/+76 |
|\ \ | |/ |/| | Build system improvements | ||||
| * | Fix VPATH problem with older autoconf versions | Willem Jan Palenstijn | 2016-01-21 | 2 | -1/+7 |
| | | |||||
| * | Fix file permissions | Willem Jan Palenstijn | 2016-01-21 | 1 | -0/+0 |
| | | |||||
| * | Don't build cuda non-PIC object if static libs are disabled | Willem Jan Palenstijn | 2016-01-20 | 1 | -2/+10 |
| | | | | | | | | | | This significantly speeds up builds since we usually pass disable-static to libtool. | ||||
| * | Try to improve nvcc dependency file generation | Willem Jan Palenstijn | 2016-01-20 | 1 | -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 option | Willem Jan Palenstijn | 2016-01-20 | 1 | -4/+2 |
| | | |||||
| * | Avoid incorrect include dirs when building python modules | Willem Jan Palenstijn | 2016-01-20 | 1 | -2/+5 |
| | | |||||
| * | Add check for scipy | Willem Jan Palenstijn | 2016-01-20 | 2 | -0/+8 |
| | | | | | | | | The module matrix_c.pyx uses it. | ||||
| * | Fail when python six module is not found | Willem Jan Palenstijn | 2016-01-20 | 1 | -1/+1 |
| | | |||||
| * | Place Python build/temporary files in build directory | Willem Jan Palenstijn | 2016-01-20 | 1 | -9/+12 |
| | | | | | | | | This also allows out-of-tree builds for Python. | ||||
| * | Allow out-of-tree builds | Willem Jan Palenstijn | 2016-01-20 | 1 | -30/+37 |
|/ |