diff --git a/README.md b/README.md index 4d6178570..4d7188af1 100644 --- a/README.md +++ b/README.md @@ -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: ``` diff --git a/magenta/tools/magenta-install.sh b/magenta/tools/magenta-install.sh index 26eeac05a..709eaa922 100644 --- a/magenta/tools/magenta-install.sh +++ b/magenta/tools/magenta-install.sh @@ -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 @@ -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 diff --git a/magenta/version.py b/magenta/version.py index a59468c9f..b816d11aa 100644 --- a/magenta/version.py +++ b/magenta/version.py @@ -18,5 +18,5 @@ pulling in all the dependencies in __init__.py. """ -__version__ = '0.1.9' +__version__ = '0.1.10'