summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDaniil Kazantsev <dkazanc@hotmail.com>2019-03-17 11:11:49 +0000
committerDaniil Kazantsev <dkazanc@hotmail.com>2019-03-17 11:11:49 +0000
commit527e8b28aad16d09b37fa8c9d8790a89276d68b1 (patch)
treeb8654877391908a82e2284f2b00d57a3bac67920 /build
parent9633c5d701c164c3ff8f4d870624f87744d186bd (diff)
downloadregularization-527e8b28aad16d09b37fa8c9d8790a89276d68b1.tar.gz
regularization-527e8b28aad16d09b37fa8c9d8790a89276d68b1.tar.bz2
regularization-527e8b28aad16d09b37fa8c9d8790a89276d68b1.tar.xz
regularization-527e8b28aad16d09b37fa8c9d8790a89276d68b1.zip
final corrections
Diffstat (limited to 'build')
-rwxr-xr-xbuild/run.sh18
1 files changed, 10 insertions, 8 deletions
diff --git a/build/run.sh b/build/run.sh
index f2869e5..e6f171e 100755
--- a/build/run.sh
+++ b/build/run.sh
@@ -1,27 +1,29 @@
-#!/bin/bash
-echo "Building CCPi-regularisation Toolkit using CMake"
+#!/bin/bash
+echo "Building CCPi-regularisation Toolkit using CMake"
rm -r build_proj
-# Requires Cython, install it first:
+# Requires Cython, install it first:
# pip install cython
mkdir build_proj
cd build_proj/
#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
+# 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
-############### Python(linux)###############
+# 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
+# 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
# 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
+#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