From d6ee5585e696f855d1c687d34efa04328729e94c Mon Sep 17 00:00:00 2001
From: dkazanc <dkazanc@hotmail.com>
Date: Tue, 9 Apr 2019 16:44:39 +0100
Subject: 2D CPU version for constrained diffusion

---
 build/run.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'build')

diff --git a/build/run.sh b/build/run.sh
index e6f171e..b40d222 100755
--- a/build/run.sh
+++ b/build/run.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 echo "Building CCPi-regularisation Toolkit using CMake"
-rm -r build_proj
+rm -r ../build_proj
 # Requires Cython, install it first:
 # pip install cython
-mkdir build_proj
-cd build_proj/
+mkdir ../build_proj
+cd ../build_proj/
 #make clean
-export CIL_VERSION=19.03
+export CIL_VERSION=19.04
 # install Python modules without CUDA
-# cmake ../ -DBUILD_PYTHON_WRAPPER=ON -DBUILD_MATLAB_WRAPPER=OFF -DBUILD_CUDA=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install
+cmake ../ -DBUILD_PYTHON_WRAPPER=ON -DBUILD_MATLAB_WRAPPER=OFF -DBUILD_CUDA=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install
 # install Python modules with CUDA
 # cmake ../ -DBUILD_PYTHON_WRAPPER=ON -DBUILD_MATLAB_WRAPPER=OFF -DBUILD_CUDA=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install
 # install Matlab modules without CUDA
@@ -18,12 +18,12 @@ export CIL_VERSION=19.03
 # cmake ../ -DBUILD_PYTHON_WRAPPER=OFF -DMatlab_ROOT_DIR=/home/algol/SOFT/MATLAB9/ -DBUILD_MATLAB_WRAPPER=ON -DBUILD_CUDA=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install
 make install
 ############### Python(linux)###############
-#cp install/lib/libcilreg.so install/python/ccpi/filters
-# cd install/python
-# export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:../lib
+cp install/lib/libcilreg.so install/python/ccpi/filters
+cd install/python
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:../lib
 # spyder
 ############### Matlab(linux)###############
-export LD_PRELOAD=/home/algol/anaconda3/lib/libstdc++.so.6  # if there is libstdc error in matlab
+# export LD_PRELOAD=/home/algol/anaconda3/lib/libstdc++.so.6  # if there is libstdc error in matlab
 # PATH="/path/to/mex/:$PATH" LD_LIBRARY_PATH="/path/to/library:$LD_LIBRARY_PATH" matlab
 # PATH="/home/kjy41806/Documents/SOFT/CCPi-Regularisation-Toolkit/build_proj/install/matlab/:$PATH" LD_LIBRARY_PATH="/home/kjy41806/Documents/SOFT/CCPi-Regularisation-Toolkit/build_proj/install/lib:$LD_LIBRARY_PATH" matlab
 #PATH="/home/algol/Documents/DEV/CCPi-Regularisation-Toolkit/build_proj/install/matlab/:$PATH" LD_LIBRARY_PATH="/home/algol/Documents/DEV/CCPi-Regularisation-Toolkit/build_proj/install/lib:$LD_LIBRARY_PATH" /home/algol/SOFT/MATLAB9/bin/matlab
-- 
cgit v1.2.3


From 2d436f37be6029d57d7f876d4c7c378ee712a11e Mon Sep 17 00:00:00 2001
From: Daniil Kazantsev <dkazanc@hotmail.com>
Date: Wed, 10 Apr 2019 22:39:11 +0100
Subject: progress with bresenham

---
 build/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build')

diff --git a/build/run.sh b/build/run.sh
index b40d222..0a153aa 100755
--- a/build/run.sh
+++ b/build/run.sh
@@ -21,7 +21,7 @@ make install
 cp install/lib/libcilreg.so install/python/ccpi/filters
 cd install/python
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:../lib
-# spyder
+spyder
 ############### Matlab(linux)###############
 # export LD_PRELOAD=/home/algol/anaconda3/lib/libstdc++.so.6  # if there is libstdc error in matlab
 # PATH="/path/to/mex/:$PATH" LD_LIBRARY_PATH="/path/to/library:$LD_LIBRARY_PATH" matlab
-- 
cgit v1.2.3