| 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 |
| | | |||||
| * | Update conda builds for cuda 10 and numpy 1.16 | Willem Jan Palenstijn | 2019-04-12 | 8 | -10/+43 |
| | | |||||
| * | Loosen numpy dependency for conda package | Willem Jan Palenstijn | 2018-11-01 | 1 | -1/+1 |
| | | |||||
| * | 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 |
| | | |||||
| * | Build for numpy 1.14 | Willem Jan Palenstijn | 2018-06-01 | 1 | -0/+1 |
| | | |||||
| * | Fix missing version update in conda meta.yaml | Willem Jan Palenstijn | 2017-11-22 | 1 | -2/+2 |
| | | |||||
| * | Update version to 1.9.0dev | Willem Jan Palenstijn | 2017-11-22 | 2 | -4/+4 |
| | | |||||
| * | Update version to 1.8.3 | Willem Jan Palenstijn | 2017-11-06 | 2 | -6/+6 |
| | | |||||
| * | 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. | ||||
| * | 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 |
| | | |||||
| * | Fix conda build | Willem Jan Palenstijn | 2017-03-29 | 1 | -0/+1 |
| | | |||||
| * | 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. | ||||
| * | Add np112 to conda build script | Willem Jan Palenstijn | 2017-02-24 | 1 | -0/+3 |
| | | |||||
| * | 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 | 2 | -8/+6 |
| | | |||||
| * | 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 | 2 | -2/+2 |
| | | |||||
| * | 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 |
| | | |||||
| * | Separate C++ and python builds & make conda work nicely | Holger Kohr | 2016-11-25 | 4 | -23/+40 |
| | | | | | | | | | | | | | - 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 |
| | | |||||
| * | 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 |
| | | |||||
| * | Add check for scipy | Willem Jan Palenstijn | 2016-01-20 | 1 | -0/+1 |
| | | | | | The module matrix_c.pyx uses it. | ||||
| * | Update version to 1.7.1 | Willem Jan Palenstijn | 2015-12-23 | 1 | -2/+2 |
| | | |||||
| * | Update version to 1.7 | Willem Jan Palenstijn | 2015-12-04 | 1 | -2/+2 |
| | | |||||
| * | Add conda build scripts | Daniel M. Pelt | 2015-12-04 | 2 | -0/+56 |
 |
index : csa/tomo/approximate/astra.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |