Merge changes from github.

Change: 114882676

1 files changed, 42 insertions, 59 deletions

diff --git a/tensorflow/g3doc/api_docs/cc/ClassTensorShape.md b/tensorflow/g3doc/api_docs/cc/ClassTensorShape.md
index 23e7c40397..def4232b9f 100644
--- a/tensorflow/g3doc/api_docs/cc/ClassTensorShape.md
+++ b/tensorflow/g3doc/api_docs/cc/ClassTensorShape.md
@@ -1,57 +1,22 @@
-# Class `tensorflow::TensorShape`
-
-Manages the dimensions of a Tensor and their sizes.
-
-
-
-##Member Summary
-
-* [`tensorflow::TensorShape::TensorShape(gtl::ArraySlice< int64 > dim_sizes)`](#tensorflow_TensorShape_TensorShape)
-  * Construct a ` TensorShape ` from the provided sizes. REQUIRES: `dim_sizes[i] >= 0`
-* [`tensorflow::TensorShape::TensorShape(std::initializer_list< int64 > dim_sizes)`](#tensorflow_TensorShape_TensorShape)
-* [`tensorflow::TensorShape::TensorShape(const TensorShapeProto &proto)`](#tensorflow_TensorShape_TensorShape)
-  * REQUIRES: `IsValid(proto)`
-* [`tensorflow::TensorShape::TensorShape()`](#tensorflow_TensorShape_TensorShape)
-* [`void tensorflow::TensorShape::Clear()`](#void_tensorflow_TensorShape_Clear)
-  * Clear a tensor shape.
-* [`void tensorflow::TensorShape::AddDim(int64 size)`](#void_tensorflow_TensorShape_AddDim)
-  * Add a dimension to the end ("inner-most"). REQUIRES: `size >= 0`
-* [`void tensorflow::TensorShape::AppendShape(const TensorShape &shape)`](#void_tensorflow_TensorShape_AppendShape)
-  * Appends all the dimensions from `shape`.
-* [`void tensorflow::TensorShape::InsertDim(int d, int64 size)`](#void_tensorflow_TensorShape_InsertDim)
-  * Insert a dimension somewhere in the ` TensorShape `. REQUIRES: `0 <= d <= dims() ` REQUIRES: `size >= 0`
-* [`void tensorflow::TensorShape::set_dim(int d, int64 size)`](#void_tensorflow_TensorShape_set_dim)
-  * Modifies the size of the dimension `d` to be `size` REQUIRES: `0 <= d < dims() ` REQUIRES: `size >= 0`
-* [`void tensorflow::TensorShape::RemoveDim(int d)`](#void_tensorflow_TensorShape_RemoveDim)
-  * Removes dimension `d` from the ` TensorShape `. REQUIRES: `0 <= d < dims() `
-* [`int tensorflow::TensorShape::dims() const`](#int_tensorflow_TensorShape_dims)
-  * Return the number of dimensions in the tensor.
-* [`int64 tensorflow::TensorShape::dim_size(int d) const`](#int64_tensorflow_TensorShape_dim_size)
-  * Returns the number of elements in dimension `d`. REQUIRES: `0 <= d < dims() `
-* [`gtl::ArraySlice<int64> tensorflow::TensorShape::dim_sizes() const`](#gtl_ArraySlice_int64_tensorflow_TensorShape_dim_sizes)
-  * Returns sizes of all dimensions.
-* [`int64 tensorflow::TensorShape::num_elements() const`](#int64_tensorflow_TensorShape_num_elements)
-  * Returns the number of elements in the tensor.
-* [`bool tensorflow::TensorShape::IsSameSize(const TensorShape &b) const`](#bool_tensorflow_TensorShape_IsSameSize)
-* [`bool tensorflow::TensorShape::operator==(const TensorShape &b) const`](#bool_tensorflow_TensorShape_operator_)
-* [`void tensorflow::TensorShape::AsProto(TensorShapeProto *proto) const`](#void_tensorflow_TensorShape_AsProto)
-  * Fill `*proto` from `*this`.
-* [`Eigen::DSizes< Eigen::DenseIndex, NDIMS > tensorflow::TensorShape::AsEigenDSizes() const`](#Eigen_DSizes_Eigen_DenseIndex_NDIMS_tensorflow_TensorShape_AsEigenDSizes)
-  * Fill `*dsizes` from `*this`.
-* [`Eigen::DSizes< Eigen::DenseIndex, NDIMS > tensorflow::TensorShape::AsEigenDSizesWithPadding() const`](#Eigen_DSizes_Eigen_DenseIndex_NDIMS_tensorflow_TensorShape_AsEigenDSizesWithPadding)
-* [`TensorShapeIter tensorflow::TensorShape::begin() const`](#TensorShapeIter_tensorflow_TensorShape_begin)
-  * For iterating through the dimensions.
-* [`TensorShapeIter tensorflow::TensorShape::end() const`](#TensorShapeIter_tensorflow_TensorShape_end)
-* [`string tensorflow::TensorShape::DebugString() const`](#string_tensorflow_TensorShape_DebugString)
-  * For error messages.
-* [`string tensorflow::TensorShape::ShortDebugString() const`](#string_tensorflow_TensorShape_ShortDebugString)
-  * Same as DebugString()
-* [`bool tensorflow::TensorShape::IsValid(const TensorShapeProto &proto)`](#bool_tensorflow_TensorShape_IsValid)
-  * Returns `true` iff `proto` is a valid tensor shape.
-* [`Status tensorflow::TensorShape::IsValidShape(const TensorShapeProto &proto)`](#Status_tensorflow_TensorShape_IsValidShape)
-* [`string tensorflow::TensorShape::ShortDebugString(const TensorShapeProto &proto)`](#string_tensorflow_TensorShape_ShortDebugString)
-
-##Member Details
+# `class tensorflow::TensorShape`
+
+
+
+
+
+###Member Details
+
+#### `uint8 tensorflow::TensorShape::buf[16][16]` {#uint8_tensorflow_TensorShape_buf_16_}
+
+
+
+
+
+#### `Rep64* tensorflow::TensorShape::unused_aligner` {#Rep64_tensorflow_TensorShape_unused_aligner}
+
+
+
+
 
 #### `tensorflow::TensorShape::TensorShape(gtl::ArraySlice< int64 > dim_sizes)` {#tensorflow_TensorShape_TensorShape}
 
@@ -77,6 +42,24 @@ REQUIRES: `IsValid(proto)`
 
 Create a tensor shape with no dimensions and one element, which you can then call ` AddDim() ` on.
 
+#### `tensorflow::TensorShape::~TensorShape()` {#tensorflow_TensorShape_TensorShape}
+
+
+
+
+
+#### `tensorflow::TensorShape::TensorShape(const TensorShape &b)` {#tensorflow_TensorShape_TensorShape}
+
+Copy the specified shape.
+
+
+
+#### `void tensorflow::TensorShape::operator=(const TensorShape &b)` {#void_tensorflow_TensorShape_operator_}
+
+
+
+
+
 #### `void tensorflow::TensorShape::Clear()` {#void_tensorflow_TensorShape_Clear}
 
 Clear a tensor shape.
@@ -125,7 +108,7 @@ Returns the number of elements in dimension `d`. REQUIRES: `0 <= d < dims() `
 
 
 
-#### `gtl::ArraySlice<int64> tensorflow::TensorShape::dim_sizes() const` {#gtl_ArraySlice_int64_tensorflow_TensorShape_dim_sizes}
+#### `gtl::InlinedVector< int64, 4 > tensorflow::TensorShape::dim_sizes() const` {#gtl_InlinedVector_int64_4_tensorflow_TensorShape_dim_sizes}
 
 Returns sizes of all dimensions.
 
@@ -185,9 +168,9 @@ For error messages.
 
 
 
-#### `string tensorflow::TensorShape::ShortDebugString() const` {#string_tensorflow_TensorShape_ShortDebugString}
+#### `void tensorflow::TensorShape::DumpRep() const` {#void_tensorflow_TensorShape_DumpRep}
+
 
-Same as DebugString()
 
 
 
@@ -203,8 +186,8 @@ Returns `true` iff `proto` is a valid tensor shape.
 
 Returns `OK` iff `proto` is a valid tensor shape, and a descriptive error status otherwise.
 
-#### `string tensorflow::TensorShape::ShortDebugString(const TensorShapeProto &proto)` {#string_tensorflow_TensorShape_ShortDebugString}
+#### `string tensorflow::TensorShape::DebugString(const TensorShapeProto &proto)` {#string_tensorflow_TensorShape_DebugString}
 
 
 
-Same as `TensorShape(proto). ShortDebugString() ` but doesn&apos;t crash for invalid protos.
+Same as `TensorShape(proto). DebugString() ` but doesn&apos;t crash for invalid protos.