10000 Merge commit for internal changes · CJavaScala/tensorflow@0b1db1c · GitHub
[go: up one dir, main page]
Skip to content

Commit 0b1db1c

Browse files
author
Vijay Vasudevan
committed
Merge commit for internal changes
2 parents 06feca0 + 9aa8a1d commit 0b1db1c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+180
-160
lines changed

‎bower.BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# AUTOGENERATED FILE by tensorboard_bower_dependency_sync.py
22

3-
package(default_visibility = ["//tensorflow:internal"])
3+
package(default_visibility = ["//visibility:public"])
44

55
filegroup(
66
name = "iron-ajax",

‎tensorflow/core/common_runtime/kernel_benchmark_testlib.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,13 @@ limitations under the License.
3333
#include "tensorflow/core/public/version.h"
3434
#include "tensorflow/core/util/device_name_utils.h"
3535

36-
#if defined(PLATFORM_GOOGLE)
37-
DECLARE_bool(brain_gpu_use_bfc_allocator);
38-
#else
39-
extern bool FLAGS_brain_gpu_use_bfc_allocator;
40-
#endif
41-
4236
namespace tensorflow {
4337
namespace test {
4438

4539
Benchmark::Benchmark(const string& device, Graph* g,
4640
const SessionOptions* options, Graph* init) {
4741
RequireDefaultOps();
4842

49-
FLAGS_brain_gpu_use_bfc_allocator = true;
50-
5143
SessionOptions default_options;
5244
if (!options) {
5345
options = &default_options;

‎tensorflow/core/kernels/cwise_op_equal_to.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ limitations under the License.
1616
#include "tensorflow/core/kernels/cwise_ops_common.h"
1717

1818
namespace tensorflow {
19-
REGISTER5(BinaryOp, CPU, "Equal", functor::equal_to, float, double, int32,
20-
int64, complex64);
19+
REGISTER8(BinaryOp, CPU, "Equal", functor::equal_to, float, double, uint8, int8,
20+
int16, int32, int64, complex64);
2121
#if GOOGLE_CUDA
22-
REGISTER3(BinaryOp, GPU, "Equal", functor::equal_to, float, double, int64);
22+
REGISTER6(BinaryOp, GPU, "Equal", functor::equal_to, float, double, uint8, int8,
23+
int16, int64);
2324
#endif
2425

2526
// A special GPU kernel for int32.

‎tensorflow/core/kernels/cwise_op_gpu_equal_to.cu.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ limitations under the License.
1919

2020
namespace tensorflow {
2121
namespace functor {
22-
DEFINE_BINARY4(equal_to, float, double, int64, complex64);
22+
DEFINE_BINARY7(equal_to, float, double, uint8, int8, int16, int64, complex64);
2323
} // namespace functor
2424
} // namespace tensorflow
2525

‎tensorflow/core/kernels/cwise_op_gpu_greater.cu.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ limitations under the License.
1919

2020
namespace tensorflow {
2121
namespace functor {
22-
DEFINE_BINARY3(greater, float, double, int64);
22+
DEFINE_BINARY6(greater, float, double, int64, uint8, int8, int16);
2323
} // namespace functor
2424
} // namespace tensorflow
2525

‎tensorflow/core/kernels/cwise_op_gpu_greater_equal.cu.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ limitations under the License.
1919

2020
namespace tensorflow {
2121
namespace functor {
22-
DEFINE_BINARY3(greater_equal, float, double, int64);
22+
DEFINE_BINARY6(greater_equal, float, double, int64, uint8, int8, int16);
2323
} // namespace functor
2424
} // namespace tensorflow
2525

‎tensorflow/core/kernels/cwise_op_gpu_less.cu.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ limitations under the License.
1919

2020
namespace tensorflow {
2121
namespace functor {
22-
DEFINE_BINARY3(less, float, double, int64);
22+
DEFINE_BINARY6(less, float, double, int64, uint8, int8, int16);
2323
} // namespace functor
2424
} // namespace tensorflow
2525

‎tensorflow/core/kernels/cwise_op_gpu_less_equal.cu.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ limitations under the License.
1919

2020
namespace tensorflow {
2121
namespace functor {
22-
DEFINE_BINARY3(less_equal, float, double, int64);
22+
DEFINE_BINARY6(less_equal, float, double, int64, uint8, int8, int16);
2323
} // namespace functor
2424
} // namespace tensorflow
2525

‎tensorflow/core/kernels/cwise_op_gpu_not_equal_to.cu.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ limitations under the License.
1919

2020
namespace tensorflow {
2121
namespace functor {
22-
DEFINE_BINARY4(not_equal_to, float, double, int64, complex64);
22+
DEFINE_BINARY7(not_equal_to, float, double, uint8, int8, int16, int64,
23+
complex64);
2324
} // namespace functor
2425
} // namespace tensorflow
2526

‎tensorflow/core/kernels/cwise_op_greater.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ limitations under the License.
1616
#include "tensorflow/core/kernels/cwise_ops_common.h"
1717

1818
namespace tensorflow {
19-
REGISTER4(BinaryOp, CPU, "Greater", functor::greater, float, double, int32,
20-
int64);
19+
REGISTER7(BinaryOp, CPU, "Greater", functor::greater, float, double, int32,
20+
int64, uint8, int8, int16);
2121
#if GOOGLE_CUDA
22-
REGISTER3(BinaryOp, GPU, "Greater", functor::greater, float, double, int64);
22+
REGISTER6(BinaryOp, GPU, "Greater", functor::greater, float, double, int64,
23+
uint8, int8, int16);
2324
#endif
2425

2526
// A special GPU kernel for int32.

‎tensorflow/core/kernels/cwise_op_greater_equal.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ limitations under the License.
1616
#include "tensorflow/core/kernels/cwise_ops_common.h"
1717

1818
namespace tensorflow {
19-
REGISTER4(BinaryOp, CPU, "GreaterEqual", functor::greater_equal, float, double,
20-
int32, int64);
19+
REGISTER7(BinaryOp, CPU, "GreaterEqual", functor::greater_equal, float, double,
20+
int32, int64, uint8, int8, int16);
2121
#if GOOGLE_CUDA
22-
REGISTER3(BinaryOp, GPU, "GreaterEqual", functor::greater_equal, float, double,
23-
int64);
22+
REGISTER6(BinaryOp, GPU, "GreaterEqual", functor::greater_equal, float, double,
23+
int64, uint8, int8, int16);
2424
#endif
2525

2626
// A special GPU kernel for int32.

‎tensorflow/core/kernels/cwise_op_less.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ limitations under the License.
1616
#include "tensorflow/core/kernels/cwise_ops_common.h"
1717

1818
namespace tensorflow {
19-
REGISTER4(BinaryOp, CPU, "Less", functor::less, float, double, int32, int64);
19+
REGISTER7(BinaryOp, CPU, "Less", functor::less, float, double, int32, int64,
20+
uint8, int8, int16);
2021
#if GOOGLE_CUDA
21-
REGISTER3(BinaryOp, GPU, "Less", functor::less, float, double, int64);
22+
REGISTER6(BinaryOp, GPU, "Less", functor::less, float, double, int64, uint8,
23+
int8, int16);
2224
#endif
2325

2426
// A special GPU kernel for int32.

‎tensorflow/core/kernels/cwise_op_less_equal.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ limitations under the License.
1616
#include "tensorflow/core/kernels/cwise_ops_common.h"
1717

1818
namespace tensorflow {
19-
REGISTER4(BinaryOp, CPU, "LessEqual", functor::less_equal, float, double, int32,
20-
int64);
19+
REGISTER7(BinaryOp, CPU, "LessEqual", functor::less_equal, float, double, int32,
20+
int64, uint8, int8, int16);
2121
#if GOOGLE_CUDA
22-
REGISTER3(BinaryOp, GPU, "LessEqual", functor::less_equal, float, double,
23-
int64);
22+
REGISTER6(BinaryOp, GPU, "LessEqual", functor::less_equal, float, double, int64,
23+
uint8, int8, int16);
2424
#endif
2525

2626
// A special GPU kernel for int32.

‎tensorflow/core/kernels/cwise_op_not_equal_to.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ limitations under the License.
1616
#include "tensorflow/core/kernels/cwise_ops_common.h"
1717

1818
namespace tensorflow {
19-
REGISTER5(BinaryOp, CPU, "NotEqual", functor::not_equal_to, float, double,
20-
int32, int64, complex64);
19+
REGISTER8(BinaryOp, CPU, "NotEqual", functor::not_equal_to, float, double,
20+
uint8, int8, int16, int32, int64, complex64);
2121
#if GOOGLE_CUDA
22-
REGISTER3(BinaryOp, GPU, "NotEqual", functor::not_equal_to, float, double,
23-
int64);
22+
REGISTER6(BinaryOp, GPU, "NotEqual", functor::not_equal_to, float, double,
23+
uint8, int8, int16, int64);
2424
#endif
2525
} // namespace tensorflow

‎tensorflow/core/ops/math_ops.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -375,9 +375,8 @@ tf.pow(x, y) ==> [[256, 65536], [9, 27]]
375375

376376
// Declares cwise binary comparison operations signature: 't, 't -> bool,
377377
// where 't has a natural total order.
378-
#define COMPARISON() \
379-
Input("x: T").Input("y: T").Output("z: bool").Attr( \
380-
"T: {float, double, int32, int64}")
378+
#define COMPARISON() \
379+
Input("x: T").Input("y: T").Output("z: bool").Attr("T: realnumbertype")
381380

382381
REGISTER_OP("Less")
383382
.COMPARISON()
@@ -409,7 +408,8 @@ Returns the truth value of (x >= y) element-wise.
409408

410409
#define COMPARISON() \
411410
Input("x: T").Input("y: T").Output("z: bool").SetIsCommutative().Attr( \
412-
"T: {float, double, int32, int64, complex64, quint8, qint8, qint32}")
411+
"T: {float, double, uint8, int8, int16, int32, int64, complex64, " \
412+
"quint8, qint8, qint32}")
413413

414414
REGISTER_OP("Equal")
415415
.COMPARISON()

‎tensorflow/core/ops/ops.pbtxt

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2400,6 +2400,9 @@ op {
24002400
list {
24012401
type: DT_FLOAT
24022402
type: DT_DOUBLE
2403+
type: DT_UINT8
2404+
type: DT_INT8
2405+
type: DT_INT16
24032406
type: DT_INT32
24042407
type: DT_INT64
24052408
type: DT_COMPLEX64
@@ -2915,6 +2918,9 @@ op {
29152918
type: DT_DOUBLE
29162919
type: DT_INT32
29172920
type: DT_INT64
2921+
type: DT_UINT8
2922+
type: DT_INT16
2923+
type: DT_INT8
29182924
}
29192925
}
29202926
}
@@ -2943,6 +2949,9 @@ op {
29432949
type: DT_DOUBLE
29442950
type: DT_INT32
29452951
type: DT_INT64
2952+
type: DT_UINT8
2953+
type: DT_INT16
2954+
type: DT_INT8
29462955
}
29472956
}
29482957
}
@@ -3037,7 +3046,7 @@ op {
30373046
}
30383047
}
30393048
summary: "Outputs a `Summary` protocol buffer with a histogram."
3040-
description: "The generated\n[`Summary`](https://www.tensorflow.org/code/tensorflow/core/framework/summary.proto)\nhas one summary value containing a histogram for `values`.\n\nThis op reports an `OutOfRange` error if any value is not finite."
3049+
description: "The generated\n[`Summary`](https://tensorflow.googlesource.com/tensorflow/+/master/tensorflow/core/framework/summary.proto)\nhas one summary value containing a histogram for `values`.\n\nThis op reports an `OutOfRange` error if any value is not finite."
30413050
}
30423051
op {
30433052
name: "IFFT2D"
@@ -3571,6 +3580,9 @@ op {
35713580
type: DT_DOUBLE
35723581
type: DT_INT32
35733582
type: DT_INT64
3583+
type: DT_UINT8
3584+
type: DT_INT16
3585+
type: DT_INT8
35743586
}
35753587
}
35763588
}
@@ -3599,6 +3611,9 @@ op {
35993611
type: DT_DOUBLE
36003612
type: DT_INT32
36013613
type: DT_INT64
3614+
type: DT_UINT8
3615+
type: DT_INT16
3616+
type: DT_INT8
36023617
}
36033618
}
36043619
}
@@ -4385,7 +4400,7 @@ op {
43854400
minimum: 1
43864401
}
43874402
summary: "Merges summaries."
4388-
description: "This op creates a\n[`Summary`](https://www.tensorflow.org/code/tensorflow/core/framework/summary.proto)\nprotocol buffer that contains the union of all the values in the input\nsummaries.\n\nWhen the Op is run, it reports an `InvalidArgument` error if multiple values\nin the summaries to merge use the same tag."
4403+
description: "This op creates a\n[`Summary`](https://tensorflow.googlesource.com/tensorflow/+/master/tensorflow/core/framework/summary.proto)\nprotocol buffer that contains the union of all the values in the input\nsummaries.\n\nWhen the Op is run, it reports an `InvalidArgument` error if multiple values\nin the summaries to merge use the same tag."
43894404
}
43904405
op {
43914406
name: "Min"
@@ -4633,6 +4648,9 @@ op {
46334648
list {
46344649
type: DT_FLOAT
46354650
type: DT_DOUBLE
4651+
type: DT_UINT8
4652+
type: DT_INT8
4653+
type: DT_INT16
46364654
type: DT_INT32
46374655
type: DT_INT64
46384656
type: DT_COMPLEX64

‎tensorflow/core/ops/summary_ops.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ REGISTER_OP("HistogramSummary")
4545
Outputs a `Summary` protocol buffer with a histogram.
4646
4747
The generated
48-
[`Summary`](https://www.tensorflow.org/code/tensorflow/core/framework/summary.proto)
48+
[`Summary`](https://tensorflow.googlesource.com/tensorflow/+/master/tensorflow/core/framework/summary.proto)
4949
has one summary value containing a histogram for `values`.
5050
5151
This op reports an `OutOfRange` error if any value is not finite.
@@ -118,7 +118,7 @@ REGISTER_OP("MergeSummary")
118118
Merges summaries.
119119
120120
This op creates a
121-
[`Summary`](https://www.tensorflow.org/code/tensorflow/core/framework/summary.proto)
121+
[`Summary`](https://tensorflow.googlesource.com/tensorflow/+/master/tensorflow/core/framework/summary.proto)
122122
protocol buffer that contains the union of all the values in the input
123123
summaries.
124124

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ with tf.Session() as sess:
5353
```
5454

5555
The [`ConfigProto`]
56-
(https://www.tensorflow.org/code/tensorflow/core/framework/config.proto)
56+
(https://tensorflow.googlesource.com/tensorflow/+/master/tensorflow/core/framework/config.proto)
5757
protocol buffer exposes various configuration options for a
5858
session. For example, to create a session that uses soft constraints
5959
for device placement, and log the resulting placement decisions,
@@ -87,7 +87,7 @@ the session constructor.
8787
Defaults to using an in-process engine. At present, no value
8888
other than the empty string is supported.
8989
* <b>`graph`</b>: (Optional.) The `Graph` to be launched (described above).
90-
* <b>`config`</b>: (Optional.) A [`ConfigProto`](https://www.tensorflow.org/code/tensorflow/core/framework/config.proto)
90+
* <b>`config`</b>: (Optional.) A [`ConfigProto`](https://tensorflow.googlesource.com/tensorflow/+/master/tensorflow/core/framework/config.proto)
9191
protocol buffer with configuration options for the session.
9292

9393

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ This method is thread-safe.
113113

114114
##### Returns:
115115

116-
A [`GraphDef`](https://www.tensorflow.org/code/tensorflow/core/framework/graph.proto)
116+
A [`GraphDef`](https://tensorflow.googlesource.com/tensorflow/+/master/tensorflow/core/framework/graph.proto)
117117
protocol buffer.
118118

119119
##### Raises:
@@ -570,7 +570,7 @@ Note that this is unrelated to the
570570
The GraphDef version of this graph.
571571

572572
For details on the meaning of each version, see [`GraphDef`]
573-
(https://www.tensorflow.org/code/tensorflow/core/framework/graph.proto).
573+
(https://tensorflow.googlesource.com/tensorflow/+/master/tensorflow/core/framework/graph.proto).
574574

575575

576576

@@ -858,7 +858,7 @@ Returns a serialized `NodeDef` representation of this operation.
858858
##### Returns:
859859

860860
A
861-
[`NodeDef`](https://www.tensorflow.org/code/tensorflow/core/framework/graph.proto)
861+
[`NodeDef`](https://tensorflow.googlesource.com/tensorflow/+/master/tensorflow/core/framework/graph.proto)
862862
protocol buffer.
863863

864864

@@ -871,7 +871,7 @@ Returns the `OpDef` proto that represents the type of this op.
871871
##### Returns:
872872

873873
An
874-
[`OpDef`](https://www.tensorflow.org/code/tensorflow/core/framework/op_def.proto)
874+
[`OpDef`](https://tensorflow.googlesource.com/tensorflow/+/master/tensorflow/core/framework/op_def.proto)
875875
protocol buffer.
876876

877877

@@ -1316,7 +1316,7 @@ Converts the given `type_value` to a `DType`.
13161316

13171317
* <b>`type_value`</b>: A value that can be converted to a `tf.DType`
13181318
object. This may currently be a `tf.DType` object, a
1319-
[`DataType` enum](https://www.tensorflow.org/code/tensorflow/core/framework/types.proto),
1319+
[`DataType` enum](https://tensorflow.googlesource.com/tensorflow/+/master/tensorflow/core/framework/types.proto),
13201320
a string type name, or a `numpy.dtype`.
13211321

13221322
##### Returns:
@@ -1518,7 +1518,7 @@ after calling this function will result in undefined behavior.
15181518
Imports the TensorFlow graph in `graph_def` into the Python `Graph`.
15191519

15201520
This function provides a way to import a serialized TensorFlow
1521-
[`GraphDef`](https://www.tensorflow.org/code/tensorflow/core/framework/graph.proto)
1521+
[`GraphDef`](https://tensorflow.googlesource.com/tensorflow/+/master/tensorflow/core/framework/graph.proto)
15221522
protocol buffer, and extract individual objects in the `GraphDef` as
15231523
[`Tensor`](#Tensor) and [`Operation`](#Operation) objects. See
15241524
[`Graph.as_graph_def()`](#Graph.as_graph_def) for a way to create a

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,9 +1049,9 @@ Reinterpret the bytes of a string as a vector of numbers.
10491049
TensorFlow's [recommended format for training
10501050
examples](../../how_tos/reading_data/index.md#standard-tensorflow-format)
10511051
is serialized `Example` protocol buffers, [described
1052-
here](https://www.tensorflow.org/code/tensorflow/core/example/example.proto).
1052+
here](https://tensorflow.googlesource.com/tensorflow/+/master/tensorflow/core/example/example.proto).
10531053
They contain `Features`, [described
1054-
here](https://www.tensorflow.org/code/tensorflow/core/example/feature.proto).
1054+
here](https://tensorflow.googlesource.com/tensorflow/+/master/tensorflow/core/example/feature.proto).
10551055

10561056
- - -
10571057

@@ -1148,7 +1148,7 @@ Alias for field number 0
11481148
Parses `Example` protos into a `dict` of tensors.
11491149

11501150
Parses a number of serialized [`Example`]
1151-
(https://www.tensorflow.org/code/tensorflow/core/example/example.proto)
1151+
(https://tensorflow.googlesource.com/tensorflow/+/master/tensorflow/core/example/example.proto)
11521152
protos given in `serialized`.
11531153

11541154
`example_names` may contain descriptive names for the corresponding serialized

0 commit comments

Comments
 (0)
0