Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Separate C++ and python builds & make conda work nicely | Holger Kohr | 2016-11-25 | 5 | -80/+88 |
| | | | | | | | | | | | | - make builder (= advanced user or us ourselves) choose compilers and CUDA - add a check for the C++11 flag for nvcc to work around the infamous boost bug if necessary - use conda boost to build the C++ library - simplify python bindings conda recipe to only build the bindings; the C++ library is now a build and runtime dependency - add runtime dependencies to python bindings recipe - some small adjustments to builder.py | ||||
* | Fix conda build.sh | Willem Jan Palenstijn | 2016-11-23 | 1 | -1/+1 |
| | |||||
* | Overhaul package installation | Willem Jan Palenstijn | 2016-11-21 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | There are now three ways of installing from configure/make: ./configure --with-install-type=prefix (default) libraries go into @libdir@ matlab tools/mex go into @datadir@/astra/matlab octave tools/mex go into @datadir@/astra/octave python module goes into site-packages ./configure --with-install-type=dir libraries go into @prefix@/lib matlab tools/mex go into @prefix@/matlab octave tools/mex go into @prefix@/octave python module goes into @prefix@/python ./configure --with-install-type=module matlab tools/mex go into @prefix@/matlab octave tools/mex go into @prefix@/octave python module goes into site-packages library is installed along with the matlab/octave/python module(s), with rpath | ||||
* | Update python package name from PyASTRAToolbox to astra-toolbox | Willem Jan Palenstijn | 2016-11-21 | 1 | -1/+1 |
| | |||||
* | Add CGLS plugin | Willem Jan Palenstijn | 2016-11-18 | 2 | -0/+100 |
| | |||||
* | Add SIRT plugin | Willem Jan Palenstijn | 2016-11-18 | 4 | -1/+120 |
| | |||||
* | Fix Python create_projector docstring | Willem Jan Palenstijn | 2016-10-19 | 1 | -1/+1 |
| | |||||
* | Replace use of boost::split by own function | Willem Jan Palenstijn | 2016-07-28 | 1 | -6/+4 |
| | |||||
* | Merge pull request #47 from wjp/OpTomo_out | Willem Jan Palenstijn | 2016-04-26 | 1 | -30/+66 |
|\ | | | | | Give OpTomo FP/BP functions with optional out argument | ||||
| * | Give OpTomo FP/BP functions with optional out argument | Willem Jan Palenstijn | 2016-04-25 | 1 | -30/+66 |
| | | | | | | | | This allows more efficient use of allocated arrays. | ||||
* | | Merge pull request #46 from dmpelt/python_cxx | Willem Jan Palenstijn | 2016-04-25 | 1 | -0/+2 |
|\ \ | | | | | | | Use CXX for Python compilation as well | ||||
| * | | Use CXX for Python compilation as well | Daniel M. Pelt | 2016-04-19 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #50 from wjp/data3d_dimensions | Willem Jan Palenstijn | 2016-04-25 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Reverse output of astra.data3d.dimensions | ||||
| * | | Reverse output of astra.data3d.dimensions | Willem Jan Palenstijn | 2016-04-25 | 1 | -1/+1 |
| |/ | | | | | | | | | | | This makes the output directly usable in numpy commands like zeros, reshape. We were not using data3d.dimensions ourselves, as far as I can tell. | ||||
* / | Change flatten to ravel in Python code | Daniel M. Pelt | 2016-04-25 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #29 from wjp/indexmanager | Willem Jan Palenstijn | 2016-04-15 | 3 | -2/+86 |
|\ | | | | | Add an AstraIndexManager | ||||
| * | Merge branch 'master' into indexmanager | Willem Jan Palenstijn | 2016-03-01 | 15 | -230/+701 |
| |\ | |||||
| * | | Add python astra.astra delete/info based on index manager | Willem Jan Palenstijn | 2016-02-17 | 3 | -2/+88 |
| | | | |||||
* | | | Encode Python bool as int in XML instead of str | Daniel M. Pelt | 2016-03-04 | 1 | -4/+8 |
| | | | |||||
* | | | Remove with-python from libastra conda build | 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 |
| | | | |||||
* | | | Fix small Python errors | Daniel M. Pelt | 2016-03-02 | 3 | -3/+5 |
| |/ |/| | |||||
* | | 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 | 15 | -227/+696 |
|\ \ | |/ |/| | 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 | 1 | -32/+0 |
| | | |||||
| * | Decrement refcount of CallMethod return value | Willem Jan Palenstijn | 2016-01-27 | 1 | -1/+4 |
| | | |||||
| * | Fix whitespace | Willem Jan Palenstijn | 2016-01-21 | 1 | -1/+1 |
| | | |||||
| * | Remove dependency of libastra on libpython by refactoring PluginAlgorithm | Willem Jan Palenstijn | 2016-01-21 | 4 | -5/+507 |
| | | |||||
* | | Merge pull request #107 from wjp/multi | Willem Jan Palenstijn | 2016-02-02 | 3 | -9/+24 |
|\ \ | |/ |/| | Add multi-GPU support to CompositeGeometryManager | ||||
| * | 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 check for scipy | Willem Jan Palenstijn | 2016-01-20 | 1 | -0/+1 |
|/ | | | | The module matrix_c.pyx uses it. | ||||
* | Merge pull request #108 from dmpelt/readthedocs | Willem Jan Palenstijn | 2016-01-19 | 88 | -9950/+0 |
|\ | | | | | Move documentation to readthedocs | ||||
| * | Remove existing outdated Python API reference documentation | Daniel M. Pelt | 2016-01-19 | 88 | -9950/+0 |
| | | |||||
* | | Fix experimental.pyx for non-CUDA compilation | Daniel M. Pelt | 2016-01-19 | 1 | -47/+49 |
| | | |||||
* | | Update credits | Willem Jan Palenstijn | 2016-01-05 | 1 | -15/+13 |
|/ | |||||
* | Update version to 1.7.1 | Willem Jan Palenstijn | 2015-12-23 | 3 | -5/+5 |
| | |||||
* | Fix origin_det name in create_proj_geom docs | Willem Jan Palenstijn | 2015-12-16 | 1 | -7/+7 |
| | |||||
* | Use less ambiguous letters for create_vol_geom docs | Willem Jan Palenstijn | 2015-12-10 | 1 | -12/+12 |
| | |||||
* | Update version to 1.7 | Willem Jan Palenstijn | 2015-12-04 | 3 | -5/+5 |
| | |||||
* | Add conda build scripts | Daniel M. Pelt | 2015-12-04 | 2 | -0/+56 |
| | |||||
* | Merge pull request #101 from wjp/composite | Willem Jan Palenstijn | 2015-12-04 | 2 | -0/+86 |
|\ | | | | | Add CompositeGeometryManager | ||||
| * | Add sample for experimental composite geometry code | Willem Jan Palenstijn | 2015-12-04 | 2 | -0/+86 |
| | | |||||
* | | Merge pull request #73 from dmpelt/python-plugins | Willem Jan Palenstijn | 2015-12-04 | 8 | -2/+235 |
|\ \ | |/ |/| | Add support for Python algorithm plugins | ||||
| * | Reduce dependency of python code on libastra | Willem Jan Palenstijn | 2015-12-04 | 1 | -5/+77 |
| | | |||||
| * | Merge branch 'master' into python-plugins | Willem Jan Palenstijn | 2015-12-01 | 8 | -16/+47 |
| |\ | | | | | | | | | | | | | Conflicts: python/astra/utils.pyx | ||||
| * | | Also use ProjectorId in ReconstructionAlgorithm3D plugin base | Daniel M. Pelt | 2015-07-23 | 1 | -0/+1 |
| | | | |||||
| * | | Add ReconstructionAlgorithm2D/3D classes for plugins (matching C++ classes) | Daniel M. Pelt | 2015-07-23 | 3 | -1/+55 |
| | | | |||||
| * | | Allow registering plugins without explicit name, and fix exception handling ↵ | Daniel M. Pelt | 2015-07-23 | 2 | -45/+40 |
| | | | | | | | | | | | | when running in Matlab |