From ea5d35e219222bd15b541d2ac72f2b8c69a93d89 Mon Sep 17 00:00:00 2001 From: Oceania2018 Date: Thu, 24 Jan 2019 07:31:18 -0600 Subject: [PATCH] control_flow_ops._GroupControlDeps --- .../Operations/control_flow_ops.py.cs | 12 +++++++++++- src/TensorFlowNET.Core/Variables/tf.variable.cs | 2 +- src/TensorFlowNET.Core/Variables/variables.py.cs | 8 +++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/TensorFlowNET.Core/Operations/control_flow_ops.py.cs b/src/TensorFlowNET.Core/Operations/control_flow_ops.py.cs index 544273ba..b6fe4d78 100644 --- a/src/TensorFlowNET.Core/Operations/control_flow_ops.py.cs +++ b/src/TensorFlowNET.Core/Operations/control_flow_ops.py.cs @@ -6,7 +6,17 @@ namespace Tensorflow { public class control_flow_ops { - public static Operation group(Operation[] inputs) + public static Operation group(List inputs, string name = "") + { + using(var namescope = new ops.name_scope(name, "group_deps", inputs)) + { + // Sorts *inputs according to their devices. + + return _GroupControlDeps("", name); + } + } + + private static Operation _GroupControlDeps(string dev, string name = "") { return null; } diff --git a/src/TensorFlowNET.Core/Variables/tf.variable.cs b/src/TensorFlowNET.Core/Variables/tf.variable.cs index f3f960e2..06680b05 100644 --- a/src/TensorFlowNET.Core/Variables/tf.variable.cs +++ b/src/TensorFlowNET.Core/Variables/tf.variable.cs @@ -9,7 +9,7 @@ namespace Tensorflow public static Operation global_variables_initializer() { var g = variables.global_variables(); - return variables.variables_initializer(g as RefVariable[]); + return variables.variables_initializer(g.ToArray()); } } } diff --git a/src/TensorFlowNET.Core/Variables/variables.py.cs b/src/TensorFlowNET.Core/Variables/variables.py.cs index 596cc5ab..ecb635ce 100644 --- a/src/TensorFlowNET.Core/Variables/variables.py.cs +++ b/src/TensorFlowNET.Core/Variables/variables.py.cs @@ -27,9 +27,11 @@ namespace Tensorflow /// special tokens filters by prefix. /// /// A list of `Variable` objects. - public static object global_variables(string scope = "") + public static List global_variables(string scope = "") { - return ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES, scope); + var result = ops.get_collection(ops.GraphKeys.GLOBAL_VARIABLES, scope); + + return result as List; } /// @@ -40,7 +42,7 @@ namespace Tensorflow /// An Op that run the initializers of all the specified variables. public static Operation variables_initializer(RefVariable[] var_list, string name = "init") { - return control_flow_ops.group(var_list.Select(x => x.initializer).ToArray()); + return control_flow_ops.group(var_list.Select(x => x.initializer).ToList()); } } }