diff options
| author | Daniil Kazantsev <dkazanc@hotmail.com> | 2019-09-26 22:02:42 +0100 |
|---|---|---|
| committer | Daniil Kazantsev <dkazanc@hotmail.com> | 2019-09-26 22:02:42 +0100 |
| commit | 304db3ba12a12870f0d1d7cf94bc7d9aedca95c4 (patch) | |
| tree | f6751d24c3c99d091fdb3d9a4bdba8c2af07ae5e /build/run.sh | |
| parent | 98e14b257b2e9f8d89e34a5ed01c17a1ab0d8652 (diff) | |
| parent | 4fb89fcc4719f24b38a777ed6c7204f5761770ad (diff) | |
| download | regularization-304db3ba12a12870f0d1d7cf94bc7d9aedca95c4.tar.gz regularization-304db3ba12a12870f0d1d7cf94bc7d9aedca95c4.tar.bz2 regularization-304db3ba12a12870f0d1d7cf94bc7d9aedca95c4.tar.xz regularization-304db3ba12a12870f0d1d7cf94bc7d9aedca95c4.zip | |
Merge branch 'master' into fgp_cpu_resort_for
Diffstat (limited to 'build/run.sh')
| -rwxr-xr-x | build/run.sh | 6 |
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 |