diff options
| author | Tomas Kulhanek <tomas.kulhanek@stfc.ac.uk> | 2019-01-21 17:14:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 17:14:13 +0000 |
| commit | 60b4d51ce1cf19be2a3483232448ae227253614c (patch) | |
| tree | 45411dd5255691fd4c8495652323c9293c8fb881 | |
| parent | 774ed3351991266b0c9289b2b9ba1afe328c3e70 (diff) | |
| parent | 34d0b9f85c3bc73416f1dc2bb25ef669b9ff8076 (diff) | |
| download | regularization-60b4d51ce1cf19be2a3483232448ae227253614c.tar.gz regularization-60b4d51ce1cf19be2a3483232448ae227253614c.tar.bz2 regularization-60b4d51ce1cf19be2a3483232448ae227253614c.tar.xz regularization-60b4d51ce1cf19be2a3483232448ae227253614c.zip | |
Merge branch 'master' into pr-test
| -rw-r--r-- | Readme.md | 1 | ||||
| -rwxr-xr-x | build/jenkins-build.sh | 8 |
2 files changed, 4 insertions, 5 deletions
@@ -1,3 +1,4 @@ +[](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Regularisation-Toolkit/) # CCPi-Regularisation Toolkit (CCPi-RGL) **Iterative image reconstruction (IIR) methods normally require regularisation to stabilise the convergence and make the reconstruction problem (inverse problem) more well-posed. The CCPi-RGL software provides 2D/3D and multi-channel regularisation strategies to ensure better performance of IIR methods. The regularisation modules are well-suited to use with [splitting algorithms](https://en.wikipedia.org/wiki/Augmented_Lagrangian_method#Alternating_direction_method_of_multipliers), such as, [ADMM](https://github.com/dkazanc/ADMM-tomo) and [FISTA](https://github.com/dkazanc/FISTA-tomo). Furthermore, the toolkit can be used for simpler inversion tasks, such as, image denoising, inpaiting, deconvolution etc. The core modules are written in C-OMP and CUDA languages and wrappers for Matlab and Python are provided.** diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index 20c97f3..ca5b57a 100755 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -1,11 +1,10 @@ #!/usr/bin/env bash -# TODO put git tag recognition + if [[ -n ${CIL_VERSION} ]] then echo Using defined version: $CIL_VERSION else -# TODO put git tag recognition, or default - #export CIL_VERSION=0.10.4 + #get tag, remove first char ('v') and leave rest export CIL_VERSION=`git describe --tags | tail -c +2` if [[ ${CIL_VERSION} == *"-"* ]]; then @@ -36,7 +35,6 @@ fi # presume that git clone is done before this script is launched, if not, uncomment #git clone https://github.com/vais-ral/CCPi-Regularisation-Toolkit conda install -y conda-build -#export CIL_VERSION=0.10.2 #cd CCPi-Regularisation-Toolkit # already there by jenkins # need to call first build conda build Wrappers/Python/conda-recipe @@ -50,7 +48,7 @@ if [[ -n ${CCPI_CONDA_TOKEN} ]] then conda install anaconda-client while read -r outfile; do - #TODO if git tag is defined than call anaconda without --label dev + #if 0 commit after tag then call anaconda without --label dev #TODO if pull request??? do not upload if [[ $CIL_VERSION == *"_"* ]]; then # upload with dev label |