diff options
| author | dkazanc <dkazanc@hotmail.com> | 2019-04-09 16:44:39 +0100 |
|---|---|---|
| committer | dkazanc <dkazanc@hotmail.com> | 2019-04-09 16:44:39 +0100 |
| commit | d6ee5585e696f855d1c687d34efa04328729e94c (patch) | |
| tree | 5ff04822b93d69a37a9cfce8a2e473ebc9d0ef18 /build | |
| parent | d882861f8cfc59ffe70aa2f286dda83b348d7a70 (diff) | |
| download | regularization-d6ee5585e696f855d1c687d34efa04328729e94c.tar.gz regularization-d6ee5585e696f855d1c687d34efa04328729e94c.tar.bz2 regularization-d6ee5585e696f855d1c687d34efa04328729e94c.tar.xz regularization-d6ee5585e696f855d1c687d34efa04328729e94c.zip | |
2D CPU version for constrained diffusion
Diffstat (limited to 'build')
| -rwxr-xr-x | build/run.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/build/run.sh b/build/run.sh index e6f171e..b40d222 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 +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 |