summaryrefslogtreecommitdiffstats
path: root/run.sh
diff options
context:
space:
mode:
authordkazanc <dkazanc@hotmail.com>2019-03-07 17:52:57 +0000
committerdkazanc <dkazanc@hotmail.com>2019-03-07 17:52:57 +0000
commit47693d15132130513f8d0f74fd4831a3bbf69159 (patch)
tree98094bf413ffd608b0632e01195eec6cfbc8ff55 /run.sh
parentcfcc4be4413f65a0b9c4ef197687e3a167eff0e8 (diff)
downloadregularization-47693d15132130513f8d0f74fd4831a3bbf69159.tar.gz
regularization-47693d15132130513f8d0f74fd4831a3bbf69159.tar.bz2
regularization-47693d15132130513f8d0f74fd4831a3bbf69159.tar.xz
regularization-47693d15132130513f8d0f74fd4831a3bbf69159.zip
matlab cmake fixed, rof tv eps
Diffstat (limited to 'run.sh')
-rwxr-xr-xrun.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/run.sh b/run.sh
index c5c396a..b2be0d6 100755
--- a/run.sh
+++ b/run.sh
@@ -8,17 +8,17 @@ 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
+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
+# 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
# 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
#cp install/lib/libcilreg.so install/python/ccpi/filters
-cd install/python
+# cd install/python
export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:../lib
spyder
##### Matlab (Linux)