diff options
| author | Daniil Kazantsev <dkazanc3@googlemail.com> | 2018-12-19 15:42:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-19 15:42:38 +0000 |
| commit | 07fb80445f83758e4aed94a461cf1cf2b869318a (patch) | |
| tree | e93c03bcfbe2eb88a13cdd42edaea045f7f13c06 /Readme.md | |
| parent | c04b85a6fdd8c63e3363c8072cbfe4b97409dc60 (diff) | |
| parent | ec59b600885a1c7a60e1b528f3d09588aa972609 (diff) | |
| download | regularization-07fb80445f83758e4aed94a461cf1cf2b869318a.tar.gz regularization-07fb80445f83758e4aed94a461cf1cf2b869318a.tar.bz2 regularization-07fb80445f83758e4aed94a461cf1cf2b869318a.tar.xz regularization-07fb80445f83758e4aed94a461cf1cf2b869318a.zip | |
Merge pull request #80 from vais-ral/dev-jenkins
Dev jenkins
Diffstat (limited to 'Readme.md')
| -rw-r--r-- | Readme.md | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -69,7 +69,6 @@ Here an example of build on Linux (see also `run.sh` for additional info): ```bash git clone https://github.com/vais-ral/CCPi-Regularisation-Toolkit.git -mkdir build cd build cmake .. -DCONDA_BUILD=OFF -DBUILD_MATLAB_WRAPPER=ON -DBUILD_PYTHON_WRAPPER=ON -DBUILD_CUDA=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./install make install @@ -88,7 +87,7 @@ conda install ccpi-regulariser -c ccpi -c conda-forge #### Python (conda-build) ``` - export CIL_VERSION=0.10.2 + export CIL_VERSION=0.10.3 conda build Wrappers/Python/conda-recipe --numpy 1.12 --python 3.5 conda install ccpi-regulariser=${CIL_VERSION} --use-local --force cd demos/ @@ -124,7 +123,7 @@ On Windows the `dll` and the mex modules must reside in the same directory. It i addpath(/path/to/library); ``` -#### Legacy Matlab installation +#### Legacy Matlab installation (partly supported, please use Cmake) ``` cd /Wrappers/Matlab/mex_compile |