summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDaniil Kazantsev <dkazanc@hotmail.com>2019-05-15 14:51:44 +0100
committerGitHub <noreply@github.com>2019-05-15 14:51:44 +0100
commit5fb5be32360bab1b6619bcef192dde0878d014ff (patch)
tree402aa4670dbbb6412df21441180940ebaace8551 /build
parente8712929c6c18fb0799fcd60489692d809d95e89 (diff)
parent1207b14fa2fac7f8b83280d75884ad3a62e57e75 (diff)
downloadregularization-5fb5be32360bab1b6619bcef192dde0878d014ff.tar.gz
regularization-5fb5be32360bab1b6619bcef192dde0878d014ff.tar.bz2
regularization-5fb5be32360bab1b6619bcef192dde0878d014ff.tar.xz
regularization-5fb5be32360bab1b6619bcef192dde0878d014ff.zip
Merge pull request #122 from vais-ral/matlab_fix
fix to cmakelists file
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 2404d1b..c243b12 100755
--- a/build/run.sh
+++ b/build/run.sh
@@ -6,13 +6,13 @@ rm -r ../build_proj
mkdir ../build_proj
cd ../build_proj/
#make clean
-export CIL_VERSION=19.04
+export CIL_VERSION=19.06
# 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
-#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=OFF -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
# 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