Automated g4 rollback of changelist 194917415

PiperOrigin-RevId: 194962702

diff --git a/tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt
index 004d716..0fb1aab 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-attr-value.-list-value.pbtxt
@@ -3,6 +3,10 @@ tf_class {
   is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.ListValue\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
+    name: "B_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "DESCRIPTOR"
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
@@ -11,36 +15,32 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "b"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "f"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "FUNC_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "func"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "F_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "i"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "I_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "s"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SHAPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "shape"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "S_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "tensor"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TENSOR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "type"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt
index 2996e02..e7a3a1f 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-attr-value.pbtxt
@@ -3,6 +3,10 @@ tf_class {
   is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.AttrValue\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
+    name: "B_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "DESCRIPTOR"
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
@@ -11,48 +15,44 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "ListValue"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "b"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "FUNC_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "f"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "F_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "func"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "I_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "i"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "list"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "ListValue"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
   member {
-    name: "placeholder"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "PLACEHOLDER_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "s"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SHAPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "shape"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "S_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "tensor"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TENSOR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "type"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt
index c7022e7..29bb3be 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-config-proto.-device-count-entry.pbtxt
@@ -11,12 +11,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "key"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt b/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
index ca9530d..009d64a 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-config-proto.pbtxt
@@ -3,76 +3,76 @@ tf_class {
   is_instance: "<class \'tensorflow.core.protobuf.config_pb2.ConfigProto\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+    name: "ALLOW_SOFT_PLACEMENT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "DeviceCountEntry"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+    name: "CLUSTER_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
   member {
-    name: "allow_soft_placement"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "DEVICE_COUNT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "cluster_def"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "DEVICE_FILTERS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "device_count"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "DeviceCountEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
   member {
-    name: "device_filters"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "gpu_options"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "GPU_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "graph_options"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "GRAPH_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "inter_op_parallelism_threads"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "INTER_OP_PARALLELISM_THREADS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "intra_op_parallelism_threads"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "INTRA_OP_PARALLELISM_THREADS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "isolate_session_state"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "ISOLATE_SESSION_STATE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "log_device_placement"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "LOG_DEVICE_PLACEMENT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "operation_timeout_in_ms"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "OPERATION_TIMEOUT_IN_MS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "placement_period"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "PLACEMENT_PERIOD_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "rpc_options"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "RPC_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "session_inter_op_thread_pool"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SESSION_INTER_OP_THREAD_POOL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "use_per_session_threads"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "USE_PER_SESSION_THREADS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-event.pbtxt b/tensorflow/tools/api/golden/tensorflow.-event.pbtxt
index fa2f329..9bf8c12 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-event.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-event.pbtxt
@@ -11,40 +11,40 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "file_version"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "FILE_VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "graph_def"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "log_message"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "LOG_MESSAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "meta_graph_def"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "META_GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "session_log"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SESSION_LOG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "step"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "STEP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "summary"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SUMMARY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "tagged_run_metadata"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TAGGED_RUN_METADATA_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "wall_time"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "WALL_TIME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
index 5119c7f..875d802 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-g-p-u-options.pbtxt
@@ -3,52 +3,52 @@ tf_class {
   is_instance: "<class \'tensorflow.core.protobuf.config_pb2.GPUOptions\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+    name: "ALLOCATOR_TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "Experimental"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+    name: "ALLOW_GROWTH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
+    name: "DEFERRED_DELETION_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "allocator_type"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
   member {
-    name: "allow_growth"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "EXPERIMENTAL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "deferred_deletion_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "Experimental"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
   member {
-    name: "experimental"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "force_gpu_compatible"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "FORCE_GPU_COMPATIBLE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "per_process_gpu_memory_fraction"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "PER_PROCESS_GPU_MEMORY_FRACTION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "polling_active_delay_usecs"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "POLLING_ACTIVE_DELAY_USECS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "polling_inactive_delay_msecs"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "POLLING_INACTIVE_DELAY_MSECS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "visible_device_list"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VISIBLE_DEVICE_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt
index 318a25a..1495e84 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-graph-def.pbtxt
@@ -11,20 +11,20 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "library"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "LIBRARY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "node"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "NODE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "version"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VERSIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "versions"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt
index 786d831..0844f89 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-graph-options.pbtxt
@@ -3,48 +3,48 @@ tf_class {
   is_instance: "<class \'tensorflow.core.protobuf.config_pb2.GraphOptions\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+    name: "BUILD_COST_MODEL_AFTER_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
+    name: "BUILD_COST_MODEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "build_cost_model"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
   member {
-    name: "build_cost_model_after"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "ENABLE_BFLOAT16_SENDRECV_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "enable_bfloat16_sendrecv"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "ENABLE_RECV_SCHEDULING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "enable_recv_scheduling"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "infer_shapes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "INFER_SHAPES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "optimizer_options"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "OPTIMIZER_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "place_pruned_graph"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "PLACE_PRUNED_GRAPH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "rewrite_options"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "REWRITE_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "timeline_step"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TIMELINE_STEP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt b/tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt
index 3eb2d88..2567d2f 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-histogram-proto.pbtxt
@@ -3,40 +3,40 @@ tf_class {
   is_instance: "<class \'tensorflow.core.framework.summary_pb2.HistogramProto\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+    name: "BUCKET_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
+    name: "BUCKET_LIMIT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "bucket"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
   member {
-    name: "bucket_limit"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "max"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "MAX_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "min"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "MIN_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "num"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "NUM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "sum"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SUM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "sum_squares"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SUM_SQUARES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt b/tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt
index 760739f..a43c5eb 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-log-message.pbtxt
@@ -27,24 +27,24 @@ tf_class {
     mtype: "<type \'int\'>"
   }
   member {
+    name: "LEVEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "Level"
     mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
   }
   member {
-    name: "UNKNOWN"
+    name: "MESSAGE_FIELD_NUMBER"
     mtype: "<type \'int\'>"
   }
   member {
-    name: "WARN"
+    name: "UNKNOWN"
     mtype: "<type \'int\'>"
   }
   member {
-    name: "level"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "message"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "WARN"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-meta-graph-def.-collection-def-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-meta-graph-def.-collection-def-entry.pbtxt
index 69bf5b3..3572126 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-meta-graph-def.-collection-def-entry.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-meta-graph-def.-collection-def-entry.pbtxt
@@ -11,12 +11,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "key"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-meta-graph-def.-meta-info-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.-meta-graph-def.-meta-info-def.pbtxt
index 8a464f1..b0e9831 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-meta-graph-def.-meta-info-def.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-meta-graph-def.-meta-info-def.pbtxt
@@ -3,6 +3,10 @@ tf_class {
   is_instance: "<class \'tensorflow.core.protobuf.meta_graph_pb2.MetaInfoDef\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
+    name: "ANY_INFO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "DESCRIPTOR"
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
@@ -11,32 +15,28 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "any_info"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "meta_graph_version"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "META_GRAPH_VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "stripped_default_attrs"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "STRIPPED_DEFAULT_ATTRS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "stripped_op_list"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "STRIPPED_OP_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "tags"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TAGS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "tensorflow_git_version"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TENSORFLOW_GIT_VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "tensorflow_version"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TENSORFLOW_VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-meta-graph-def.-signature-def-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-meta-graph-def.-signature-def-entry.pbtxt
index 8c5949d..48fccac 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-meta-graph-def.-signature-def-entry.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-meta-graph-def.-signature-def-entry.pbtxt
@@ -11,12 +11,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "key"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-meta-graph-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.-meta-graph-def.pbtxt
index 2be0432..3e683a8 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-meta-graph-def.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-meta-graph-def.pbtxt
@@ -3,6 +3,14 @@ tf_class {
   is_instance: "<class \'tensorflow.core.protobuf.meta_graph_pb2.MetaGraphDef\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
+    name: "ASSET_FILE_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "COLLECTION_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "CollectionDefEntry"
     mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
@@ -15,36 +23,28 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "MetaInfoDef"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "SignatureDefEntry"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
-  }
-  member {
-    name: "asset_file_def"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "collection_def"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "META_INFO_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "graph_def"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "MetaInfoDef"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
   member {
-    name: "meta_info_def"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SAVER_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "saver_def"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SIGNATURE_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "signature_def"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SignatureDefEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt
index caf992f..2750bd7 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.-attr-entry.pbtxt
@@ -11,12 +11,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "key"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt
index 45ddeec..d10faf6 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-name-attr-list.pbtxt
@@ -3,6 +3,10 @@ tf_class {
   is_instance: "<class \'tensorflow.core.framework.attr_value_pb2.NameAttrList\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
+    name: "ATTR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "AttrEntry"
     mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
@@ -15,12 +19,8 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "attr"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt
index 30a9dc6..b1b62d6 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-node-def.-attr-entry.pbtxt
@@ -11,12 +11,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "key"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt
index 23319fd..b812b4d 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-node-def.pbtxt
@@ -3,6 +3,10 @@ tf_class {
   is_instance: "<class \'tensorflow.core.framework.node_def_pb2.NodeDef\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
+    name: "ATTR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "AttrEntry"
     mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
@@ -11,28 +15,24 @@ tf_class {
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
   member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "attr"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "DEVICE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "device"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "input"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "INPUT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "op"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "OP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt
index 57da2e8..6cac5c4 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-optimizer-options.pbtxt
@@ -11,10 +11,26 @@ tf_class {
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
   member {
+    name: "DO_COMMON_SUBEXPRESSION_ELIMINATION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DO_CONSTANT_FOLDING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
+    name: "DO_FUNCTION_INLINING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "Extensions"
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
+    name: "GLOBAL_JIT_LEVEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "GlobalJitLevel"
     mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
   }
@@ -31,6 +47,10 @@ tf_class {
     mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
   }
   member {
+    name: "MAX_FOLDED_CONSTANT_IN_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "OFF"
     mtype: "<type \'int\'>"
   }
@@ -43,28 +63,8 @@ tf_class {
     mtype: "<type \'int\'>"
   }
   member {
-    name: "do_common_subexpression_elimination"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "do_constant_folding"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "do_function_inlining"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "global_jit_level"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "max_folded_constant_in_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "opt_level"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "OPT_LEVEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt b/tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt
index 17b3d88..808fa0f 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-run-metadata.pbtxt
@@ -3,6 +3,10 @@ tf_class {
   is_instance: "<class \'tensorflow.core.protobuf.config_pb2.RunMetadata\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
+    name: "COST_GRAPH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "DESCRIPTOR"
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
@@ -11,16 +15,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "cost_graph"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "partition_graphs"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "PARTITION_GRAPHS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "step_stats"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "STEP_STATS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt b/tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt
index 7470e4b..2f3e7f1 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-run-options.pbtxt
@@ -3,6 +3,10 @@ tf_class {
   is_instance: "<class \'tensorflow.core.protobuf.config_pb2.RunOptions\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
+    name: "DEBUG_OPTIONS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "DESCRIPTOR"
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
@@ -19,40 +23,36 @@ tf_class {
     mtype: "<type \'int\'>"
   }
   member {
-    name: "NO_TRACE"
+    name: "INTER_OP_THREAD_POOL_FIELD_NUMBER"
     mtype: "<type \'int\'>"
   }
   member {
-    name: "SOFTWARE_TRACE"
+    name: "NO_TRACE"
     mtype: "<type \'int\'>"
   }
   member {
-    name: "TraceLevel"
-    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
-  }
-  member {
-    name: "debug_options"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "OUTPUT_PARTITION_GRAPHS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "inter_op_thread_pool"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "REPORT_TENSOR_ALLOCATIONS_UPON_OOM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "output_partition_graphs"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SOFTWARE_TRACE"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "report_tensor_allocations_upon_oom"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TIMEOUT_IN_MS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "timeout_in_ms"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TRACE_LEVEL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "trace_level"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TraceLevel"
+    mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt b/tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt
index 259a305..ec66d7f 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-session-log.pbtxt
@@ -7,6 +7,10 @@ tf_class {
     mtype: "<type \'int\'>"
   }
   member {
+    name: "CHECKPOINT_PATH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "DESCRIPTOR"
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
@@ -15,10 +19,18 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
+    name: "MSG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "START"
     mtype: "<type \'int\'>"
   }
   member {
+    name: "STATUS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "STATUS_UNSPECIFIED"
     mtype: "<type \'int\'>"
   }
@@ -30,18 +42,6 @@ tf_class {
     name: "SessionStatus"
     mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
   }
-  member {
-    name: "checkpoint_path"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "msg"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "status"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
   member_method {
     name: "ByteSize"
   }

diff --git a/tensorflow/tools/api/golden/tensorflow.-summary-metadata.-plugin-data.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary-metadata.-plugin-data.pbtxt
index 3d9ee9e..067f02c 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-summary-metadata.-plugin-data.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-summary-metadata.-plugin-data.pbtxt
@@ -3,6 +3,10 @@ tf_class {
   is_instance: "<class \'tensorflow.core.framework.summary_pb2.PluginData\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
+    name: "CONTENT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "DESCRIPTOR"
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
@@ -11,12 +15,8 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "content"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "plugin_name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "PLUGIN_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-summary-metadata.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary-metadata.pbtxt
index 9c69a2b..b915652 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-summary-metadata.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-summary-metadata.pbtxt
@@ -7,24 +7,24 @@ tf_class {
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
   member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
+    name: "DISPLAY_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "PluginData"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "display_name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "PLUGIN_DATA_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "plugin_data"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "PluginData"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
   member {
-    name: "summary_description"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SUMMARY_DESCRIPTION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt
index 8e761b8..781010d 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-summary.-audio.pbtxt
@@ -3,32 +3,32 @@ tf_class {
   is_instance: "<class \'tensorflow.core.framework.summary_pb2.Audio\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+    name: "CONTENT_TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
   member {
-    name: "content_type"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "ENCODED_AUDIO_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "encoded_audio_string"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "length_frames"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "LENGTH_FRAMES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "num_channels"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "NUM_CHANNELS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "sample_rate"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SAMPLE_RATE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt
index 07b61d9..feb9c7e 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-summary.-image.pbtxt
@@ -3,28 +3,28 @@ tf_class {
   is_instance: "<class \'tensorflow.core.framework.summary_pb2.Image\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+    name: "COLORSPACE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
   member {
-    name: "colorspace"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "ENCODED_IMAGE_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "encoded_image_string"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "height"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "HEIGHT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "width"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "WIDTH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt
index 77ba2e0..ffb4f45 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-summary.-value.pbtxt
@@ -3,6 +3,10 @@ tf_class {
   is_instance: "<class \'tensorflow.core.framework.summary_pb2.Value\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
+    name: "AUDIO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "DESCRIPTOR"
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
@@ -11,40 +15,36 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "audio"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "histo"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "HISTO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "image"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "IMAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "metadata"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "METADATA_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "node_name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "NODE_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "obsolete_old_style_histogram"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "OBSOLETE_OLD_STYLE_HISTOGRAM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "simple_value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SIMPLE_VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "tag"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TAG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "tensor"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TENSOR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-summary.pbtxt b/tensorflow/tools/api/golden/tensorflow.-summary.pbtxt
index 95263bd..38de17f 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-summary.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-summary.pbtxt
@@ -19,12 +19,12 @@ tf_class {
     mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
   member {
-    name: "Value"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "Value"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor-info.-coo-sparse.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor-info.-coo-sparse.pbtxt
index b184831..425c35e 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-tensor-info.-coo-sparse.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-tensor-info.-coo-sparse.pbtxt
@@ -3,6 +3,10 @@ tf_class {
   is_instance: "<class \'tensorflow.core.protobuf.meta_graph_pb2.CooSparse\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
+    name: "DENSE_SHAPE_TENSOR_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "DESCRIPTOR"
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
@@ -11,16 +15,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "dense_shape_tensor_name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "indices_tensor_name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "INDICES_TENSOR_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "values_tensor_name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VALUES_TENSOR_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt b/tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt
index 9fd26d1..41ea393 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.-tensor-info.pbtxt
@@ -3,6 +3,10 @@ tf_class {
   is_instance: "<class \'tensorflow.core.protobuf.meta_graph_pb2.TensorInfo\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
+    name: "COO_SPARSE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "CooSparse"
     mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
@@ -11,24 +15,20 @@ tf_class {
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
   member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "coo_sparse"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "DTYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "dtype"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "tensor_shape"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TENSOR_SHAPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.profiler.-advice-proto.-checker.pbtxt b/tensorflow/tools/api/golden/tensorflow.profiler.-advice-proto.-checker.pbtxt
index 925ea6d..bd5c36f 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.profiler.-advice-proto.-checker.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.profiler.-advice-proto.-checker.pbtxt
@@ -11,8 +11,8 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "reports"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "REPORTS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.profiler.-advice-proto.-checkers-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.profiler.-advice-proto.-checkers-entry.pbtxt
index e7ca821..7c8c68e 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.profiler.-advice-proto.-checkers-entry.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.profiler.-advice-proto.-checkers-entry.pbtxt
@@ -11,12 +11,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "key"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.profiler.-advice-proto.pbtxt b/tensorflow/tools/api/golden/tensorflow.profiler.-advice-proto.pbtxt
index 330d6ee..1b789f4 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.profiler.-advice-proto.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.profiler.-advice-proto.pbtxt
@@ -3,6 +3,10 @@ tf_class {
   is_instance: "<class \'tensorflow.core.profiler.tfprof_output_pb2.AdviceProto\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
+    name: "CHECKERS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "Checker"
     mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
@@ -18,10 +22,6 @@ tf_class {
     name: "Extensions"
     mtype: "<type \'getset_descriptor\'>"
   }
-  member {
-    name: "checkers"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
   member_method {
     name: "ByteSize"
   }

diff --git a/tensorflow/tools/api/golden/tensorflow.profiler.-graph-node-proto.-input-shapes-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.profiler.-graph-node-proto.-input-shapes-entry.pbtxt
index 85aef3e..f0b9605 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.profiler.-graph-node-proto.-input-shapes-entry.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.profiler.-graph-node-proto.-input-shapes-entry.pbtxt
@@ -11,12 +11,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "key"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.profiler.-graph-node-proto.pbtxt b/tensorflow/tools/api/golden/tensorflow.profiler.-graph-node-proto.pbtxt
index 2ecfb6a..b80896a 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.profiler.-graph-node-proto.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.profiler.-graph-node-proto.pbtxt
@@ -3,124 +3,124 @@ tf_class {
   is_instance: "<class \'tensorflow.core.profiler.tfprof_output_pb2.GraphNodeProto\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+    name: "ACCELERATOR_EXEC_MICROS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
+    name: "CHILDREN_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "InputShapesEntry"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+    name: "CPU_EXEC_MICROS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "accelerator_exec_micros"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
   member {
-    name: "children"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "DEVICES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "cpu_exec_micros"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "EXEC_MICROS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "devices"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "exec_micros"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "FLOAT_OPS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "float_ops"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "INPUT_SHAPES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "input_shapes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "InputShapesEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
   member {
-    name: "name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "output_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "OUTPUT_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "parameters"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "PARAMETERS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "peak_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "PEAK_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "requested_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "REQUESTED_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "residual_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "RESIDUAL_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "run_count"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "RUN_COUNT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "shapes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SHAPES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "tensor_value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TENSOR_VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_accelerator_exec_micros"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_ACCELERATOR_EXEC_MICROS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_cpu_exec_micros"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_CPU_EXEC_MICROS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_definition_count"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_DEFINITION_COUNT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_exec_micros"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_EXEC_MICROS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_float_ops"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_FLOAT_OPS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_output_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_OUTPUT_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_parameters"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_PARAMETERS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_peak_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_PEAK_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_requested_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_REQUESTED_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_residual_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_RESIDUAL_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_run_count"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_RUN_COUNT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.profiler.-multi-graph-node-proto.pbtxt b/tensorflow/tools/api/golden/tensorflow.profiler.-multi-graph-node-proto.pbtxt
index b35d0d6..33deff6 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.profiler.-multi-graph-node-proto.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.profiler.-multi-graph-node-proto.pbtxt
@@ -3,96 +3,96 @@ tf_class {
   is_instance: "<class \'tensorflow.core.profiler.tfprof_output_pb2.MultiGraphNodeProto\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+    name: "ACCELERATOR_EXEC_MICROS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
+    name: "CHILDREN_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "accelerator_exec_micros"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "CPU_EXEC_MICROS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "children"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
   member {
-    name: "cpu_exec_micros"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "EXEC_MICROS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "exec_micros"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "float_ops"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "FLOAT_OPS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "graph_nodes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "GRAPH_NODES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "output_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "OUTPUT_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "parameters"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "PARAMETERS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "peak_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "PEAK_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "requested_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "REQUESTED_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "residual_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "RESIDUAL_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_accelerator_exec_micros"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_ACCELERATOR_EXEC_MICROS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_cpu_exec_micros"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_CPU_EXEC_MICROS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_exec_micros"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_EXEC_MICROS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_float_ops"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_FLOAT_OPS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_output_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_OUTPUT_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_parameters"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_PARAMETERS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_peak_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_PEAK_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_requested_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_REQUESTED_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "total_residual_bytes"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TOTAL_RESIDUAL_BYTES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.profiler.-op-log-proto.-id-to-string-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.profiler.-op-log-proto.-id-to-string-entry.pbtxt
index 495a63c..8c4727c 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.profiler.-op-log-proto.-id-to-string-entry.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.profiler.-op-log-proto.-id-to-string-entry.pbtxt
@@ -11,12 +11,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "key"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.profiler.-op-log-proto.pbtxt b/tensorflow/tools/api/golden/tensorflow.profiler.-op-log-proto.pbtxt
index b74d7f8..1071a82 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.profiler.-op-log-proto.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.profiler.-op-log-proto.pbtxt
@@ -11,16 +11,16 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "IdToStringEntry"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+    name: "ID_TO_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "id_to_string"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "IdToStringEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
   member {
-    name: "log_entries"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "LOG_ENTRIES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt
index 7ac8470..ab3449d 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-event.pbtxt
@@ -11,40 +11,40 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "file_version"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "FILE_VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "graph_def"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "log_message"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "LOG_MESSAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "meta_graph_def"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "META_GRAPH_DEF_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "session_log"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SESSION_LOG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "step"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "STEP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "summary"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SUMMARY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "tagged_run_metadata"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TAGGED_RUN_METADATA_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "wall_time"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "WALL_TIME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt
index d1e7e9e..92ca487 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-session-log.pbtxt
@@ -7,6 +7,10 @@ tf_class {
     mtype: "<type \'int\'>"
   }
   member {
+    name: "CHECKPOINT_PATH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "DESCRIPTOR"
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
@@ -15,10 +19,18 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
+    name: "MSG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "START"
     mtype: "<type \'int\'>"
   }
   member {
+    name: "STATUS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "STATUS_UNSPECIFIED"
     mtype: "<type \'int\'>"
   }
@@ -30,18 +42,6 @@ tf_class {
     name: "SessionStatus"
     mtype: "<class \'google.protobuf.internal.enum_type_wrapper.EnumTypeWrapper\'>"
   }
-  member {
-    name: "checkpoint_path"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "msg"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "status"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
   member_method {
     name: "ByteSize"
   }

diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt
index 6fe3c75..f93da21 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary-description.pbtxt
@@ -11,8 +11,8 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "type_hint"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TYPE_HINT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt
index 8cc8428..605e305 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-audio.pbtxt
@@ -3,32 +3,32 @@ tf_class {
   is_instance: "<class \'tensorflow.core.framework.summary_pb2.Audio\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+    name: "CONTENT_TYPE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
   member {
-    name: "content_type"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "ENCODED_AUDIO_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "encoded_audio_string"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "length_frames"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "LENGTH_FRAMES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "num_channels"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "NUM_CHANNELS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "sample_rate"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SAMPLE_RATE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt
index 455452b..0646972 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-image.pbtxt
@@ -3,28 +3,28 @@ tf_class {
   is_instance: "<class \'tensorflow.core.framework.summary_pb2.Image\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+    name: "COLORSPACE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
   member {
-    name: "colorspace"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "ENCODED_IMAGE_STRING_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "encoded_image_string"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "height"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "HEIGHT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "width"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "WIDTH_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt
index bc9378c..b319cd0 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary.-value.pbtxt
@@ -3,6 +3,10 @@ tf_class {
   is_instance: "<class \'tensorflow.core.framework.summary_pb2.Value\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
+    name: "AUDIO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "DESCRIPTOR"
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
@@ -11,40 +15,36 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "audio"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "histo"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "HISTO_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "image"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "IMAGE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "metadata"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "METADATA_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "node_name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "NODE_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "obsolete_old_style_histogram"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "OBSOLETE_OLD_STYLE_HISTOGRAM_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "simple_value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SIMPLE_VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "tag"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TAG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "tensor"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TENSOR_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt
index c724074..132ef1b 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-summary.pbtxt
@@ -19,12 +19,12 @@ tf_class {
     mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
   member {
-    name: "Value"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "Value"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt b/tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt
index 5daec17..4dce208 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.summary.-tagged-run-metadata.pbtxt
@@ -11,12 +11,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "run_metadata"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "RUN_METADATA_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "tag"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TAG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt
index 5ca8b21..8cf52b8 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-bytes-list.pbtxt
@@ -11,8 +11,8 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
index 76ed034..93ff856 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-cluster-def.pbtxt
@@ -11,8 +11,8 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "job"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "JOB_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt
index f516cac..f7215a2 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-example.pbtxt
@@ -11,8 +11,8 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "features"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "FEATURES_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt
index b5b77fe..3ad9835 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feature-list.pbtxt
@@ -11,8 +11,8 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "feature"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "FEATURE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt
index 774cfc5..cd171f4 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.-feature-list-entry.pbtxt
@@ -11,12 +11,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "key"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt
index 430f6b4..3d95017 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feature-lists.pbtxt
@@ -11,12 +11,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "FeatureListEntry"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+    name: "FEATURE_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "feature_list"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "FeatureListEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt
index 48014a9..9cca132 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-feature.pbtxt
@@ -3,6 +3,10 @@ tf_class {
   is_instance: "<class \'tensorflow.core.example.feature_pb2.Feature\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
+    name: "BYTES_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "DESCRIPTOR"
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
@@ -11,16 +15,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "bytes_list"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "float_list"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "FLOAT_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "int64_list"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "INT64_LIST_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt
index 8f68927..858aee0 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-features.-feature-entry.pbtxt
@@ -11,12 +11,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "key"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt
index 94e2412..49cd121 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-features.pbtxt
@@ -11,12 +11,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "FeatureEntry"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+    name: "FEATURE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "feature"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "FeatureEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt
index 3741378..e3f0133 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-float-list.pbtxt
@@ -11,8 +11,8 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt
index 0c775cf..8917dc1 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-int64-list.pbtxt
@@ -11,8 +11,8 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
index 5f0fe5c..ac6d815 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-job-def.-tasks-entry.pbtxt
@@ -11,12 +11,12 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "key"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "KEY_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "value"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VALUE_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
index 20a76e5..ce34537 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-job-def.pbtxt
@@ -11,16 +11,16 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "TasksEntry"
-    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
+    name: "NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TASKS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "tasks"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TasksEntry"
+    mtype: "<class \'google.protobuf.pyext.cpp_message.GeneratedProtocolMessageType\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt
index 24705d0..84498a6 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-saver-def.pbtxt
@@ -15,44 +15,44 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "LEGACY"
+    name: "FILENAME_TENSOR_NAME_FIELD_NUMBER"
     mtype: "<type \'int\'>"
   }
   member {
-    name: "V1"
+    name: "KEEP_CHECKPOINT_EVERY_N_HOURS_FIELD_NUMBER"
     mtype: "<type \'int\'>"
   }
   member {
-    name: "V2"
+    name: "LEGACY"
     mtype: "<type \'int\'>"
   }
   member {
-    name: "filename_tensor_name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "MAX_TO_KEEP_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "keep_checkpoint_every_n_hours"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "RESTORE_OP_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "max_to_keep"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SAVE_TENSOR_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "restore_op_name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "SHARDED_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "save_tensor_name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "V1"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "sharded"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "V2"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "version"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "VERSION_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt
index 4ad3ede..9ab9553 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-sequence-example.pbtxt
@@ -3,6 +3,10 @@ tf_class {
   is_instance: "<class \'tensorflow.core.example.example_pb2.SequenceExample\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
+    name: "CONTEXT_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
+  }
+  member {
     name: "DESCRIPTOR"
     mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
@@ -11,12 +15,8 @@ tf_class {
     mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "context"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
-  }
-  member {
-    name: "feature_lists"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "FEATURE_LISTS_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"

diff --git a/tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt b/tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt
index d1358cc..af0a3b7 100644 (file)
--- a/tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt
+++ b/tensorflow/tools/api/golden/tensorflow.train.-server-def.pbtxt
@@ -3,32 +3,32 @@ tf_class {
   is_instance: "<class \'tensorflow.core.protobuf.tensorflow_server_pb2.ServerDef\'>"
   is_instance: "<type \'google.protobuf.pyext._message.CMessage\'>"
   member {
-    name: "DESCRIPTOR"
-    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
+    name: "CLUSTER_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "Extensions"
-    mtype: "<type \'getset_descriptor\'>"
+    name: "DEFAULT_SESSION_CONFIG_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "cluster"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "DESCRIPTOR"
+    mtype: "<type \'google.protobuf.pyext._message.MessageDescriptor\'>"
   }
   member {
-    name: "default_session_config"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "Extensions"
+    mtype: "<type \'getset_descriptor\'>"
   }
   member {
-    name: "job_name"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "JOB_NAME_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "protocol"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "PROTOCOL_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member {
-    name: "task_index"
-    mtype: "<type \'google.protobuf.pyext._message.FieldProperty\'>"
+    name: "TASK_INDEX_FIELD_NUMBER"
+    mtype: "<type \'int\'>"
   }
   member_method {
     name: "ByteSize"