diff --git a/src/TensorFlowNET.Core/Protobuf/AttrValue.cs b/src/TensorFlowNET.Core/Protobuf/AttrValue.cs index 08336986..fbccba22 100644 --- a/src/TensorFlowNET.Core/Protobuf/AttrValue.cs +++ b/src/TensorFlowNET.Core/Protobuf/AttrValue.cs @@ -1303,7 +1303,7 @@ namespace Tensorflow { if (other.Name.Length != 0) { Name = other.Name; } - attr_.MergeFrom(other.attr_); + attr_.Add(other.attr_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } diff --git a/src/TensorFlowNET.Core/Protobuf/Cluster.cs b/src/TensorFlowNET.Core/Protobuf/Cluster.cs index 1e8333c6..4c398c82 100644 --- a/src/TensorFlowNET.Core/Protobuf/Cluster.cs +++ b/src/TensorFlowNET.Core/Protobuf/Cluster.cs @@ -218,7 +218,7 @@ namespace Tensorflow { if (other.Name.Length != 0) { Name = other.Name; } - tasks_.MergeFrom(other.tasks_); + tasks_.Add(other.tasks_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } diff --git a/src/TensorFlowNET.Core/Protobuf/Config.cs b/src/TensorFlowNET.Core/Protobuf/Config.cs index 7d5eb60c..de7b3863 100644 --- a/src/TensorFlowNET.Core/Protobuf/Config.cs +++ b/src/TensorFlowNET.Core/Protobuf/Config.cs @@ -4271,7 +4271,7 @@ namespace Tensorflow { if (other == null) { return; } - deviceCount_.MergeFrom(other.deviceCount_); + deviceCount_.Add(other.deviceCount_); if (other.IntraOpParallelismThreads != 0) { IntraOpParallelismThreads = other.IntraOpParallelismThreads; } @@ -7855,8 +7855,8 @@ namespace Tensorflow { RunOptions.MergeFrom(other.RunOptions); } tensorConnection_.Add(other.tensorConnection_); - feedDevices_.MergeFrom(other.feedDevices_); - fetchDevices_.MergeFrom(other.fetchDevices_); + feedDevices_.Add(other.feedDevices_); + fetchDevices_.Add(other.fetchDevices_); if (other.FetchSkipSync != false) { FetchSkipSync = other.FetchSkipSync; } diff --git a/src/TensorFlowNET.Core/Protobuf/ControlFlow.cs b/src/TensorFlowNET.Core/Protobuf/ControlFlow.cs index 4b3835df..3ede374c 100644 --- a/src/TensorFlowNET.Core/Protobuf/ControlFlow.cs +++ b/src/TensorFlowNET.Core/Protobuf/ControlFlow.cs @@ -220,7 +220,7 @@ namespace Tensorflow { return; } values_.Add(other.values_); - externalValues_.MergeFrom(other.externalValues_); + externalValues_.Add(other.externalValues_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } diff --git a/src/TensorFlowNET.Core/Protobuf/Event.cs b/src/TensorFlowNET.Core/Protobuf/Event.cs index 2114f958..cd80bf37 100644 --- a/src/TensorFlowNET.Core/Protobuf/Event.cs +++ b/src/TensorFlowNET.Core/Protobuf/Event.cs @@ -964,7 +964,6 @@ namespace Tensorflow { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static partial class Types { - [global::System.ObsoleteAttribute] public enum Level { [pbr::OriginalName("UNKNOWN")] Unknown = 0, /// diff --git a/src/TensorFlowNET.Core/Protobuf/Function.cs b/src/TensorFlowNET.Core/Protobuf/Function.cs index 3dd67e16..800e6444 100644 --- a/src/TensorFlowNET.Core/Protobuf/Function.cs +++ b/src/TensorFlowNET.Core/Protobuf/Function.cs @@ -592,12 +592,12 @@ namespace Tensorflow { } 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_); - ret_.MergeFrom(other.ret_); - controlRet_.MergeFrom(other.controlRet_); + ret_.Add(other.ret_); + controlRet_.Add(other.controlRet_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -836,7 +836,7 @@ namespace Tensorflow { if (other == null) { return; } - attr_.MergeFrom(other.attr_); + attr_.Add(other.attr_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } diff --git a/src/TensorFlowNET.Core/Protobuf/Hlo.cs b/src/TensorFlowNET.Core/Protobuf/Hlo.cs index 15be49aa..27aa3faa 100644 --- a/src/TensorFlowNET.Core/Protobuf/Hlo.cs +++ b/src/TensorFlowNET.Core/Protobuf/Hlo.cs @@ -4014,7 +4014,7 @@ namespace Xla { if (other == null) { return; } - sequences_.MergeFrom(other.sequences_); + sequences_.Add(other.sequences_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } diff --git a/src/TensorFlowNET.Core/Protobuf/MetaGraph.cs b/src/TensorFlowNET.Core/Protobuf/MetaGraph.cs index c200f3ee..4cd62e02 100644 --- a/src/TensorFlowNET.Core/Protobuf/MetaGraph.cs +++ b/src/TensorFlowNET.Core/Protobuf/MetaGraph.cs @@ -427,8 +427,8 @@ namespace Tensorflow { } SaverDef.MergeFrom(other.SaverDef); } - collectionDef_.MergeFrom(other.collectionDef_); - signatureDef_.MergeFrom(other.signatureDef_); + collectionDef_.Add(other.collectionDef_); + signatureDef_.Add(other.signatureDef_); assetFileDef_.Add(other.assetFileDef_); if (other.objectGraphDef_ != null) { if (objectGraphDef_ == null) { @@ -927,7 +927,7 @@ namespace Tensorflow { if (other.StrippedDefaultAttrs != false) { StrippedDefaultAttrs = other.StrippedDefaultAttrs; } - functionAliases_.MergeFrom(other.functionAliases_); + functionAliases_.Add(other.functionAliases_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -3689,8 +3689,8 @@ namespace Tensorflow { if (other == null) { return; } - inputs_.MergeFrom(other.inputs_); - outputs_.MergeFrom(other.outputs_); + inputs_.Add(other.inputs_); + outputs_.Add(other.outputs_); if (other.MethodName.Length != 0) { MethodName = other.MethodName; } diff --git a/src/TensorFlowNET.Core/Protobuf/NodeDef.cs b/src/TensorFlowNET.Core/Protobuf/NodeDef.cs index 9b498d8e..657ef46e 100644 --- a/src/TensorFlowNET.Core/Protobuf/NodeDef.cs +++ b/src/TensorFlowNET.Core/Protobuf/NodeDef.cs @@ -399,7 +399,7 @@ namespace Tensorflow { if (other.Device.Length != 0) { Device = other.Device; } - attr_.MergeFrom(other.attr_); + attr_.Add(other.attr_); if (other.experimentalDebugInfo_ != null) { if (experimentalDebugInfo_ == null) { ExperimentalDebugInfo = new global::Tensorflow.NodeDef.Types.ExperimentalDebugInfo(); diff --git a/src/TensorFlowNET.Core/Protobuf/RewriterConfig.cs b/src/TensorFlowNET.Core/Protobuf/RewriterConfig.cs index 1cdf309e..eae00020 100644 --- a/src/TensorFlowNET.Core/Protobuf/RewriterConfig.cs +++ b/src/TensorFlowNET.Core/Protobuf/RewriterConfig.cs @@ -2425,7 +2425,7 @@ namespace Tensorflow { if (other.Name.Length != 0) { Name = other.Name; } - parameterMap_.MergeFrom(other.parameterMap_); + parameterMap_.Add(other.parameterMap_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } diff --git a/src/TensorFlowNET.Core/Protobuf/SavedObjectGraph.cs b/src/TensorFlowNET.Core/Protobuf/SavedObjectGraph.cs index 4b7be2b0..df7019ad 100644 --- a/src/TensorFlowNET.Core/Protobuf/SavedObjectGraph.cs +++ b/src/TensorFlowNET.Core/Protobuf/SavedObjectGraph.cs @@ -274,7 +274,7 @@ namespace Tensorflow { return; } nodes_.Add(other.nodes_); - concreteFunctions_.MergeFrom(other.concreteFunctions_); + concreteFunctions_.Add(other.concreteFunctions_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -886,7 +886,7 @@ namespace Tensorflow { children_.Add(other.children_); dependencies_.Add(other.dependencies_); slotVariables_.Add(other.slotVariables_); - saveableObjects_.MergeFrom(other.saveableObjects_); + saveableObjects_.Add(other.saveableObjects_); if (other.RegisteredName.Length != 0) { RegisteredName = other.RegisteredName; } diff --git a/src/TensorFlowNET.Core/Protobuf/StepStats.cs b/src/TensorFlowNET.Core/Protobuf/StepStats.cs index 71844bc4..48ecd0d5 100644 --- a/src/TensorFlowNET.Core/Protobuf/StepStats.cs +++ b/src/TensorFlowNET.Core/Protobuf/StepStats.cs @@ -2237,7 +2237,7 @@ namespace Tensorflow { Device = other.Device; } nodeStats_.Add(other.nodeStats_); - threadNames_.MergeFrom(other.threadNames_); + threadNames_.Add(other.threadNames_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } diff --git a/src/TensorFlowNET.Core/Protobuf/Struct.cs b/src/TensorFlowNET.Core/Protobuf/Struct.cs index 8b3a0767..6a2e39f3 100644 --- a/src/TensorFlowNET.Core/Protobuf/Struct.cs +++ b/src/TensorFlowNET.Core/Protobuf/Struct.cs @@ -1677,7 +1677,7 @@ namespace Tensorflow { if (other == null) { return; } - fields_.MergeFrom(other.fields_); + fields_.Add(other.fields_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } diff --git a/src/TensorFlowNET.Core/Protobuf/Xla.cs b/src/TensorFlowNET.Core/Protobuf/Xla.cs index f17c0e02..24f46594 100644 --- a/src/TensorFlowNET.Core/Protobuf/Xla.cs +++ b/src/TensorFlowNET.Core/Protobuf/Xla.cs @@ -3161,7 +3161,7 @@ namespace Xla { if (other.XlaCpuStrictDotConvMath != false) { XlaCpuStrictDotConvMath = other.XlaCpuStrictDotConvMath; } - xlaBackendExtraOptions_.MergeFrom(other.xlaBackendExtraOptions_); + xlaBackendExtraOptions_.Add(other.xlaBackendExtraOptions_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } diff --git a/src/TensorFlowNET.Core/Protobuf/XlaData.cs b/src/TensorFlowNET.Core/Protobuf/XlaData.cs index a51a1d5f..b281ab77 100644 --- a/src/TensorFlowNET.Core/Protobuf/XlaData.cs +++ b/src/TensorFlowNET.Core/Protobuf/XlaData.cs @@ -8345,7 +8345,7 @@ namespace Xla { if (other == null) { return; } - map_.MergeFrom(other.map_); + map_.Add(other.map_); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } diff --git a/src/TensorFlowNET.Core/Tensorflow.Binding.csproj b/src/TensorFlowNET.Core/Tensorflow.Binding.csproj index 6d226513..4898cca0 100644 --- a/src/TensorFlowNET.Core/Tensorflow.Binding.csproj +++ b/src/TensorFlowNET.Core/Tensorflow.Binding.csproj @@ -110,7 +110,7 @@ https://tensorflownet.readthedocs.io - +