From 4af4096096af9f478e2a3d463b9dfcfc200454ff Mon Sep 17 00:00:00 2001
From: Daniil Kazantsev <dkazanc@hotmail.com>
Date: Wed, 19 Dec 2018 11:21:16 +0000
Subject: fixes issues in tests

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Readme.md')

diff --git a/Readme.md b/Readme.md
index 089c9fe..f574f5f 100644
--- a/Readme.md
+++ b/Readme.md
@@ -88,7 +88,7 @@ conda install ccpi-regulariser -c ccpi -c conda-forge
 
 #### Python (conda-build)
 ```
-	export CIL_VERSION=0.10.2
+	export CIL_VERSION=0.10.3
 	conda build Wrappers/Python/conda-recipe --numpy 1.12 --python 3.5 
 	conda install ccpi-regulariser=${CIL_VERSION} --use-local --force
 	cd demos/
-- 
cgit v1.2.3


From ec59b600885a1c7a60e1b528f3d09588aa972609 Mon Sep 17 00:00:00 2001
From: Daniil Kazantsev <dkazanc@hotmail.com>
Date: Wed, 19 Dec 2018 15:36:17 +0000
Subject: updates GPU installation from Matlab and readme

---
 Readme.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Readme.md')

diff --git a/Readme.md b/Readme.md
index f574f5f..cdf823d 100644
--- a/Readme.md
+++ b/Readme.md
@@ -69,7 +69,6 @@ Here an example of build on Linux (see also `run.sh` for additional info):
 
 ```bash
 git clone https://github.com/vais-ral/CCPi-Regularisation-Toolkit.git
-mkdir build
 cd build
 cmake .. -DCONDA_BUILD=OFF -DBUILD_MATLAB_WRAPPER=ON -DBUILD_PYTHON_WRAPPER=ON -DBUILD_CUDA=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install
 make install
@@ -124,7 +123,7 @@ On Windows the `dll` and the mex modules must reside in the same directory. It i
 addpath(/path/to/library);
 ```
 
-#### Legacy Matlab installation
+#### Legacy Matlab installation (partly supported, please use Cmake)
 ```
 	
 	cd /Wrappers/Matlab/mex_compile
-- 
cgit v1.2.3