diff options
| author | Daniil Kazantsev <dkazanc3@googlemail.com> | 2019-04-15 15:42:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-15 15:42:29 +0100 |
| commit | 6040e1e1f501f501e8da628b065fd16d35133519 (patch) | |
| tree | 3aa1382838ce6b9b856ace373f1d864683f10277 /build/run.sh | |
| parent | d882861f8cfc59ffe70aa2f286dda83b348d7a70 (diff) | |
| parent | e6842ec7f2cdbd46a004758bc3a6543012c6a74a (diff) | |
| download | regularization-6040e1e1f501f501e8da628b065fd16d35133519.tar.gz regularization-6040e1e1f501f501e8da628b065fd16d35133519.tar.bz2 regularization-6040e1e1f501f501e8da628b065fd16d35133519.tar.xz regularization-6040e1e1f501f501e8da628b065fd16d35133519.zip | |
Merge pull request #117 from vais-ral/diffcon
Connected labels merging function
Diffstat (limited to 'build/run.sh')
| -rwxr-xr-x | build/run.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/build/run.sh b/build/run.sh index e6f171e..0a153aa 100755 --- a/build/run.sh +++ b/build/run.sh @@ -1,14 +1,14 @@ #!/bin/bash echo "Building CCPi-regularisation Toolkit using CMake" -rm -r build_proj +rm -r ../build_proj # Requires Cython, install it first: # pip install cython -mkdir build_proj -cd build_proj/ +mkdir ../build_proj +cd ../build_proj/ #make clean -export CIL_VERSION=19.03 +export CIL_VERSION=19.04 # 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 @@ -18,12 +18,12 @@ export CIL_VERSION=19.03 # 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 +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 |