summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump conda package versionWillem Jan Palenstijn2020-07-041-1/+1
|
* Fix missing importWillem Jan Palenstijn2020-07-041-0/+2
| | | | Thanks to @jleuschn for catching this.
* Merge branch 'direct_fpbp'Willem Jan Palenstijn2020-07-028-48/+159
|\
| * Add error checkWillem Jan Palenstijn2020-07-021-0/+4
| |
| * Add mode parameter to direct_FPBP3DAllard Hendriksen2020-07-021-6/+5
| | | | | | | | This change allows additive forward and backprojections.
| * Check numpy array typeWillem Jan Palenstijn2020-07-025-16/+25
| |
| * Add python astra.experimental.direct_FP3D/BP3DWillem Jan Palenstijn2020-07-021-0/+54
| |
| * Refactor cython data3d object creation to prepareWillem Jan Palenstijn2020-07-024-37/+82
|/
* Use numpy backward binary compatibility for conda packagesWillem Jan Palenstijn2020-02-078-46/+8
| | | | | | | | We now only build a single package built with numpy 1.11.x for numpy>=1.11,<2 . There is no guarantee that every future numpy version covered by this will be compatible with numpy 1.11, but numpy checks this internally at run-time, and should report this (noisily) when this occurs.
* Fix potential geometry constant corruption in par3d_bpWillem Jan Palenstijn2020-02-051-1/+1
|
* Fix memory leaks in 3D BPWillem Jan Palenstijn2020-02-052-0/+6
|
* Update python/numpy/cuda versions for condaWillem Jan Palenstijn2020-01-148-10/+19
|
* Increment version to 1.9.9devWillem Jan Palenstijn2019-09-276-8/+8
|
* Merge branch 'consistent_scaling'Willem Jan Palenstijn2019-09-2748-2532/+841
|\
| * Skip boost/cuda check if cuda is not foundWillem Jan Palenstijn2019-09-251-0/+2
| |
| * Add noteWillem Jan Palenstijn2019-09-251-0/+3
| |
| * Fix crash in FBP_CUDA when called without projectorWillem Jan Palenstijn2019-09-251-1/+1
| |
| * Remove unmaintained, out of date 'STANDALONE' cuda codeWillem Jan Palenstijn2019-09-2515-1822/+0
| |
| * Add unit tests for 3D adjointsWillem Jan Palenstijn2019-09-251-5/+76
| |
| * Adjust par3d adjoint scaling, and clean upWillem Jan Palenstijn2019-09-253-88/+96
| |
| * Enable all 2D projector testsWillem Jan Palenstijn2019-09-252-5/+8
| |
| * Add 3D reconstruction scaling testWillem Jan Palenstijn2019-09-251-18/+78
| |
| * Fix part of non-cube cone scalingWillem Jan Palenstijn2019-09-252-2/+5
| |
| * Small clean up of factorsWillem Jan Palenstijn2019-09-254-14/+12
| |
| * Remove C++ projector testsWillem Jan Palenstijn2019-09-253-254/+0
| | | | | | | | These have been superseded by python versions.
| * Add missing headerWillem Jan Palenstijn2019-09-251-1/+1
| |
| * Add feature flags for changed scaling behaviourWillem Jan Palenstijn2019-09-252-2/+20
| |
| * Remove obsolete DensityWeighting optionWillem Jan Palenstijn2019-09-254-15/+3
| |
| * Improve adjoint matching for fan/cone BP functions, and clean upWillem Jan Palenstijn2019-09-253-223/+251
| |
| * Add test for reconstruction scalingWillem Jan Palenstijn2019-09-251-0/+79
| |
| * Fix fan-beam FBP scalingWillem Jan Palenstijn2019-09-253-11/+15
| |
| * Add error check for non-parallel FBPWillem Jan Palenstijn2019-09-251-0/+5
| |
| * Work around some warningsWillem Jan Palenstijn2019-09-253-37/+34
| |
| * Adjust SART to line integral scalingWillem Jan Palenstijn2019-09-253-9/+10
| |
| * Clean up outputscale naming confusion in cuda::algoWillem Jan Palenstijn2019-09-255-20/+29
| |
| * Adjust FBP to line integral scalingWillem Jan Palenstijn2019-09-258-19/+31
| |
| * Adjust adjoint to line integral scalingWillem Jan Palenstijn2019-09-256-30/+132
| |
| * Dynamically create python test functionsWillem Jan Palenstijn2019-09-251-34/+10
| |
| * Check if boost and CUDA versions are compatibleWillem Jan Palenstijn2019-09-252-0/+23
| | | | | | | | | | See https://github.com/astra-toolbox/astra-toolbox/issues/163 and https://github.com/boostorg/config/pull/175 .
| * Adjust strip kernels to line integral scalingWillem Jan Palenstijn2019-09-253-18/+26
| |
| * Adjust distance driven kernels to line integral scalingWillem Jan Palenstijn2019-09-252-7/+17
| |
| * Adjust linear/cuda kernels to line integral scalingWillem Jan Palenstijn2019-09-254-23/+12
| |
| * Adjust line kernels to line integral scalingWillem Jan Palenstijn2019-09-253-19/+7
|/
* Merge pull request #214 from ahendriksen/CI-use-conda-c-compiler-toolchainWillem Jan Palenstijn2019-09-259-29/+52
|\ | | | | Use conda compiler toolchain for conda builds
| * 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.
* Fix Travis CUDA setupWillem Jan Palenstijn2019-09-181-2/+0
|
* Fix clang buildWillem Jan Palenstijn2019-09-171-1/+3
|
* Merge pull request #213 from ahendriksen/CI-update-condaWillem Jan Palenstijn2019-09-171-1/+8
|\ | | | | Use recent version of conda during linux conda-build
| * 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.
* Improve logging of mex detection to config.logWillem Jan Palenstijn2019-08-161-2/+2
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 15:00:26 +0000