Skip to content

Commit 71cd3de

Browse files
gunangunan
authored
Merge branch 'r0.12' into cp
2 parents ec49762 + 5eb9382 commit 71cd3de

File tree

13 files changed

+492
-470
lines changed

13 files changed

+492
-470
lines changed

‎tensorflow/g3doc/api_docs/python/framework.md‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2862,17 +2862,6 @@ The following standard keys are defined:
28622862
* `WEIGHTS`: weights inside neural network layers
28632863
* `BIASES`: biases inside neural network layers
28642864
* `ACTIVATIONS`: activations of neural network layers
2865-
- - -
2866-
2867-
#### `tf.GraphKeys.VARIABLES` {#GraphKeys.VARIABLES}
2868-
2869-
DEPRECATED FUNCTION
2870-
2871-
THIS FUNCTION IS DEPRECATED. It will be removed after 2017-03-02.
2872-
Instructions for updating:
2873-
VARIABLES collection name is deprecated, please use GLOBAL_VARIABLES instead
2874-
2875-
28762865

28772866

28782867
## Defining new operations

‎tensorflow/g3doc/api_docs/python/functions_and_classes/shard1/tf.all_variables.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
See `tf.global_variables`. (deprecated)
44

5-
THIS FUNCTION IS DEPRECATED. It will be removed after 2016-03-02.
5+
THIS FUNCTION IS DEPRECATED. It will be removed after 2017-03-02.
66
Instructions for updating:
77
Please use tf.global_variables instead.
88

‎tensorflow/g3doc/api_docs/python/functions_and_classes/shard1/tf.merge_all_summaries.md‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
### `tf.merge_all_summaries(key='summaries')` {#merge_all_summaries}
1+
### `tf.merge_all_summaries(*args, **kwargs)` {#merge_all_summaries}
22

3-
Merges all summaries collected in the default graph.
3+
Merges all summaries collected in the default graph. (deprecated)
44

5-
##### Args:
5+
THIS FUNCTION IS DEPRECATED. It will be removed after 2016-11-30.
6+
Instructions for updating:
7+
Please switch to tf.summary.merge_all.
68

9+
Args:
10+
key: `GraphKey` used to collect the summaries. Defaults to
11+
`GraphKeys.SUMMARIES`.
712

8-
* <b>`key`</b>: `GraphKey` used to collect the summaries. Defaults to
9-
`GraphKeys.SUMMARIES`.
10-
11-
##### Returns:
12-
13-
If no summaries were collected, returns None. Otherwise returns a scalar
14-
`Tensor` of type `string` containing the serialized `Summary` protocol
15-
buffer resulting from the merging.
13+
Returns:
14+
If no summaries were collected, returns None. Otherwise returns a scalar
15+
`Tensor` of type `string` containing the serialized `Summary` protocol
16+
buffer resulting from the merging.
1617

‎tensorflow/g3doc/api_docs/python/functions_and_classes/shard2/tf.image_summary.md‎

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,49 @@
1-
### `tf.image_summary(tag, tensor, max_images=3, collections=None, name=None)` {#image_summary}
2-
3-
Outputs a `Summary` protocol buffer with images.
4-
5-
The summary has up to `max_images` summary values containing images. The
6-
images are built from `tensor` which must be 4-D with shape `[batch_size,
7-
height, width, channels]` and where `channels` can be:
8-
9-
* 1: `tensor` is interpreted as Grayscale.
10-
* 3: `tensor` is interpreted as RGB.
11-
* 4: `tensor` is interpreted as RGBA.
12-
13-
The images have the same number of channels as the input tensor. For float
14-
input, the values are normalized one image at a time to fit in the range
15-
`[0, 255]`. `uint8` values are unchanged. The op uses two different
16-
normalization algorithms:
17-
18-
* If the input values are all positive, they are rescaled so the largest one
19-
is 255.
20-
21-
* If any input value is negative, the values are shifted so input value 0.0
22-
is at 127. They are then rescaled so that either the smallest value is 0,
23-
or the largest one is 255.
24-
25-
The `tag` argument is a scalar `Tensor` of type `string`. It is used to
26-
build the `tag` of the summary values:
27-
28-
* If `max_images` is 1, the summary value tag is '*tag*/image'.
29-
* If `max_images` is greater than 1, the summary value tags are
30-
generated sequentially as '*tag*/image/0', '*tag*/image/1', etc.
31-
32-
##### Args:
33-
34-
35-
* <b>`tag`</b>: A scalar `Tensor` of type `string`. Used to build the `tag`
36-
of the summary values.
37-
* <b>`tensor`</b>: A 4-D `uint8` or `float32` `Tensor` of shape `[batch_size, height,
38-
width, channels]` where `channels` is 1, 3, or 4.
39-
* <b>`max_images`</b>: Max number of batch elements to generate images for.
40-
* <b>`collections`</b>: Optional list of ops.GraphKeys. The collections to add the
41-
summary to. Defaults to [ops.GraphKeys.SUMMARIES]
42-
* <b>`name`</b>: A name for the operation (optional).
43-
44-
##### Returns:
45-
46-
A scalar `Tensor` of type `string`. The serialized `Summary` protocol
47-
buffer.
1+
### `tf.image_summary(*args, **kwargs)` {#image_summary}
2+
3+
Outputs a `Summary` protocol buffer with images. (deprecated)
4+
5+
THIS FUNCTION IS DEPRECATED. It will be removed after 2016-11-30.
6+
Instructions for updating:
7+
Please switch to tf.summary.image. Note that tf.summary.histogram uses the node name instead of the tag. This means that TensorFlow will automatically de-duplicate summary names based on the scope they are created in. Also, the max_images argument was renamed to max_outputs.
8+
9+
The summary has up to `max_images` summary values containing images. The
10+
images are built from `tensor` which must be 4-D with shape `[batch_size,
11+
height, width, channels]` and where `channels` can be:
12+
13+
* 1: `tensor` is interpreted as Grayscale.
14+
* 3: `tensor` is interpreted as RGB.
15+
* 4: `tensor` is interpreted as RGBA.
16+
17+
The images have the same number of channels as the input tensor. For float
18+
input, the values are normalized one image at a time to fit in the range
19+
`[0, 255]`. `uint8` values are unchanged. The op uses two different
20+
normalization algorithms:
21+
22+
* If the input values are all positive, they are rescaled so the largest one
23+
is 255.
24+
25+
* If any input value is negative, the values are shifted so input value 0.0
26+
is at 127. They are then rescaled so that either the smallest value is 0,
27+
or the largest one is 255.
28+
29+
The `tag` argument is a scalar `Tensor` of type `string`. It is used to
30+
build the `tag` of the summary values:
31+
32+
* If `max_images` is 1, the summary value tag is '*tag*/image'.
33+
* If `max_images` is greater than 1, the summary value tags are
34+
generated sequentially as '*tag*/image/0', '*tag*/image/1', etc.
35+
36+
Args:
37+
tag: A scalar `Tensor` of type `string`. Used to build the `tag`
38+
of the summary values.
39+
tensor: A 4-D `uint8` or `float32` `Tensor` of shape `[batch_size, height,
40+
width, channels]` where `channels` is 1, 3, or 4.
41+
max_images: Max number of batch elements to generate images for.
42+
collections: Optional list of ops.GraphKeys. The collections to add the
43+
summary to. Defaults to [ops.GraphKeys.SUMMARIES]
44+
name: A name for the operation (optional).
45+
46+
Returns:
47+
A scalar `Tensor` of type `string`. The serialized `Summary` protocol
48+
buffer.
4849

‎tensorflow/g3doc/api_docs/python/functions_and_classes/shard3/tf.scalar_summary.md‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
### `tf.scalar_summary(tags, values, collections=None, name=None)` {#scalar_summary}
1+
### `tf.scalar_summary(*args, **kwargs)` {#scalar_summary}
22

3-
Outputs a `Summary` protocol buffer with scalar values.
3+
Outputs a `Summary` protocol buffer with scalar values. (deprecated)
44

5-
The input `tags` and `values` must have the same shape. The generated
6-
summary has a summary value for each tag-value pair in `tags` and `values`.
5+
THIS FUNCTION IS DEPRECATED. It will be removed after 2016-11-30.
6+
Instructions for updating:
7+
Please switch to tf.summary.scalar. Note that tf.summary.scalar uses the node name instead of the tag. This means that TensorFlow will automatically de-duplicate summary names based on the scope they are created in. Also, passing a tensor or list of tags to a scalar summary op is no longer supported.
78

8-
##### Args:
9+
The input `tags` and `values` must have the same shape. The generated
10+
summary has a summary value for each tag-value pair in `tags` and `values`.
911

12+
Args:
13+
tags: A `string` `Tensor`. Tags for the summaries.
14+
values: A real numeric Tensor. Values for the summaries.
15+
collections: Optional list of graph collections keys. The new summary op is
16+
added to these collections. Defaults to `[GraphKeys.SUMMARIES]`.
17+
name: A name for the operation (optional).
1018

11-
* <b>`tags`</b>: A `string` `Tensor`. Tags for the summaries.
12-
* <b>`values`</b>: A real numeric Tensor. Values for the summaries.
13-
* <b>`collections`</b>: Optional list of graph collections keys. The new summary op is
14-
added to these collections. Defaults to `[GraphKeys.SUMMARIES]`.
15-
* <b>`name`</b>: A name for the operation (optional).
16-
17-
##### Returns:
18-
19-
A scalar `Tensor` of type `string`. The serialized `Summary` protocol
20-
buffer.
19+
Returns:
20+
A scalar `Tensor` of type `string`. The serialized `Summary` protocol
21+
buffer.
2122

‎tensorflow/g3doc/api_docs/python/functions_and_classes/shard5/tf.histogram_summary.md‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
1-
### `tf.histogram_summary(tag, values, collections=None, name=None)` {#histogram_summary}
1+
### `tf.histogram_summary(*args, **kwargs)` {#histogram_summary}
22

3-
Outputs a `Summary` protocol buffer with a histogram.
3+
Outputs a `Summary` protocol buffer with a histogram. (deprecated)
44

5-
The generated
6-
[`Summary`](https://www.tensorflow.org/code/tensorflow/core/framework/summary.proto)
7-
has one summary value containing a histogram for `values`.
5+
THIS FUNCTION IS DEPRECATED. It will be removed after 2016-11-30.
6+
Instructions for updating:
7+
Please switch to tf.summary.histogram. Note that tf.summary.histogram uses the node name instead of the tag. This means that TensorFlow will automatically de-duplicate summary names based on their scope.
88

9-
This op reports an `InvalidArgument` error if any value is not finite.
9+
The generated
10+
[`Summary`](https://www.tensorflow.org/code/tensorflow/core/framework/summary.proto)
11+
has one summary value containing a histogram for `values`.
1012

11-
##### Args:
13+
This op reports an `InvalidArgument` error if any value is not finite.
1214

15+
Args:
16+
tag: A `string` `Tensor`. 0-D. Tag to use for the summary value.
17+
values: A real numeric `Tensor`. Any shape. Values to use to
18+
build the histogram.
19+
collections: Optional list of graph collections keys. The new summary op is
20+
added to these collections. Defaults to `[GraphKeys.SUMMARIES]`.
21+
name: A name for the operation (optional).
1322

14-
* <b>`tag`</b>: A `string` `Tensor`. 0-D. Tag to use for the summary value.
15-
* <b>`values`</b>: A real numeric `Tensor`. Any shape. Values to use to
16-
build the histogram.
17-
* <b>`collections`</b>: Optional list of graph collections keys. The new summary op is
18-
added to these collections. Defaults to `[GraphKeys.SUMMARIES]`.
19-
* <b>`name`</b>: A name for the operation (optional).
20-
21-
##### Returns:
22-
23-
A scalar `Tensor` of type `string`. The serialized `Summary` protocol
24-
buffer.
23+
Returns:
24+
A scalar `Tensor` of type `string`. The serialized `Summary` protocol
25+
buffer.
2526

‎tensorflow/g3doc/api_docs/python/functions_and_classes/shard5/tf.merge_summary.md‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
1-
### `tf.merge_summary(inputs, collections=None, name=None)` {#merge_summary}
1+
### `tf.merge_summary(*args, **kwargs)` {#merge_summary}
22

3-
Merges summaries.
3+
Merges summaries. (deprecated)
44

5-
This op creates a
6-
[`Summary`](https://www.tensorflow.org/code/tensorflow/core/framework/summary.proto)
7-
protocol buffer that contains the union of all the values in the input
8-
summaries.
5+
THIS FUNCTION IS DEPRECATED. It will be removed after 2016-11-30.
6+
Instructions for updating:
7+
Please switch to tf.summary.merge.
98

10-
When the Op is run, it reports an `InvalidArgument` error if multiple values
11-
in the summaries to merge use the same tag.
9+
This op creates a
10+
[`Summary`](https://www.tensorflow.org/code/tensorflow/core/framework/summary.proto)
11+
protocol buffer that contains the union of all the values in the input
12+
summaries.
1213

13-
##### Args:
14+
When the Op is run, it reports an `InvalidArgument` error if multiple values
15+
in the summaries to merge use the same tag.
1416

17+
Args:
18+
inputs: A list of `string` `Tensor` objects containing serialized `Summary`
19+
protocol buffers.
20+
collections: Optional list of graph collections keys. The new summary op is
21+
added to these collections. Defaults to `[GraphKeys.SUMMARIES]`.
22+
name: A name for the operation (optional).
1523

16-
* <b>`inputs`</b>: A list of `string` `Tensor` objects containing serialized `Summary`
17-
protocol buffers.
18-
* <b>`collections`</b>: Optional list of graph collections keys. The new summary op is
19-
added to these collections. Defaults to `[GraphKeys.SUMMARIES]`.
20-
* <b>`name`</b>: A name for the operation (optional).
21-
22-
##### Returns:
23-
24-
A scalar `Tensor` of type `string`. The serialized `Summary` protocol
25-
buffer resulting from the merging.
24+
Returns:
25+
A scalar `Tensor` of type `string`. The serialized `Summary` protocol
26+
buffer resulting from the merging.
2627

0 commit comments

Comments
 (0)