diff options
author | 2016-12-08 20:05:49 -0800 | |
---|---|---|
committer | 2016-12-08 20:21:45 -0800 | |
commit | 1cb96893a64f59b7265f9def9968f7bed1e57662 (patch) | |
tree | 0e6d595a0806028f5f92e64c84342ae9659ca108 /tensorflow/g3doc/api_docs/python/contrib.util.md | |
parent | 90b72f4b2f07a0126efb110d8d4cc96386fcc968 (diff) |
Merge changes from github.
Additionally:
- change single quotes to double quotes to make path rewriting easier
- guard windows lib reference with PLATFORM_WINDOWS
- fixed failing kmeans test
Change: 141515942
Diffstat (limited to 'tensorflow/g3doc/api_docs/python/contrib.util.md')
-rw-r--r-- | tensorflow/g3doc/api_docs/python/contrib.util.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tensorflow/g3doc/api_docs/python/contrib.util.md b/tensorflow/g3doc/api_docs/python/contrib.util.md index b46595d5d1..103b2088d7 100644 --- a/tensorflow/g3doc/api_docs/python/contrib.util.md +++ b/tensorflow/g3doc/api_docs/python/contrib.util.md @@ -43,7 +43,7 @@ permits static shape optimizations. - - - -### `tf.contrib.util.make_tensor_proto(values, dtype=None, shape=None)` {#make_tensor_proto} +### `tf.contrib.util.make_tensor_proto(values, dtype=None, shape=None, verify_shape=False)` {#make_tensor_proto} Create a TensorProto. @@ -53,6 +53,7 @@ Create a TensorProto. * <b>`values`</b>: Values to put in the TensorProto. * <b>`dtype`</b>: Optional tensor_pb2 DataType value. * <b>`shape`</b>: List of integers representing the dimensions of tensor. +* <b>`verify_shape`</b>: Boolean that enables verification of a shape of values. ##### Returns: @@ -65,7 +66,8 @@ Create a TensorProto. * <b>`TypeError`</b>: if unsupported types are provided. -* <b>`ValueError`</b>: if arguments have inappropriate values. +* <b>`ValueError`</b>: if arguments have inappropriate values or if verify_shape is + True and shape of values is not equals to a shape from the argument. make_tensor_proto accepts "values" of a python scalar, a python list, a numpy ndarray, or a numpy scalar. |