Skip to content

Commit

Permalink
Prepare for 0.1.10 release (#560)
Browse files Browse the repository at this point in the history
* Bump version to 0.1.10.

Also switch autoinstaller script to install tensorflow as a part of the
pip depencencies for magenta, rather than downloading a specific .whl
file. Installing via pip is now the recommended installation method.

* Update README.md to install tensorflow via pip.
  • Loading branch information
cghawthorne committed Mar 16, 2017
1 parent eb68273 commit 2a3381d
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 16 deletions.
8 changes: 0 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,6 @@ conda create -n magenta python=2.7 jupyter
source activate magenta
```

Install the
[latest Tensorflow Pip package](https://www.tensorflow.org/get_started/os_setup.html#using-pip)
for Python 2.7. Note that you should skip the step for activating the
`tensorflow` environment because you've already activated your `magenta`
environment above. The important steps are selecting the correct binary
(`export TF_BINARY_URL=...`) and installing that binary
(`pip install --ignore-installed --upgrade $TF_BINARY_URL`).

Install the Magenta pip package:

```
Expand Down
7 changes: 0 additions & 7 deletions magenta/tools/magenta-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,10 @@ if [[ "$(uname)" == "Darwin" ]]; then
echo 'Mac OS Detected'
readonly OS='MAC'
readonly MINICONDA_SCRIPT='Miniconda2-latest-MacOSX-x86_64.sh'
# Mac OS X, CPU only, Python 2.7:
readonly TF_BINARY_URL='https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-0.12.0rc1-py2-none-any.whl'
elif [[ "$(uname)" == "Linux" ]]; then
echo 'Linux OS Detected'
readonly OS='LINUX'
readonly MINICONDA_SCRIPT='Miniconda2-latest-Linux-x86_64.sh'
# Ubuntu/Linux 64-bit, CPU only, Python 2.7
readonly TF_BINARY_URL='https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-0.12.0rc1-cp27-none-linux_x86_64.whl'
else
err 'Detected neither OSX or Linux Operating System'
fi
Expand Down Expand Up @@ -101,9 +97,6 @@ if [[ $(conda info --envs | grep "*" | awk '{print $1}') != "magenta" ]]; then
err 'Did not successfully activate the magenta conda environment'
fi

# Install tensorflow
pip install --ignore-installed --upgrade $TF_BINARY_URL

# Install other dependencies
pip install jupyter magenta

Expand Down
2 changes: 1 addition & 1 deletion magenta/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
pulling in all the dependencies in __init__.py.
"""

__version__ = '0.1.9'
__version__ = '0.1.10'

0 comments on commit 2a3381d

Please sign in to comment.