summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDaniil Kazantsev <dkazanc@hotmail.com>2019-03-12 22:14:27 +0000
committerDaniil Kazantsev <dkazanc@hotmail.com>2019-03-12 22:14:27 +0000
commit1ac06b5ce11b247930489b7aa3afa59215e43c91 (patch)
tree8a5dc7649b2fdeda67c8df9ff2ea2880596d9e67 /build
parent420e71a0dcb42e91e1aa93306c2e2f688b309620 (diff)
downloadregularization-1ac06b5ce11b247930489b7aa3afa59215e43c91.tar.gz
regularization-1ac06b5ce11b247930489b7aa3afa59215e43c91.tar.bz2
regularization-1ac06b5ce11b247930489b7aa3afa59215e43c91.tar.xz
regularization-1ac06b5ce11b247930489b7aa3afa59215e43c91.zip
readme updates and demos
Diffstat (limited to 'build')
-rwxr-xr-x[-rw-r--r--]build/run.sh23
1 files changed, 13 insertions, 10 deletions
diff --git a/build/run.sh b/build/run.sh
index d450299..f2869e5 100644..100755
--- a/build/run.sh
+++ b/build/run.sh
@@ -5,20 +5,23 @@ rm -r build_proj
# pip install cython
mkdir build_proj
cd build_proj/
-make clean
+#make clean
export CIL_VERSION=19.03
# 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
# 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
+#cmake ../ -DBUILD_PYTHON_WRAPPER=OFF -DMatlab_ROOT_DIR=/dls_sw/apps/matlab/r2014a/ -DBUILD_MATLAB_WRAPPER=ON -DBUILD_CUDA=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install
# install Matlab modules with CUDA
-# cmake ../ -DBUILD_PYTHON_WRAPPER=OFF -DMatlab_ROOT_DIR=/dls_sw/apps/matlab/r2014a/ -DBUILD_MATLAB_WRAPPER=ON -DBUILD_CUDA=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install
-make install
-#### Python
+#cmake ../ -DBUILD_PYTHON_WRAPPER=OFF -DMatlab_ROOT_DIR=/dls_sw/apps/matlab/r2014a/ -DBUILD_MATLAB_WRAPPER=ON -DBUILD_CUDA=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install
+############### Python(linux)###############
#cp install/lib/libcilreg.so install/python/ccpi/filters
-cd install/python
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:../lib
-spyder
-##### one can also run Matlab in Linux as:
-#PATH="/path/to/mex/:$PATH" LD_LIBRARY_PATH="/path/to/library:$LD_LIBRARY_PATH" matlab
-#PATH="/home/kjy41806/Documents/SOFT/CCPi-Regularisation-Toolkit/build/install/matlab/:$PATH" LD_LIBRARY_PATH="/home/kjy41806/Documents/SOFT/CCPi-Regularisation-Toolkit/build/install/lib:$LD_LIBRARY_PATH" matlab
+# 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
+# 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