From 560fcf1b87cb18748f4c6c8ed4c562e5d826cb4d Mon Sep 17 00:00:00 2001 From: "estherhu2012@gmail.com" Date: Sat, 5 Jan 2019 23:04:04 -0600 Subject: [PATCH 1/2] remove op_list_proto_array and op_list_proto_math instead of g.GetOpDef() --- .../Operations/OpDefLibrary.cs | 18 +----------------- .../Operations/gen_array_ops.cs | 12 +----------- .../Operations/gen_math_ops.cs | 13 +------------ 3 files changed, 3 insertions(+), 40 deletions(-) diff --git a/src/TensorFlowNET.Core/Operations/OpDefLibrary.cs b/src/TensorFlowNET.Core/Operations/OpDefLibrary.cs index 530469ea..aac58828 100644 --- a/src/TensorFlowNET.Core/Operations/OpDefLibrary.cs +++ b/src/TensorFlowNET.Core/Operations/OpDefLibrary.cs @@ -9,26 +9,10 @@ namespace Tensorflow { public class OpDefLibrary { - public Dictionary _ops = new Dictionary(); - - public void add_op_list(OpList op_list) - { - foreach(var op_def in op_list.Op) - { - add_op(op_def); - } - } - - public void add_op(OpDef op_def) - { - _ops[op_def.Name] = op_def; - } - public unsafe Operation _apply_op_helper(string op_type_name, string name = "", Dictionary keywords = null) { - var op_def = _ops[op_type_name]; - var g = ops.get_default_graph(); + var op_def = g.GetOpDef(op_type_name); if (String.IsNullOrEmpty(name)) { diff --git a/src/TensorFlowNET.Core/Operations/gen_array_ops.cs b/src/TensorFlowNET.Core/Operations/gen_array_ops.cs index fbff32e0..8330fe28 100644 --- a/src/TensorFlowNET.Core/Operations/gen_array_ops.cs +++ b/src/TensorFlowNET.Core/Operations/gen_array_ops.cs @@ -8,7 +8,7 @@ namespace Tensorflow { public static class gen_array_ops { - public static OpDefLibrary _op_def_lib = _InitOpDefLibrary(); + public static OpDefLibrary _op_def_lib = new OpDefLibrary(); public static Tensor placeholder(TF_DataType dtype, TensorShape shape = null) { @@ -34,15 +34,5 @@ namespace Tensorflow var tensor = new Tensor(_op, 0, dtype); return tensor; } - - private static OpDefLibrary _InitOpDefLibrary() - { - var bytes = File.ReadAllBytes("Operations/op_list_proto_array.bin"); - var op_list = OpList.Parser.ParseFrom(bytes); - var op_def_lib = new OpDefLibrary(); - op_def_lib.add_op_list(op_list); - - return op_def_lib; - } } } diff --git a/src/TensorFlowNET.Core/Operations/gen_math_ops.cs b/src/TensorFlowNET.Core/Operations/gen_math_ops.cs index 8ebe36bf..e21b5b33 100644 --- a/src/TensorFlowNET.Core/Operations/gen_math_ops.cs +++ b/src/TensorFlowNET.Core/Operations/gen_math_ops.cs @@ -7,7 +7,7 @@ namespace Tensorflow { public static class gen_math_ops { - public static OpDefLibrary _op_def_lib = _InitOpDefLibrary(); + public static OpDefLibrary _op_def_lib = new OpDefLibrary(); public static Tensor add(Tensor a, Tensor b) { @@ -19,16 +19,5 @@ namespace Tensorflow return new Tensor(_op, 0, _op.OutputType(0)); } - - private static OpDefLibrary _InitOpDefLibrary() - { - // c_api.TF_GraphGetOpDef(g.Handle, op_type_name, buffer.Handle, status.Handle); - var bytes = File.ReadAllBytes("Operations/op_list_proto_math.bin"); - var op_list = OpList.Parser.ParseFrom(bytes); - var op_def_lib = new OpDefLibrary(); - op_def_lib.add_op_list(op_list); - - return op_def_lib; - } } } From 29f4575f3658c82bb05920e3a3ba11fb8f4439c2 Mon Sep 17 00:00:00 2001 From: "estherhu2012@gmail.com" Date: Sat, 5 Jan 2019 23:06:43 -0600 Subject: [PATCH 2/2] remove bin --- .../Operations/op_list_proto_array.bin | Bin 12235 -> 0 bytes .../Operations/op_list_proto_math.bin | Bin 11722 -> 0 bytes .../TensorFlowNET.Core.csproj | 6 ------ 3 files changed, 6 deletions(-) delete mode 100644 src/TensorFlowNET.Core/Operations/op_list_proto_array.bin delete mode 100644 src/TensorFlowNET.Core/Operations/op_list_proto_math.bin diff --git a/src/TensorFlowNET.Core/Operations/op_list_proto_array.bin b/src/TensorFlowNET.Core/Operations/op_list_proto_array.bin deleted file mode 100644 index 62d31e670f9abef14e46a2ac8d0e42d7ce4f1b4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12235 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 - - PreserveNewest - - - PreserveNewest -