Update protobuf per tf 2.6.

Author: Oceania2018

src/TensorFlowNET.Core/Protobuf/Config.cs

@@ -25,27 +25,28 @@ static CppShapeInferenceReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "CjV0ZW5zb3JmbG93L3B5dGhvbi9mcmFtZXdvcmsvY3BwX3NoYXBlX2luZmVy",
-            "ZW5jZS5wcm90bxIKdGVuc29yZmxvdxoldGVuc29yZmxvdy9jb3JlL2ZyYW1l",
-            "d29yay90eXBlcy5wcm90bxosdGVuc29yZmxvdy9jb3JlL2ZyYW1ld29yay90",
-            "ZW5zb3Jfc2hhcGUucHJvdG8ipQMKF0NwcFNoYXBlSW5mZXJlbmNlUmVzdWx0",
+            "ZW5jZS5wcm90bxIKdGVuc29yZmxvdxopdGVuc29yZmxvdy9jb3JlL2ZyYW1l",
+            "d29yay9mdWxsX3R5cGUucHJvdG8aLHRlbnNvcmZsb3cvY29yZS9mcmFtZXdv",
+            "cmsvdGVuc29yX3NoYXBlLnByb3RvGiV0ZW5zb3JmbG93L2NvcmUvZnJhbWV3",
+            "b3JrL3R5cGVzLnByb3RvIpsDChdDcHBTaGFwZUluZmVyZW5jZVJlc3VsdBIr",
+            "CgVzaGFwZRgBIAEoCzIcLnRlbnNvcmZsb3cuVGVuc29yU2hhcGVQcm90bxJD",
+            "CgtoYW5kbGVfZGF0YRgEIAEoCzIuLnRlbnNvcmZsb3cuQ3BwU2hhcGVJbmZl",
+            "cmVuY2VSZXN1bHQuSGFuZGxlRGF0YRqTAQoSSGFuZGxlU2hhcGVBbmRUeXBl",
             "EisKBXNoYXBlGAEgASgLMhwudGVuc29yZmxvdy5UZW5zb3JTaGFwZVByb3Rv",
-            "EkMKC2hhbmRsZV9kYXRhGAQgASgLMi4udGVuc29yZmxvdy5DcHBTaGFwZUlu",
-            "ZmVyZW5jZVJlc3VsdC5IYW5kbGVEYXRhGp0BChJIYW5kbGVTaGFwZUFuZFR5",
-            "cGUSKwoFc2hhcGUYASABKAsyHC50ZW5zb3JmbG93LlRlbnNvclNoYXBlUHJv",
-            "dG8SIwoFZHR5cGUYAiABKA4yFC50ZW5zb3JmbG93LkRhdGFUeXBlEjUKEHNw",
-            "ZWNpYWxpemVkX3R5cGUYAyABKA4yGy50ZW5zb3JmbG93LlNwZWNpYWxpemVk",
-            "VHlwZRpsCgpIYW5kbGVEYXRhEg4KBmlzX3NldBgBIAEoCBJOCg5zaGFwZV9h",
-            "bmRfdHlwZRgCIAMoCzI2LnRlbnNvcmZsb3cuQ3BwU2hhcGVJbmZlcmVuY2VS",
-            "ZXN1bHQuSGFuZGxlU2hhcGVBbmRUeXBlSgQIAhADSgQIAxAEImUKHUNwcFNo",
-            "YXBlSW5mZXJlbmNlSW5wdXRzTmVlZGVkEhwKFGlucHV0X3RlbnNvcnNfbmVl",
-            "ZGVkGAEgAygFEiYKHmlucHV0X3RlbnNvcnNfYXNfc2hhcGVzX25lZWRlZBgC",
-            "IAMoBUJhWlxnaXRodWIuY29tL3RlbnNvcmZsb3cvdGVuc29yZmxvdy90ZW5z",
-            "b3JmbG93L2dvL3B5dGhvbi9mcmFtZXdvcmsvY3BwX3NoYXBlX2luZmVyZW5j",
-            "ZV9nb19wcm90b/gBAWIGcHJvdG8z"));
+            "EiMKBWR0eXBlGAIgASgOMhQudGVuc29yZmxvdy5EYXRhVHlwZRIlCgR0eXBl",
+            "GAQgASgLMhcudGVuc29yZmxvdy5GdWxsVHlwZURlZkoECAMQBBpsCgpIYW5k",
+            "bGVEYXRhEg4KBmlzX3NldBgBIAEoCBJOCg5zaGFwZV9hbmRfdHlwZRgCIAMo",
+            "CzI2LnRlbnNvcmZsb3cuQ3BwU2hhcGVJbmZlcmVuY2VSZXN1bHQuSGFuZGxl",
+            "U2hhcGVBbmRUeXBlSgQIAhADSgQIAxAEImUKHUNwcFNoYXBlSW5mZXJlbmNl",
+            "SW5wdXRzTmVlZGVkEhwKFGlucHV0X3RlbnNvcnNfbmVlZGVkGAEgAygFEiYK",
+            "HmlucHV0X3RlbnNvcnNfYXNfc2hhcGVzX25lZWRlZBgCIAMoBUJhWlxnaXRo",
+            "dWIuY29tL3RlbnNvcmZsb3cvdGVuc29yZmxvdy90ZW5zb3JmbG93L2dvL3B5",
+            "dGhvbi9mcmFtZXdvcmsvY3BwX3NoYXBlX2luZmVyZW5jZV9nb19wcm90b/gB",
+            "AWIGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Tensorflow.TypesReflection.Descriptor, global::Tensorflow.TensorShapeReflection.Descriptor, },
+          new pbr::FileDescriptor[] { global::Tensorflow.FullTypeReflection.Descriptor, global::Tensorflow.TensorShapeReflection.Descriptor, global::Tensorflow.TypesReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tensorflow.CppShapeInferenceResult), global::Tensorflow.CppShapeInferenceResult.Parser, new[]{ "Shape", "HandleData" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Tensorflow.CppShapeInferenceResult.Types.HandleShapeAndType), global::Tensorflow.CppShapeInferenceResult.Types.HandleShapeAndType.Parser, new[]{ "Shape", "Dtype", "SpecializedType" }, null, null, null, null),
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tensorflow.CppShapeInferenceResult), global::Tensorflow.CppShapeInferenceResult.Parser, new[]{ "Shape", "HandleData" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Tensorflow.CppShapeInferenceResult.Types.HandleShapeAndType), global::Tensorflow.CppShapeInferenceResult.Types.HandleShapeAndType.Parser, new[]{ "Shape", "Dtype", "Type" }, null, null, null, null),
             new pbr::GeneratedClrTypeInfo(typeof(global::Tensorflow.CppShapeInferenceResult.Types.HandleData), global::Tensorflow.CppShapeInferenceResult.Types.HandleData.Parser, new[]{ "IsSet", "ShapeAndType" }, null, null, null, null)}),
             new pbr::GeneratedClrTypeInfo(typeof(global::Tensorflow.CppShapeInferenceInputsNeeded), global::Tensorflow.CppShapeInferenceInputsNeeded.Parser, new[]{ "InputTensorsNeeded", "InputTensorsAsShapesNeeded" }, null, null, null, null)
           }));
@@ -252,7 +253,7 @@ public HandleShapeAndType() {
         public HandleShapeAndType(HandleShapeAndType other) : this() {
           shape_ = other.shape_ != null ? other.shape_.Clone() : null;
           dtype_ = other.dtype_;
-          specializedType_ = other.specializedType_;
+          type_ = other.type_ != null ? other.type_.Clone() : null;
           _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
         }
 
@@ -283,19 +284,14 @@ public HandleShapeAndType Clone() {
           }
         }
 
-        /// <summary>Field number for the "specialized_type" field.</summary>
-        public const int SpecializedTypeFieldNumber = 3;
-        private global::Tensorflow.SpecializedType specializedType_ = global::Tensorflow.SpecializedType.StInvalid;
-        /// <summary>
-        /// For dtype==DT_VARIANT, specialized_type may indicate a more specific
-        /// type. For other dtypes or when the information is unavailable it is set
-        /// to ST_INVALID.
-        /// </summary>
+        /// <summary>Field number for the "type" field.</summary>
+        public const int TypeFieldNumber = 4;
+        private global::Tensorflow.FullTypeDef type_;
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        public global::Tensorflow.SpecializedType SpecializedType {
-          get { return specializedType_; }
+        public global::Tensorflow.FullTypeDef Type {
+          get { return type_; }
           set {
-            specializedType_ = value;
+            type_ = value;
           }
         }
 
@@ -314,7 +310,7 @@ public bool Equals(HandleShapeAndType other) {
           }
           if (!object.Equals(Shape, other.Shape)) return false;
           if (Dtype != other.Dtype) return false;
-          if (SpecializedType != other.SpecializedType) return false;
+          if (!object.Equals(Type, other.Type)) return false;
           return Equals(_unknownFields, other._unknownFields);
         }
 
@@ -323,7 +319,7 @@ public override int GetHashCode() {
           int hash = 1;
           if (shape_ != null) hash ^= Shape.GetHashCode();
           if (Dtype != global::Tensorflow.DataType.DtInvalid) hash ^= Dtype.GetHashCode();
-          if (SpecializedType != global::Tensorflow.SpecializedType.StInvalid) hash ^= SpecializedType.GetHashCode();
+          if (type_ != null) hash ^= Type.GetHashCode();
           if (_unknownFields != null) {
             hash ^= _unknownFields.GetHashCode();
           }
@@ -345,9 +341,9 @@ public void WriteTo(pb::CodedOutputStream output) {
             output.WriteRawTag(16);
             output.WriteEnum((int) Dtype);
           }
-          if (SpecializedType != global::Tensorflow.SpecializedType.StInvalid) {
-            output.WriteRawTag(24);
-            output.WriteEnum((int) SpecializedType);
+          if (type_ != null) {
+            output.WriteRawTag(34);
+            output.WriteMessage(Type);
           }
           if (_unknownFields != null) {
             _unknownFields.WriteTo(output);
@@ -363,8 +359,8 @@ public int CalculateSize() {
           if (Dtype != global::Tensorflow.DataType.DtInvalid) {
             size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Dtype);
           }
-          if (SpecializedType != global::Tensorflow.SpecializedType.StInvalid) {
-            size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) SpecializedType);
+          if (type_ != null) {
+            size += 1 + pb::CodedOutputStream.ComputeMessageSize(Type);
           }
           if (_unknownFields != null) {
             size += _unknownFields.CalculateSize();
@@ -386,8 +382,11 @@ public void MergeFrom(HandleShapeAndType other) {
           if (other.Dtype != global::Tensorflow.DataType.DtInvalid) {
             Dtype = other.Dtype;
           }
-          if (other.SpecializedType != global::Tensorflow.SpecializedType.StInvalid) {
-            SpecializedType = other.SpecializedType;
+          if (other.type_ != null) {
+            if (type_ == null) {
+              Type = new global::Tensorflow.FullTypeDef();
+            }
+            Type.MergeFrom(other.Type);
           }
           _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
         }
@@ -411,8 +410,11 @@ public void MergeFrom(pb::CodedInputStream input) {
                 Dtype = (global::Tensorflow.DataType) input.ReadEnum();
                 break;
               }
-              case 24: {
-                SpecializedType = (global::Tensorflow.SpecializedType) input.ReadEnum();
+              case 34: {
+                if (type_ == null) {
+                  Type = new global::Tensorflow.FullTypeDef();
+                }
+                input.ReadMessage(Type);
                 break;
               }
             }