Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into parallel_vec | Willem Jan Palenstijn | 2016-10-07 | 1 | -6/+4 |
|\ | |||||
| * | Replace use of boost::split by own function | Willem Jan Palenstijn | 2016-07-28 | 1 | -6/+4 |
| | | |||||
* | | Merge branch 'master' into parvec | Willem Jan Palenstijn | 2016-07-28 | 23 | -273/+1245 |
|\| | |||||
| * | 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 | 14 | -212/+679 |
| | |\ | |||||
| | * | | 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 |
| | | | | |||||
| * | | | 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 | 14 | -209/+674 |
| |\ \ | | |/ | |/| | Remove dependency of libastra on libpython | ||||
| | * | Make copyright/license headers consistent with rest of astra | Willem Jan Palenstijn | 2016-02-02 | 14 | -210/+206 |
| | | | |||||
| | * | 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 | 3 | -5/+503 |
| | | | |||||
| * | | 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 |
| |/ | |||||
| * | 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 |
| | | |||||
| * | 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 |
| | | |||||
| * | 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 | 6 | -2/+226 |
| |\ \ | | |/ | |/| | 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 | 7 | -14/+45 |
| | |\ | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | Also allow tuples to be passed in a config dict | Daniel M. Pelt | 2015-07-23 | 1 | -2/+2 |
| | | | | |||||
| | * | | Show more useful information when a plugin raises an exception | Daniel M. Pelt | 2015-07-23 | 1 | -4/+5 |
| | | | | |||||
| | * | | Allow plugins without keywords | Daniel M. Pelt | 2015-07-23 | 1 | -1/+4 |
| | | | | |||||
| | * | | Log error when running Python plugin algorithm | Daniel M. Pelt | 2015-07-23 | 1 | -0/+7 |
| | | | | |||||
| | * | | Fix passing a python list as option | Daniel M. Pelt | 2015-07-23 | 1 | -0/+2 |
| | | | | |||||
| | * | | Better way of passing options to Python plugin using inspect | Daniel M. Pelt | 2015-07-23 | 1 | -12/+12 |
| | | | | |||||
| | * | | Add support for Python algorithm plugins | Daniel M. Pelt | 2015-07-23 | 4 | -67/+160 |
| | | | | |||||
| * | | | Let astra_create_vol_geom also generate flexible volume geometries | Willem Jan Palenstijn | 2015-09-25 | 1 | -0/+15 |
| | |/ | |/| | |||||
| * | | Release the gil in algorithm.run | Daniel M. Pelt | 2015-08-10 | 2 | -2/+4 |
| | | | |||||
| * | | Define a transpose for the OpTomo transpose as well | Daniel M. Pelt | 2015-07-30 | 1 | -0/+8 |
| | | | | | | | | | | | | Allows for chaining .T calls. | ||||
| * | | Fix Python OpTomo for scipy 0.16 | Daniel M. Pelt | 2015-07-30 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | scipy 0.16 also uses .T to define a transpose, which conflicts with the old OpTomo implementation. OpTomo now also defines the _transpose() method, which .T will call in scipy 0.16. | ||||
| * | | Fix formatting when passing strings to log from high-level code | Daniel M. Pelt | 2015-07-17 | 1 | -4/+4 |
| | | | |||||
| * | | Fix memory leak in configuration code | Daniel M. Pelt | 2015-06-25 | 2 | -4/+16 |
| | | | |||||
| * | | Fix config to struct/dict translation for array options | Daniel M. Pelt | 2015-06-24 | 1 | -1/+4 |
| | | |