summaryrefslogtreecommitdiffstats
path: root/python
Commit message (Collapse)AuthorAgeFilesLines
* Increment version to 1.9.9devWillem Jan Palenstijn2019-09-274-6/+6
|
* Use conda compiler toolchain for conda buildsAllard Hendriksen2019-09-209-29/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For both libastra and astra-toolbox: 1) We do not use script_env to set CC/CXX anymore, since the compilers are installed by conda. 2) The build string is made useful by including either the python+numpy version or the cudatoolkit version that the package was built with. 3) Some clean-up of build.sh in buildenv/ For libastra: 1) The libastra.so is built with the conda C/C++ compiler toolchain. This has two benefits: 1) The rpath of libastra.so is set to $ORIGIN, which makes linking easier for dependent packages. 2) libastra.so is linkable against ancient versions of glibc. With old versions of memcpy. 2) The C/C++ compiler version is fixed to 5.4.0 3) In libastra/build.sh, we rename $CONDA_PREFIX to $PREFIX. Apparently, this is how it is supposed to be done. For me, $CONDA_PREFIX was suddenly undefined. Why this was not a problem before, is unclear to me. 4) The cudatoolkit runtime dependency is pinned with pin_compatible 5) The libastra conda package now provides headers and .pc file. This is useful for building C++ packages that depend on astra. 6) Remove some old code related to cudatoolkit<8.0. For astra-toolbox: 1) astra-toolbox uses the conda-provided compilers 2) The compilers are fixed to version 7.3 3) Add boost to host requirements of astra-toolbox Notes on testing: - The libastra build has been tested with all versions of cudatoolkit - The astra-toolbox build has been tested with all provided versions of python after building a single cudatoolkit version of libastra. How to test this branch: - It should work by just editing `python/conda/linux_release/buildenv/build.sh`. Set BRANCH=CI-use-conda-c-compiler-toolchain URL=https://github.com/ahendriksen/astra-toolbox and run release.sh from the `python/conda/linux_release` directory.
* Use recent version of conda during linux conda-buildAllard Hendriksen2019-09-171-1/+8
| | | | | | This fixes the issue where cudatoolkit=8.0 would not install any more with recent versions of conda. Also, no corruption appears to take place while downloading packages.
* Build updates for Debian 8 + CUDA10.1Willem Jan Palenstijn2019-07-084-40/+17
| | | | | | | Debian 7 is EOL, and CUDA 10.1 doesn't support its version of glibc. Hardcoded conda=4.6.14 for now, since 4.7.5 seems to be downloading corrupted packages when running in docker/linux-64.
* Build updates for Win10 + VS2017 + CUDA9 + Matlab R2018bWillem Jan Palenstijn2019-07-086-33/+29
|
* Replace absolute path by relative path in builder.pyWillem Jan Palenstijn2019-07-081-3/+3
| | | | | | A recent setuptools is using the full path as part of the name of the temporary build directory, which made the full temp path too long when called from conda-build in Windows.
* Fix composite EMode enum order in experimental.pyxWillem Jan Palenstijn2019-06-181-2/+2
|
* Update conda builds for cuda 10 and numpy 1.16Willem Jan Palenstijn2019-04-128-10/+43
|
* Fix exception propagation in python dictToConfigWillem Jan Palenstijn2018-12-232-7/+10
|
* Remove unused array allocation in data3d.get_sharedWillem Jan Palenstijn2018-12-121-1/+0
| | | | Thanks to @ahendriksen.
* Fix python set_gpu_index default memory argumentWillem Jan Palenstijn2018-11-071-1/+1
|
* Loosen numpy dependency for conda packageWillem Jan Palenstijn2018-11-011-1/+1
|
* Add support for checking features at run-timeWillem Jan Palenstijn2018-09-253-2/+22
|
* Raise exception when setting GPU memory unrealistically smallWillem Jan Palenstijn2018-09-251-0/+2
|
* Avoid broken scipy package for testsWillem Jan Palenstijn2018-08-311-0/+2
|
* Drop numpy 1.12/1.13 packagesWillem Jan Palenstijn2018-08-311-2/+0
| | | | Anaconda doesn't have these for python 3.7 apparently
* Build for new cuda/python/numpy versionsWillem Jan Palenstijn2018-08-314-5/+23
|
* Split up PythonPluginAlgorithm filesWillem Jan Palenstijn2018-08-286-191/+287
|
* Make filename more consistentWillem Jan Palenstijn2018-08-282-2/+2
|
* Allow access to python plugin object via algorithm interfaceWillem Jan Palenstijn2018-07-035-1/+40
|
* Update authorsWillem Jan Palenstijn2018-06-221-2/+2
|
* Move CUDA include filesWillem Jan Palenstijn2018-06-221-1/+1
|
* Build for numpy 1.14Willem Jan Palenstijn2018-06-011-0/+1
|
* iMinds -> imecWillem Jan Palenstijn2018-01-2447-47/+47
|
* Update copyright dateWillem Jan Palenstijn2018-01-2447-93/+93
|
* Update contact emailWillem Jan Palenstijn2018-01-1247-47/+47
|
* Improve postalignment functionWillem Jan Palenstijn2018-01-092-20/+14
|
* Fix comments for postalignment functionWillem Jan Palenstijn2018-01-091-2/+9
|
* Add geom_size, geom_2vec to main astra moduleWillem Jan Palenstijn2018-01-091-1/+1
|
* Add astra.test/astra_test functionWillem Jan Palenstijn2018-01-092-2/+12
|
* Check for CUDA support at run-time in use_cuda()Willem Jan Palenstijn2018-01-091-1/+2
|
* Merge branch 'master' into parallel_vecWillem Jan Palenstijn2017-11-225-16/+45
|\
| * Fix missing version update in conda meta.yamlWillem Jan Palenstijn2017-11-221-2/+2
| |
| * Add experimental accumulate_FP/BP/FDK python functionsWillem Jan Palenstijn2017-11-221-8/+37
| |
| * Update version to 1.9.0devWillem Jan Palenstijn2017-11-224-6/+6
| |
* | Merge branch 'master' into parallel_vecWillem Jan Palenstijn2017-11-2221-101/+306
|\|
| * Remove unused codeWillem Jan Palenstijn2017-11-142-4/+3
| |
| * Update version to 1.8.3Willem Jan Palenstijn2017-11-064-8/+8
| |
| * Add workaround for apparently broken mkl/win-64 conda packageWillem Jan Palenstijn2017-11-061-0/+2
| |
| * Add libastra/linux-64 conda package variants for cudatoolkitWillem Jan Palenstijn2017-11-0610-55/+130
| | | | | | | | Also upgrade the Docker-based linux release scripts to match.
| * Add basic post-install python testsWillem Jan Palenstijn2017-11-012-0/+98
| |
| * Move set_gpu_index, get_gpu_info from astra.astra to astraWillem Jan Palenstijn2017-11-011-1/+2
| |
| * Separate cuda from astra headers furtherWillem Jan Palenstijn2017-11-011-2/+1
| |
| * Fix usage of cython exceptWillem Jan Palenstijn2017-10-261-7/+13
| |
| * Fix usage of cython exceptWillem Jan Palenstijn2017-10-231-2/+2
| |
| * Support 2d/3d in astra.algorithm.get_res_normWillem Jan Palenstijn2017-10-232-5/+16
| |
| * Add trailing ,/; to string repr of float vector/matrixWillem Jan Palenstijn2017-10-171-0/+2
| | | | | | | | | | This makes it possible to differentiate between a scalar and a one-element vector, and fixes #111.
| * Add astra.astra.get_gpu_info utility functionWillem Jan Palenstijn2017-10-172-0/+19
| |
| * Improve python create_vol_geomAllard Hendriksen2017-10-171-18/+11
| | | | | | | | | | | | | | | | | | | | | | Remove redundant window computations. Also fixes the problem where >> astra.create_vol_geom(10,10,10) would not set the window options while all other parameter configurations of create_vol_geom did set the window options. Respects custom arguments for the window.
| * Update miniconda release for linux conda buildsWillem Jan Palenstijn2017-10-161-1/+1
| |