Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix spaces/tabs | Willem Jan Palenstijn | 2017-09-19 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' into parallel_vec | Willem Jan Palenstijn | 2017-09-15 | 57 | -876/+1301 |
|\ | |||||
| * | Fix conda build | Willem Jan Palenstijn | 2017-03-29 | 1 | -0/+1 |
| | | |||||
| * | Update create_projector docstring | Willem Jan Palenstijn | 2017-03-29 | 1 | -1/+2 |
| | | |||||
| * | Python: added options for projector creation, like for the matlab interface | Nicola VIGANO | 2017-03-29 | 1 | -1/+4 |
| | | | | | | | | Signed-off-by: Nicola VIGANO <N.R.Vigano@cwi.nl> | ||||
| * | Move conda astra-toolbox package files to own subdirectory | Willem Jan Palenstijn | 2017-03-20 | 4 | -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 dependencies | Willem Jan Palenstijn | 2017-03-20 | 1 | -0/+4 |
| | | |||||
| * | Silence errors from nvcc test run | Willem Jan Palenstijn | 2017-03-20 | 1 | -1/+1 |
| | | |||||
| * | Change lib/lib64 logic | Willem Jan Palenstijn | 2017-03-20 | 1 | -7/+12 |
| | | | | | | | | macOS CUDA uses lib even on 64 bit | ||||
| * | Fix conda boost include flags | Willem Jan Palenstijn | 2017-03-20 | 1 | -1/+1 |
| | | |||||
| * | Use true instead of /bin/true | Willem Jan Palenstijn | 2017-03-20 | 1 | -1/+1 |
| | | | | | | | | It's in /usr/bin/ on macOS. | ||||
| * | Fix python build | Willem Jan Palenstijn | 2017-03-01 | 1 | -1/+1 |
| | | |||||
| * | Add np112 to conda build script | Willem Jan Palenstijn | 2017-02-24 | 1 | -0/+3 |
| | | |||||
| * | Remove tabs from python code | Willem Jan Palenstijn | 2017-02-08 | 3 | -202/+202 |
| | | |||||
| * | Improve data2d/data3d error messages | Willem Jan Palenstijn | 2017-02-08 | 3 | -61/+70 |
| | | |||||
| * | Make typechecks in data3d.create more robust | Willem Jan Palenstijn | 2017-02-08 | 1 | -10/+18 |
| | | |||||
| * | Start work on CFloat32Data3DGPU to allow persistent/external GPU memory | Willem Jan Palenstijn | 2017-02-08 | 5 | -38/+113 |
| | | |||||
| * | Make python -sinocone a synonym of -sino. | Willem Jan Palenstijn | 2017-02-08 | 1 | -13/+1 |
| | | | | | | | | The matlab interface already behaves like this. | ||||
| * | Remove unused 3d global min/max | Willem Jan Palenstijn | 2017-02-08 | 1 | -1/+0 |
| | | |||||
| * | Build conda packages for linux-64/np111/py36 | Willem Jan Palenstijn | 2017-01-02 | 1 | -0/+1 |
| | | |||||
| * | Use external boost for conda/win-64 | Willem Jan Palenstijn | 2016-12-09 | 4 | -17/+13 |
| | | | | | | | | This enables py27 conda packages for win-64. | ||||
| * | Build conda packages for multiple conda versions | Willem Jan Palenstijn | 2016-12-09 | 2 | -4/+10 |
| | | |||||
| * | Use specific numpy version in conda package | Daniel M. Pelt | 2016-12-08 | 1 | -1/+1 |
| | | |||||
| * | Update version to 1.8 | Willem Jan Palenstijn | 2016-12-05 | 4 | -10/+8 |
| | | |||||
| * | Update versions for 1.8rc1 conda package | Willem Jan Palenstijn | 2016-12-02 | 2 | -3/+3 |
| | | |||||
| * | Add astra.__version__ (PEP396) | Willem Jan Palenstijn | 2016-12-01 | 5 | -22/+4 |
| | | |||||
| * | Add conda build scripts for win-64/py35 | Willem Jan Palenstijn | 2016-12-01 | 4 | -6/+79 |
| | | |||||
| * | Add scripts for building conda packages using Docker | Willem Jan Palenstijn | 2016-12-01 | 4 | -0/+44 |
| | | |||||
| * | Update python headers | Willem Jan Palenstijn | 2016-11-28 | 46 | -495/+488 |
| | | |||||
| * | 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 |
| | | |||||
* | | 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 | 115 | -10233/+1361 |
|\| | |||||
| * | 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 |
| | | | |