Updates TF compat protos. (#6532)

Author: arcra

tensorboard/compat/proto/BUILD

@@ -157,6 +157,7 @@ tb_proto_library(
         ":saved_object_graph",
         ":saver",
         ":struct",
+        ":tensor",
         ":tensor_shape",
         ":types",
     ],

tensorboard/compat/proto/cluster.proto

@@ -74,6 +74,9 @@ message JobDef {
   // If the `name` field contains "worker", and the `tasks` map contains a
   // mapping from 7 to "example.org:2222", then the device prefix
   // "/job:worker/task:7" will be assigned to "example.org:2222".
+  //
+  // If a job has multiple replicas, host-ports will be comma-delimited, with
+  // one entry for each replica.
   map<int32, string> tasks = 2;
 }
 

tensorboard/compat/proto/cpp_shape_inference.proto

@@ -9,6 +9,7 @@ import "tensorboard/compat/proto/types.proto";
 option cc_enable_arenas = true;
 option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/python/framework/cpp_shape_inference_go_proto";
 
+// DISABLED.IfChange
 message CppShapeInferenceResult {
   message HandleShapeAndType {
     reserved 3;
@@ -34,3 +35,4 @@ message CppShapeInferenceInputsNeeded {
   repeated int32 input_tensors_needed = 1;
   repeated int32 input_tensors_as_shapes_needed = 2;
 }
+// DISABLED.ThenChange(//tensorboard/compat/proto/cpp_shape_inference.proto)

tensorboard/compat/proto/graph_debug_info.proto

@@ -1,4 +1,4 @@
-syntax = "proto3";
+syntax = "proto2";
 
 package tensorboard;
 
@@ -13,40 +13,49 @@ message GraphDebugInfo {
   message FileLineCol {
     // File name index, which can be used to retrieve the file name string from
     // `files`. The value should be between 0 and (len(files)-1)
-    int32 file_index = 1;
+    optional int32 file_index = 1;
 
     // Line number in the file.
-    int32 line = 2;
+    optional int32 line = 2;
 
     // Col number in the file line.
-    int32 col = 3;
+    optional int32 col = 3;
 
     // Name of function contains the file line.
-    string func = 4;
+    optional string func = 4;
 
     // Source code contained in this file line.
-    string code = 5;
+    optional string code = 5;
   }
 
   // This represents a stack trace which is a ordered list of `FileLineCol`.
   message StackTrace {
-    // Each line in the stack trace.
-    repeated FileLineCol file_line_cols = 1;
+    repeated FileLineCol file_line_cols = 1;  // Deprecated.
+    repeated fixed64 frame_id = 2 [packed = true];
   }
 
   // This stores all the source code file names and can be indexed by the
   // `file_index`.
   repeated string files = 1;
 
-  // This maps a node name to a stack trace in the source code.
+  // Stack traces and frames are uniqueified during construction. These maps
+  // index from the unique id for a frame/trace to the value.
+  map<fixed64, FileLineCol> frames_by_id = 4;
+  map<fixed64, StackTrace> traces_by_id = 6;
+
+  map<string, StackTrace> traces = 2;  // Deprecated.
+
+  // This maps a node name to a trace id contained in `traces_by_id`.
+  //
   // The map key is a mangling of the containing function and op name with
   // syntax:
   //   op.name '@' func_name
-  // For ops in the top-level graph, the func_name is the empty string.
+  // For ops in the top-level graph, the func_name is the empty string and hence
+  // the `@` may be ommitted.
   // Note that op names are restricted to a small number of characters which
   // exclude '@', making it impossible to collide keys of this form. Function
   // names accept a much wider set of characters.
   // It would be preferable to avoid mangling and use a tuple key of (op.name,
   // func_name), but this is not supported with protocol buffers.
-  map<string, StackTrace> traces = 2;
+  map<string, fixed64> name_to_trace_id = 5;
 }

tensorboard/compat/proto/meta_graph.proto

@@ -5,6 +5,7 @@ package tensorboard;
 import "google/protobuf/any.proto";
 import "tensorboard/compat/proto/graph.proto";
 import "tensorboard/compat/proto/op_def.proto";
+import "tensorboard/compat/proto/tensor.proto";
 import "tensorboard/compat/proto/tensor_shape.proto";
 import "tensorboard/compat/proto/types.proto";
 import "tensorboard/compat/proto/saved_object_graph.proto";
@@ -325,6 +326,8 @@ message SignatureDef {
   // method_name. This is commonly used to support multi-headed computation,
   // where a single graph computation may return multiple results.
   string method_name = 3;
+  // Named input to corresponding default values if any.
+  map<string, TensorProto> defaults = 4;
 }
 
 // An asset file def for a single file or a set of sharded files with the same

tensorboard/compat/proto/rewriter_config.proto

@@ -126,6 +126,8 @@ message RewriterConfig {
   Toggle auto_mixed_precision_cpu = 29;
   // Disable the entire meta optimizer (off by default).
   bool disable_meta_optimizer = 19;
+  // Disable the TFG optimizer (off by default).
+  bool disable_tfg_optimizer = 32;
   // Optimizers registered by plugin (default is ON)
   Toggle use_plugin_optimizers = 28;
   // Conditional code motion (default is ON).

tensorboard/compat/proto/struct.proto

@@ -74,6 +74,8 @@ message StructuredValue {
     NamedTupleValue named_tuple_value = 54;
     // Represents a value for tf.Tensor.
     tensorboard.TensorProto tensor_value = 55;
+    // Represents a value for np.ndarray.
+    tensorboard.TensorProto numpy_value = 56;
   }
 }
 

tensorboard/compat/proto/types.proto

@@ -44,8 +44,9 @@ enum DataType {
   DT_FLOAT8_E4M3FN = 25;  // 4 exponent bits, 3 mantissa bits, finite-only, with
                           // 2 NaNs (0bS1111111).
 
-  // Do not use!  These are only for parameters.  Every enum above
-  // should have a corresponding value below (verified by types_test).
+  // Do not use!  These are only for TF1's obsolete reference Variables.
+  // Every enum above should have a corresponding value below (verified by
+  // types_test).
   DT_FLOAT_REF = 101;
   DT_DOUBLE_REF = 102;
   DT_INT32_REF = 103;