| @@ -1303,7 +1303,7 @@ namespace Tensorflow { | |||||
| if (other.Name.Length != 0) { | if (other.Name.Length != 0) { | ||||
| Name = other.Name; | Name = other.Name; | ||||
| } | } | ||||
| attr_.MergeFrom(other.attr_); | |||||
| attr_.Add(other.attr_); | |||||
| _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | ||||
| } | } | ||||
| @@ -218,7 +218,7 @@ namespace Tensorflow { | |||||
| if (other.Name.Length != 0) { | if (other.Name.Length != 0) { | ||||
| Name = other.Name; | Name = other.Name; | ||||
| } | } | ||||
| tasks_.MergeFrom(other.tasks_); | |||||
| tasks_.Add(other.tasks_); | |||||
| _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | ||||
| } | } | ||||
| @@ -4271,7 +4271,7 @@ namespace Tensorflow { | |||||
| if (other == null) { | if (other == null) { | ||||
| return; | return; | ||||
| } | } | ||||
| deviceCount_.MergeFrom(other.deviceCount_); | |||||
| deviceCount_.Add(other.deviceCount_); | |||||
| if (other.IntraOpParallelismThreads != 0) { | if (other.IntraOpParallelismThreads != 0) { | ||||
| IntraOpParallelismThreads = other.IntraOpParallelismThreads; | IntraOpParallelismThreads = other.IntraOpParallelismThreads; | ||||
| } | } | ||||
| @@ -7855,8 +7855,8 @@ namespace Tensorflow { | |||||
| RunOptions.MergeFrom(other.RunOptions); | RunOptions.MergeFrom(other.RunOptions); | ||||
| } | } | ||||
| tensorConnection_.Add(other.tensorConnection_); | tensorConnection_.Add(other.tensorConnection_); | ||||
| feedDevices_.MergeFrom(other.feedDevices_); | |||||
| fetchDevices_.MergeFrom(other.fetchDevices_); | |||||
| feedDevices_.Add(other.feedDevices_); | |||||
| fetchDevices_.Add(other.fetchDevices_); | |||||
| if (other.FetchSkipSync != false) { | if (other.FetchSkipSync != false) { | ||||
| FetchSkipSync = other.FetchSkipSync; | FetchSkipSync = other.FetchSkipSync; | ||||
| } | } | ||||
| @@ -220,7 +220,7 @@ namespace Tensorflow { | |||||
| return; | return; | ||||
| } | } | ||||
| values_.Add(other.values_); | values_.Add(other.values_); | ||||
| externalValues_.MergeFrom(other.externalValues_); | |||||
| externalValues_.Add(other.externalValues_); | |||||
| _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | ||||
| } | } | ||||
| @@ -964,7 +964,6 @@ namespace Tensorflow { | |||||
| [global::System.Diagnostics.DebuggerNonUserCodeAttribute] | [global::System.Diagnostics.DebuggerNonUserCodeAttribute] | ||||
| [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] | [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] | ||||
| public static partial class Types { | public static partial class Types { | ||||
| [global::System.ObsoleteAttribute] | |||||
| public enum Level { | public enum Level { | ||||
| [pbr::OriginalName("UNKNOWN")] Unknown = 0, | [pbr::OriginalName("UNKNOWN")] Unknown = 0, | ||||
| /// <summary> | /// <summary> | ||||
| @@ -592,12 +592,12 @@ namespace Tensorflow { | |||||
| } | } | ||||
| Signature.MergeFrom(other.Signature); | Signature.MergeFrom(other.Signature); | ||||
| } | } | ||||
| attr_.MergeFrom(other.attr_); | |||||
| argAttr_.MergeFrom(other.argAttr_); | |||||
| resourceArgUniqueId_.MergeFrom(other.resourceArgUniqueId_); | |||||
| attr_.Add(other.attr_); | |||||
| argAttr_.Add(other.argAttr_); | |||||
| resourceArgUniqueId_.Add(other.resourceArgUniqueId_); | |||||
| nodeDef_.Add(other.nodeDef_); | nodeDef_.Add(other.nodeDef_); | ||||
| ret_.MergeFrom(other.ret_); | |||||
| controlRet_.MergeFrom(other.controlRet_); | |||||
| ret_.Add(other.ret_); | |||||
| controlRet_.Add(other.controlRet_); | |||||
| _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | ||||
| } | } | ||||
| @@ -836,7 +836,7 @@ namespace Tensorflow { | |||||
| if (other == null) { | if (other == null) { | ||||
| return; | return; | ||||
| } | } | ||||
| attr_.MergeFrom(other.attr_); | |||||
| attr_.Add(other.attr_); | |||||
| _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | ||||
| } | } | ||||
| @@ -4014,7 +4014,7 @@ namespace Xla { | |||||
| if (other == null) { | if (other == null) { | ||||
| return; | return; | ||||
| } | } | ||||
| sequences_.MergeFrom(other.sequences_); | |||||
| sequences_.Add(other.sequences_); | |||||
| _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | ||||
| } | } | ||||
| @@ -427,8 +427,8 @@ namespace Tensorflow { | |||||
| } | } | ||||
| SaverDef.MergeFrom(other.SaverDef); | SaverDef.MergeFrom(other.SaverDef); | ||||
| } | } | ||||
| collectionDef_.MergeFrom(other.collectionDef_); | |||||
| signatureDef_.MergeFrom(other.signatureDef_); | |||||
| collectionDef_.Add(other.collectionDef_); | |||||
| signatureDef_.Add(other.signatureDef_); | |||||
| assetFileDef_.Add(other.assetFileDef_); | assetFileDef_.Add(other.assetFileDef_); | ||||
| if (other.objectGraphDef_ != null) { | if (other.objectGraphDef_ != null) { | ||||
| if (objectGraphDef_ == null) { | if (objectGraphDef_ == null) { | ||||
| @@ -927,7 +927,7 @@ namespace Tensorflow { | |||||
| if (other.StrippedDefaultAttrs != false) { | if (other.StrippedDefaultAttrs != false) { | ||||
| StrippedDefaultAttrs = other.StrippedDefaultAttrs; | StrippedDefaultAttrs = other.StrippedDefaultAttrs; | ||||
| } | } | ||||
| functionAliases_.MergeFrom(other.functionAliases_); | |||||
| functionAliases_.Add(other.functionAliases_); | |||||
| _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | ||||
| } | } | ||||
| @@ -3689,8 +3689,8 @@ namespace Tensorflow { | |||||
| if (other == null) { | if (other == null) { | ||||
| return; | return; | ||||
| } | } | ||||
| inputs_.MergeFrom(other.inputs_); | |||||
| outputs_.MergeFrom(other.outputs_); | |||||
| inputs_.Add(other.inputs_); | |||||
| outputs_.Add(other.outputs_); | |||||
| if (other.MethodName.Length != 0) { | if (other.MethodName.Length != 0) { | ||||
| MethodName = other.MethodName; | MethodName = other.MethodName; | ||||
| } | } | ||||
| @@ -399,7 +399,7 @@ namespace Tensorflow { | |||||
| if (other.Device.Length != 0) { | if (other.Device.Length != 0) { | ||||
| Device = other.Device; | Device = other.Device; | ||||
| } | } | ||||
| attr_.MergeFrom(other.attr_); | |||||
| attr_.Add(other.attr_); | |||||
| if (other.experimentalDebugInfo_ != null) { | if (other.experimentalDebugInfo_ != null) { | ||||
| if (experimentalDebugInfo_ == null) { | if (experimentalDebugInfo_ == null) { | ||||
| ExperimentalDebugInfo = new global::Tensorflow.NodeDef.Types.ExperimentalDebugInfo(); | ExperimentalDebugInfo = new global::Tensorflow.NodeDef.Types.ExperimentalDebugInfo(); | ||||
| @@ -2425,7 +2425,7 @@ namespace Tensorflow { | |||||
| if (other.Name.Length != 0) { | if (other.Name.Length != 0) { | ||||
| Name = other.Name; | Name = other.Name; | ||||
| } | } | ||||
| parameterMap_.MergeFrom(other.parameterMap_); | |||||
| parameterMap_.Add(other.parameterMap_); | |||||
| _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | ||||
| } | } | ||||
| @@ -274,7 +274,7 @@ namespace Tensorflow { | |||||
| return; | return; | ||||
| } | } | ||||
| nodes_.Add(other.nodes_); | nodes_.Add(other.nodes_); | ||||
| concreteFunctions_.MergeFrom(other.concreteFunctions_); | |||||
| concreteFunctions_.Add(other.concreteFunctions_); | |||||
| _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | ||||
| } | } | ||||
| @@ -886,7 +886,7 @@ namespace Tensorflow { | |||||
| children_.Add(other.children_); | children_.Add(other.children_); | ||||
| dependencies_.Add(other.dependencies_); | dependencies_.Add(other.dependencies_); | ||||
| slotVariables_.Add(other.slotVariables_); | slotVariables_.Add(other.slotVariables_); | ||||
| saveableObjects_.MergeFrom(other.saveableObjects_); | |||||
| saveableObjects_.Add(other.saveableObjects_); | |||||
| if (other.RegisteredName.Length != 0) { | if (other.RegisteredName.Length != 0) { | ||||
| RegisteredName = other.RegisteredName; | RegisteredName = other.RegisteredName; | ||||
| } | } | ||||
| @@ -2237,7 +2237,7 @@ namespace Tensorflow { | |||||
| Device = other.Device; | Device = other.Device; | ||||
| } | } | ||||
| nodeStats_.Add(other.nodeStats_); | nodeStats_.Add(other.nodeStats_); | ||||
| threadNames_.MergeFrom(other.threadNames_); | |||||
| threadNames_.Add(other.threadNames_); | |||||
| _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | ||||
| } | } | ||||
| @@ -1677,7 +1677,7 @@ namespace Tensorflow { | |||||
| if (other == null) { | if (other == null) { | ||||
| return; | return; | ||||
| } | } | ||||
| fields_.MergeFrom(other.fields_); | |||||
| fields_.Add(other.fields_); | |||||
| _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | ||||
| } | } | ||||
| @@ -3161,7 +3161,7 @@ namespace Xla { | |||||
| if (other.XlaCpuStrictDotConvMath != false) { | if (other.XlaCpuStrictDotConvMath != false) { | ||||
| XlaCpuStrictDotConvMath = other.XlaCpuStrictDotConvMath; | XlaCpuStrictDotConvMath = other.XlaCpuStrictDotConvMath; | ||||
| } | } | ||||
| xlaBackendExtraOptions_.MergeFrom(other.xlaBackendExtraOptions_); | |||||
| xlaBackendExtraOptions_.Add(other.xlaBackendExtraOptions_); | |||||
| _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | ||||
| } | } | ||||
| @@ -8345,7 +8345,7 @@ namespace Xla { | |||||
| if (other == null) { | if (other == null) { | ||||
| return; | return; | ||||
| } | } | ||||
| map_.MergeFrom(other.map_); | |||||
| map_.Add(other.map_); | |||||
| _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); | ||||
| } | } | ||||
| @@ -110,7 +110,7 @@ https://tensorflownet.readthedocs.io</Description> | |||||
| <PackageReference Include="MethodBoundaryAspect.Fody" Version="2.0.148" /> | <PackageReference Include="MethodBoundaryAspect.Fody" Version="2.0.148" /> | ||||
| <PackageReference Include="Newtonsoft.Json" Version="13.0.2" /> | <PackageReference Include="Newtonsoft.Json" Version="13.0.2" /> | ||||
| <PackageReference Include="OneOf" Version="3.0.223" /> | <PackageReference Include="OneOf" Version="3.0.223" /> | ||||
| <PackageReference Include="Protobuf.Text" Version="0.6.1" /> | |||||
| <PackageReference Include="Protobuf.Text" Version="0.6.2" /> | |||||
| <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" /> | <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" /> | ||||
| </ItemGroup> | </ItemGroup> | ||||