summaryrefslogtreecommitdiffstats
path: root/Readme.md
diff options
context:
space:
mode:
authorDaniil Kazantsev <dkazanc@hotmail.com>2019-12-16 13:48:34 +0000
committerGitHub <noreply@github.com>2019-12-16 13:48:34 +0000
commit24e4f323f8800b534fb65184c2973bb5e3aeb369 (patch)
tree01687d663d4e698dbad3ef1d6d7aa9da77cb92b6 /Readme.md
parentc9fa02f93c506dcbed963ad5b51202c071e3d53d (diff)
parente98f2735ce27925f907e5a32bcd521f578b77dbe (diff)
downloadregularization-24e4f323f8800b534fb65184c2973bb5e3aeb369.tar.gz
regularization-24e4f323f8800b534fb65184c2973bb5e3aeb369.tar.bz2
regularization-24e4f323f8800b534fb65184c2973bb5e3aeb369.tar.xz
regularization-24e4f323f8800b534fb65184c2973bb5e3aeb369.zip
Merge pull request #140 from vais-ral/constrdiff
Edge constrained nonlinear diffusion
Diffstat (limited to 'Readme.md')
-rw-r--r--Readme.md14
1 files changed, 7 insertions, 7 deletions
diff --git a/Readme.md b/Readme.md
index 13e182b..077d2f2 100644
--- a/Readme.md
+++ b/Readme.md
@@ -101,13 +101,13 @@ conda install ccpi-regulariser -c ccpi -c conda-forge
#### Python (conda-build)
```
- export CIL_VERSION=19.10 (Unix) / set CIL_VERSION=19.10 (Windows)
- conda build recipe/ --numpy 1.15 --python 3.7
- conda install ccpi-regulariser=${CIL_VERSION} --use-local --force-reinstall # doesn't work?
- conda install -c file://${CONDA_PREFIX}/conda-bld/ ccpi-regulariser=${CIL_VERSION} --force-reinstall # try this one
- cd demos/
- python demo_cpu_regularisers.py # to run CPU demo
- python demo_gpu_regularisers.py # to run GPU demo
+export CIL_VERSION=19.10.1 (Unix) / set CIL_VERSION=19.10 (Windows)
+conda build recipe/ --numpy 1.15 --python 3.7
+conda install ccpi-regulariser=${CIL_VERSION} --use-local --force-reinstall # doesn't work?
+conda install -c file://${CONDA_PREFIX}/conda-bld/ ccpi-regulariser=${CIL_VERSION} --force-reinstall # try this one
+cd demos/
+python demo_cpu_regularisers.py # to run CPU demo
+python demo_gpu_regularisers.py # to run GPU demo
```
#### Python build