summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authordkazanc <dkazanc@hotmail.com>2019-09-03 17:02:54 +0100
committerdkazanc <dkazanc@hotmail.com>2019-09-03 17:02:54 +0100
commitd2d4b4bd1db461fb9215abd20f829ce0298f3876 (patch)
tree05c64c6d408b5a1266e763cc4addbeb92ea0a2fd /build
parente2d85c8557733174690da77f712a0c0a7c2d26e0 (diff)
downloadregularization-d2d4b4bd1db461fb9215abd20f829ce0298f3876.tar.gz
regularization-d2d4b4bd1db461fb9215abd20f829ce0298f3876.tar.bz2
regularization-d2d4b4bd1db461fb9215abd20f829ce0298f3876.tar.xz
regularization-d2d4b4bd1db461fb9215abd20f829ce0298f3876.zip
CPU fixed, GPU almost
Diffstat (limited to 'build')
-rwxr-xr-xbuild/run.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/run.sh b/build/run.sh
index c243b12..285476b 100755
--- a/build/run.sh
+++ b/build/run.sh
@@ -6,9 +6,9 @@ rm -r ../build_proj
mkdir ../build_proj
cd ../build_proj/
#make clean
-export CIL_VERSION=19.06
+export CIL_VERSION=19.09
# 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
@@ -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 --new-instance
############### 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