Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use conda compiler toolchain for conda builds | Allard Hendriksen | 2019-09-20 | 9 | -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-build | Allard Hendriksen | 2019-09-17 | 1 | -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.1 | Willem Jan Palenstijn | 2019-07-08 | 4 | -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 R2018b | Willem Jan Palenstijn | 2019-07-08 | 6 | -33/+29 |
| | |||||
* | Replace absolute path by relative path in builder.py | Willem Jan Palenstijn | 2019-07-08 | 1 | -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.pyx | Willem Jan Palenstijn | 2019-06-18 | 1 | -2/+2 |
| | |||||
* | Update conda builds for cuda 10 and numpy 1.16 | Willem Jan Palenstijn | 2019-04-12 | 8 | -10/+43 |
| | |||||
* | Fix exception propagation in python dictToConfig | Willem Jan Palenstijn | 2018-12-23 | 2 | -7/+10 |
| | |||||
* | Remove unused array allocation in data3d.get_shared | Willem Jan Palenstijn | 2018-12-12 | 1 | -1/+0 |
| | | | | Thanks to @ahendriksen. | ||||
* | Fix python set_gpu_index default memory argument | Willem Jan Palenstijn | 2018-11-07 | 1 | -1/+1 |
| | |||||
* | Loosen numpy dependency for conda package | Willem Jan Palenstijn | 2018-11-01 | 1 | -1/+1 |
| | |||||
* | Add support for checking features at run-time | Willem Jan Palenstijn | 2018-09-25 | 3 | -2/+22 |
| | |||||
* | Raise exception when setting GPU memory unrealistically small | Willem Jan Palenstijn | 2018-09-25 | 1 | -0/+2 |
| | |||||
* | Avoid broken scipy package for tests | Willem Jan Palenstijn | 2018-08-31 | 1 | -0/+2 |
| | |||||
* | Drop numpy 1.12/1.13 packages | Willem Jan Palenstijn | 2018-08-31 | 1 | -2/+0 |
| | | | | Anaconda doesn't have these for python 3.7 apparently | ||||
* | Build for new cuda/python/numpy versions | Willem Jan Palenstijn | 2018-08-31 | 4 | -5/+23 |
| | |||||
* | Split up PythonPluginAlgorithm files | Willem Jan Palenstijn | 2018-08-28 | 6 | -191/+287 |
| | |||||
* | Make filename more consistent | Willem Jan Palenstijn | 2018-08-28 | 2 | -2/+2 |
| | |||||
* | Allow access to python plugin object via algorithm interface | Willem Jan Palenstijn | 2018-07-03 | 5 | -1/+40 |
| | |||||
* | Update authors | Willem Jan Palenstijn | 2018-06-22 | 1 | -2/+2 |
| | |||||
* | Move CUDA include files | Willem Jan Palenstijn | 2018-06-22 | 1 | -1/+1 |
| | |||||
* | Build for numpy 1.14 | Willem Jan Palenstijn | 2018-06-01 | 1 | -0/+1 |
| | |||||
* | iMinds -> imec | Willem Jan Palenstijn | 2018-01-24 | 47 | -47/+47 |
| | |||||
* | Update copyright date | Willem Jan Palenstijn | 2018-01-24 | 47 | -93/+93 |
| | |||||
* | Update contact email | Willem Jan Palenstijn | 2018-01-12 | 47 | -47/+47 |
| | |||||
* | Improve postalignment function | Willem Jan Palenstijn | 2018-01-09 | 2 | -20/+14 |
| | |||||
* | Fix comments for postalignment function | Willem Jan Palenstijn | 2018-01-09 | 1 | -2/+9 |
| | |||||
* | Add geom_size, geom_2vec to main astra module | Willem Jan Palenstijn | 2018-01-09 | 1 | -1/+1 |
| | |||||
* | Add astra.test/astra_test function | Willem Jan Palenstijn | 2018-01-09 | 2 | -2/+12 |
| | |||||
* | Check for CUDA support at run-time in use_cuda() | Willem Jan Palenstijn | 2018-01-09 | 1 | -1/+2 |
| | |||||
* | Merge branch 'master' into parallel_vec | Willem Jan Palenstijn | 2017-11-22 | 5 | -16/+45 |
|\ | |||||
| * | Fix missing version update in conda meta.yaml | Willem Jan Palenstijn | 2017-11-22 | 1 | -2/+2 |
| | | |||||
| * | Add experimental accumulate_FP/BP/FDK python functions | Willem Jan Palenstijn | 2017-11-22 | 1 | -8/+37 |
| | | |||||
| * | Update version to 1.9.0dev | Willem Jan Palenstijn | 2017-11-22 | 4 | -6/+6 |
| | | |||||
* | | Merge branch 'master' into parallel_vec | Willem Jan Palenstijn | 2017-11-22 | 21 | -101/+306 |
|\| | |||||
| * | Remove unused code | Willem Jan Palenstijn | 2017-11-14 | 2 | -4/+3 |
| | | |||||
| * | Update version to 1.8.3 | Willem Jan Palenstijn | 2017-11-06 | 4 | -8/+8 |
| | | |||||
| * | Add workaround for apparently broken mkl/win-64 conda package | Willem Jan Palenstijn | 2017-11-06 | 1 | -0/+2 |
| | | |||||
| * | Add libastra/linux-64 conda package variants for cudatoolkit | Willem Jan Palenstijn | 2017-11-06 | 10 | -55/+130 |
| | | | | | | | | Also upgrade the Docker-based linux release scripts to match. | ||||
| * | Add basic post-install python tests | Willem Jan Palenstijn | 2017-11-01 | 2 | -0/+98 |
| | | |||||
| * | Move set_gpu_index, get_gpu_info from astra.astra to astra | Willem Jan Palenstijn | 2017-11-01 | 1 | -1/+2 |
| | | |||||
| * | Separate cuda from astra headers further | Willem Jan Palenstijn | 2017-11-01 | 1 | -2/+1 |
| | | |||||
| * | Fix usage of cython except | Willem Jan Palenstijn | 2017-10-26 | 1 | -7/+13 |
| | | |||||
| * | Fix usage of cython except | Willem Jan Palenstijn | 2017-10-23 | 1 | -2/+2 |
| | | |||||
| * | Support 2d/3d in astra.algorithm.get_res_norm | Willem Jan Palenstijn | 2017-10-23 | 2 | -5/+16 |
| | | |||||
| * | Add trailing ,/; to string repr of float vector/matrix | Willem Jan Palenstijn | 2017-10-17 | 1 | -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 function | Willem Jan Palenstijn | 2017-10-17 | 2 | -0/+19 |
| | | |||||
| * | Improve python create_vol_geom | Allard Hendriksen | 2017-10-17 | 1 | -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 builds | Willem Jan Palenstijn | 2017-10-16 | 1 | -1/+1 |
| | | |||||
| * | Update miniconda release for linux conda builds | Willem Jan Palenstijn | 2017-10-16 | 1 | -3/+3 |
| | |