Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/haotianteng/Chiron
Browse files Browse the repository at this point in the history
  • Loading branch information
haotianteng committed Dec 1, 2019
2 parents dac0240 + 3b8aa2b commit a0d3354
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ pip install chiron
This will install Chiron, and [`h5py`](https://github.com/h5py/h5py) (required for reading in `.fast5` files).
Tensorflow need to be install in addition by:
```
pip install tensorflow
pip install tensorflow==1.15
```
or GPU version:
```
pip install tensorflow-gpu
pip install tensorflow-gpu==1.15
```

### Install from Source
Expand All @@ -75,14 +75,14 @@ python setup.py install
```
For CPU-version:
```
pip install tensorflow
pip install tensorflow==1.15
```
For GPU-version(Nvidia GPU required):
Install [CUDA](https://developer.nvidia.com/cuda-toolkit)
Install [cuDNN](https://developer.nvidia.com/cudnn)
Install tensorflow gpu version
```
pip install tensorflow-gpu
pip install tensorflow-gpu==1.15
```
And then add the Chiron into PYTHONPATH,for convinience you can add it to the .bashrc
```
Expand Down
2 changes: 1 addition & 1 deletion chiron/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
#file, You can obtain one at http://mozilla.org/MPL/2.0/.

#Store the version here
__version__ = '0.6.0'
__version__ = '0.6.1'
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
'packaging>=18.0'
]
extras_require={
"tf": ["tensorflow>=1.13.1"],
"tf_gpu": ["tensorflow-gpu>=1.13.1"],
"tf": ["tensorflow==1.15.0"],
"tf_gpu": ["tensorflow-gpu==1.15.0"],
}
exec(open('chiron/_version.py').read())
setup(
Expand Down

0 comments on commit a0d3354

Please sign in to comment.