From da69e9f1074226e3d14faa89a270b4ef1593ee42 Mon Sep 17 00:00:00 2001 From: vagrant Date: Wed, 9 Jan 2019 14:11:05 +0000 Subject: fix --- build/jenkins-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index 3bd5016..4a18525 100755 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -34,7 +34,7 @@ export REG_FILES=`conda build Wrappers/Python/conda-recipe --output` # REG_FILES variable should contain output files echo files created: $REG_FILES #upload to anaconda -if [[ -n ${CCPI_CONDA_TOKEN}]] +if [[ -n ${CCPI_CONDA_TOKEN} ]] then conda install anaconda-client while read -r outfile; do -- cgit v1.2.3 From 3b114face28547468da9e1b491c67bd5ea53603b Mon Sep 17 00:00:00 2001 From: vagrant Date: Wed, 9 Jan 2019 14:13:17 +0000 Subject: version in top 0.10.4 --- build/jenkins-build.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index 4a18525..6da2c56 100755 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -1,4 +1,11 @@ #!/usr/bin/env bash +if [[ -n ${CIL_VERSION} ]] +then + echo Using defined version: $CIL_VERSION +else + export CIL_VERSION=0.10.4 + echo Defining version: $CIL_VERSION +fi # Script to builds source code in Jenkins environment # module try-load conda @@ -17,14 +24,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 -if [[ -n ${CIL_VERSION} ]] -then - echo Using defined version: $CIL_VERSION -else - export CIL_VERSION=0.10.3 - echo Defining version: $CIL_VERSION -fi #cd CCPi-Regularisation-Toolkit # already there by jenkins # need to call first build conda build Wrappers/Python/conda-recipe -- cgit v1.2.3 From 34d0b9f85c3bc73416f1dc2bb25ef669b9ff8076 Mon Sep 17 00:00:00 2001 From: Edoardo Pasca Date: Tue, 15 Jan 2019 15:23:43 +0000 Subject: added jenkins build status --- Readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Readme.md b/Readme.md index cdf823d..70c9e13 100644 --- a/Readme.md +++ b/Readme.md @@ -1,3 +1,4 @@ +[![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Regularisation-Toolkit)](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.** -- cgit v1.2.3