summaryrefslogtreecommitdiffstats
path: root/Readme.md
diff options
context:
space:
mode:
authordkazanc <dkazanc@hotmail.com>2019-12-13 17:57:21 +0000
committerdkazanc <dkazanc@hotmail.com>2019-12-13 17:57:21 +0000
commit1e9d5bc4ad830ff6ddb3cd9fbb8239d7a93b43be (patch)
tree4b5f18adc97ed89ff8164179f8c8397ccff1676a /Readme.md
parentc9fa02f93c506dcbed963ad5b51202c071e3d53d (diff)
downloadregularization-1e9d5bc4ad830ff6ddb3cd9fbb8239d7a93b43be.tar.gz
regularization-1e9d5bc4ad830ff6ddb3cd9fbb8239d7a93b43be.tar.bz2
regularization-1e9d5bc4ad830ff6ddb3cd9fbb8239d7a93b43be.tar.xz
regularization-1e9d5bc4ad830ff6ddb3cd9fbb8239d7a93b43be.zip
initial modification of NDF
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