TensorFlow: Upstream latest changes to Git.

Changes:
- Updates to installation instructions.
- Updates to documentation.
- Minor modifications and tests for word2vec.

Base CL: 107284192

Author: keveman

README.md

@@ -11,7 +11,66 @@ organization for the purposes of conducting machine learning and deep neural
 networks research.  The system is general enough to be applicable in a wide
 variety of other domains, as well.
 
+# Download and Setup
+
+For detailed installation instructions, see
+[here](g3doc/get_started/os_setup.md).
+
+## Binary Installation
+
+### Ubuntu/Linux
+
+Make sure you have [pip](https://pypi.python.org/pypi/pip) installed:
+
+```sh
+$ sudo apt-get install python-pip
+```
+
+Install TensorFlow:
+
+```sh
+# 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
+$ sudo pip install https://storage.googleapis.com/tensorflow/linux/gpu/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
+```
+
+### Try your first TensorFlow program
+
+```sh
+$ python
+
+>>> import tensorflow as tf
+>>> hello = tf.constant('Hello, TensorFlow!')
+>>> sess = tf.Session()
+>>> print sess.run(hello)
+Hello, TensorFlow!
+>>> a = tf.constant(10)
+>>> b = tf.constant(32)
+>>> print sess.run(a+b)
+42
+>>>
+
+```
+
+
 ##For more information
 
-* [Installation and setup instructions](/tensorflow/g3doc/get_started/os_setup.md)
 * [TensorFlow website](http://tensorflow.org)

tensorflow/core/framework/tensor.proto

@@ -10,7 +10,7 @@ import "tensorflow/core/framework/types.proto";
 message TensorProto {
   DataType dtype = 1;
 
-  // Shape of the tensor.  TODO(mdevin): sort out the 0-rank issues.
+  // Shape of the tensor.  TODO(touts): sort out the 0-rank issues.
   TensorShapeProto tensor_shape = 2;
 
   // Only one of the representations below is set, one of "tensor_contents" and

tensorflow/core/kernels/softmax_op.h

@@ -46,7 +46,7 @@ struct SoftmaxEigenImpl {
     Eigen::IndexList<Eigen::type2index<1>, int> one_by_class;
     one_by_class.set(1, num_classes);
 #endif
-    // NOTE(mdevin): If you modify this implementation please run
+    // NOTE(touts): If you modify this implementation please run
     // the ImageNetSoftmaxFwd benchmark in core_ops_test.cc.
     //
     // softmax = exp(logits - max(logits along classes));

tensorflow/core/kernels/xent_op.h

@@ -35,7 +35,7 @@ struct XentEigenImpl {
                       typename TTypes<T>::Matrix scratch,
                       typename TTypes<T>::Vec loss,
                       typename TTypes<T>::Matrix backprop) {
-    // NOTE(mdevin): This duplicates some of the computations in softmax_op
+    // NOTE(touts): This duplicates some of the computations in softmax_op
     // because we need the intermediate (logits -max(logits)) values to
     // avoid a log(exp()) in the computation of the loss.
 

tensorflow/core/lib/histogram/histogram.h

@@ -97,7 +97,7 @@ class ThreadSafeHistogram {
 
   void Clear();
 
-  // TODO(mdevin): It might be a good idea to provide a AddN(<many values>)
+  // TODO(touts): It might be a good idea to provide a AddN(<many values>)
   // method to avoid grabbing/releasing the lock when adding many values.
   void Add(double value);
 

tensorflow/core/public/tensor_shape.h

@@ -63,7 +63,7 @@ class TensorShape {
 
   /// \brief Returns the number of elements in dimension "d".
   /// REQUIRES: "0 <= d < dims()"
-  // TODO(mdevin): Rename to dimension() to match Eigen::Tensor::dimension()?
+  // TODO(touts): Rename to dimension() to match Eigen::Tensor::dimension()?
   int64 dim_size(int d) const {
     DCHECK_GE(d, 0);
     DCHECK_LT(d, dims());

tensorflow/core/util/event.proto

@@ -12,7 +12,7 @@ message Event {
   // Timestamp of the event.
   double wall_time = 1;
 
-  // Globale step of the event.
+  // Global step of the event.
   int64 step = 2;
 
   oneof what {

tensorflow/examples/android/README.md

@@ -20,7 +20,6 @@ installed the NDK and SDK. Otherwise an error such as:
 "The external label '//external:android/sdk' is not bound to anything" will
 be reported.
 
-
 To build the APK, run this from your workspace root:
 ```
 bazel build //tensorflow/examples/android:tensorflow_demo -c opt --copt=-mfpu=neon
@@ -29,11 +28,19 @@ Note that "-c opt" is currently required; if not set, an assert (for an
 otherwise non-problematic issue) in Eigen will halt the application during
 execution. This issue will be corrected in an upcoming release.
 
-If adb debugging is enabled on your device, you may instead use the following
-command from your workspace root to automatically build and install:
+If adb debugging is enabled on your Android 5.0 or later device, you may then
+use the following command from your workspace root to install the APK once
+built:
+'''
+adb install -r -g bazel-bin/tensorflow/examples/android/tensorflow_demo_incremental.apk
+'''
+
+Alternatively, a streamlined means of building, installing and running in one
+command is:
 ```
-bazel mobile-install //tensorflow/examples/android:tensorflow_demo -c opt --copt=-mfpu=neon
+bazel mobile-install //tensorflow/examples/android:tensorflow_demo -c opt --start_app --copt=-mfpu=neon
 ```
 
-Add the "--start_app" flag if you wish to automatically start the app after
-installing. Otherwise, find the application icon labeled "Tensorflow Demo".
+If camera permission errors are encountered (possible on Android Marshmallow or
+above), then the adb install command above should be used instead, as it
+automatically grants the required camera permissions with '-g'.

tensorflow/g3doc/api_docs/index.md

@@ -9,7 +9,7 @@ Over time, we hope that the TensorFlow community will develop front ends for
 languages like Go, Java, Javascript, Lua R, and perhaps others. With SWIG, it's
 relatively easy to contribute a TensorFlow interface to your favorite language.
 
-Note: Many practical aspects of ssage are covered in the Mechanics tab, and
+Note: Many practical aspects of usage are covered in the Mechanics tab, and
 some additional documentation not specific to any particular language API is
 available in the Resources tab.
 

tensorflow/g3doc/api_docs/python/array_ops.md

@@ -1,6 +1,10 @@
 <!-- This file is machine generated: DO NOT EDIT! -->
 
 # Tensor Transformations
+
+Note: Functions taking `Tensor` arguments can also take anything
+accepted by [`tf.convert_to_tensor`](framework.md#convert_to_tensor).
+
 <!-- TOC-BEGIN This section is generated by neural network: DO NOT EDIT! -->
 ## Contents
 * [Casting](#AUTOGENERATED-casting)