aboutsummaryrefslogtreecommitdiffhomepage
path: root/README.md
diff options
context:
space:
mode:
authorGravatar Manjunath Kudlur <keveman@gmail.com>2015-11-08 19:23:41 -0800
committerGravatar Manjunath Kudlur <keveman@gmail.com>2015-11-08 19:23:41 -0800
commitd769a3fd306ad5be8e4a118b39394606e360101d (patch)
tree00654c9f97a365db59f48358c7afb508ee88aa45 /README.md
parentb2dc60eaa9c00421293b87824a2047fdcf6fa331 (diff)
TensorFlow: Upstream changes to git.
Changes: - Updates to installation instructions. Base CL: 107352130
Diffstat (limited to 'README.md')
-rw-r--r--README.md42
1 files changed, 15 insertions, 27 deletions
diff --git a/README.md b/README.md
index 575a305bc4..e9fc94c6ec 100644
--- a/README.md
+++ b/README.md
@@ -24,45 +24,34 @@ and discussion.**
# Download and Setup
-To install TensorFlow using a binary package, see the instructions below. For
-more detailed installation instructions, including installing from source, see
+To install the CPU version of TensorFlow using a binary package, see the
+instructions below. For more detailed installation instructions, including
+installing from source, GPU-enabled support, etc., see
[here](tensorflow/g3doc/get_started/os_setup.md).
## Binary Installation
-### Ubuntu/Linux
+The TensorFlow Python API requires Python 2.7.
-Make sure you have [pip](https://pypi.python.org/pypi/pip) installed:
+The simplest way to install TensorFlow is using
+[pip](https://pypi.python.org/pypi/pip) for both Linux and Mac.
-```sh
-$ sudo apt-get install python-pip
-```
+For the GPU-enabled version, or if you encounter installation errors, or for
+more detailed installation instructions, see
+[here](tensorflow/g3doc/get_started/os_setup.md#detailed_install).
-Install TensorFlow:
+### Ubuntu/Linux
-```sh
+```bash
# For CPU-only version
-$ sudo pip install https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-0.5.0-cp27-none-linux_x86_64.whl
-
-# For GPU-enabled version. See detailed install instructions
-# for GPU configuration information.
-$ sudo pip install https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-0.5.0-cp27-none-linux_x86_64.whl
+$ pip install https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-0.5.0-cp27-none-linux_x86_64.whl
```
### Mac OS X
-Make sure you have [pip](https://pypi.python.org/pypi/pip) installed:
-
-If using `easy_install`:
-
-```sh
-$ sudo easy_install pip
-```
-
-Install TensorFlow (only CPU binary version is currently available).
-
-```sh
-$ sudo pip install https://storage.googleapis.com/tensorflow/mac/tensorflow-0.5.0-py2-none-any.whl
+```bash
+# Only CPU-version is available at the moment.
+$ pip install https://storage.googleapis.com/tensorflow/mac/tensorflow-0.5.0-py2-none-any.whl
```
### Try your first TensorFlow program
@@ -83,7 +72,6 @@ Hello, TensorFlow!
```
-
##For more information
* [TensorFlow website](http://tensorflow.org)