uid_function for func_name

SciSharp · Mar 14, 2021 · a814d2d · a814d2d
1 parent 827d8f2
commit a814d2d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/src/TensorFlowNET.Core/Data/MapDataset.cs b/src/TensorFlowNET.Core/Data/MapDataset.cs
@@ -15,11 +15,11 @@ public class MapDataset : UnaryDataset
             bool preserve_cardinality = false,
             bool use_legacy_function = false) : base(input_dataset)
         {
-            var func = new ConcreteFunction($"{map_func.Method.Name}_{Guid.NewGuid()}");
+            var func = new ConcreteFunction($"{map_func.Method.Name}_{Tensorflow.ops.uid_function()}");
             func.Enter();
             var inputs = new Tensors();
             foreach (var input in input_dataset.element_spec)
-                inputs.Add(tf.placeholder(input.dtype, shape: input.shape));
+                inputs.Add(tf.placeholder(input.dtype, shape: input.shape, name: "arg"));
             var outputs = map_func(inputs);
             func.ToGraph(inputs, outputs);
             func.Exit();

diff --git a/src/TensorFlowNET.Core/Functions/ConcreteFunction.cs b/src/TensorFlowNET.Core/Functions/ConcreteFunction.cs
@@ -36,7 +36,7 @@ public ConcreteFunction(FuncGraph graph, Dictionary<string, string> attrs = null
 
         public ConcreteFunction(Func<Tensor, Tensor> func, TF_DataType dtype)
         {
-            string func_name = $"{func.Method.Name}_{Guid.NewGuid()}";
+            string func_name = $"{func.Method.Name}_{ops.uid_function()}";
 
             func_graph = new FuncGraph(func_name);
             func_graph.as_default();
@@ -53,7 +53,7 @@ public ConcreteFunction(Func<Tensor, Tensor> func, TF_DataType dtype)
 
         public ConcreteFunction(Func<Tensor, IDatasetV2> func, TF_DataType dtype)
         {
-            string func_name = $"{func.Method.Name}_{Guid.NewGuid()}";
+            string func_name = $"{func.Method.Name}_{ops.uid_function()}";
 
             func_graph = new FuncGraph(func_name);
             func_graph.as_default();
@@ -74,7 +74,7 @@ public ConcreteFunction(Func<Tensor, IDatasetV2> func, TF_DataType dtype)
         public ConcreteFunction(Func<Tensors, Tensors> func,
             TF_DataType[] dtypes, TensorShape[] shapes)
         {
-            string func_name = $"{func.Method.Name}_{Guid.NewGuid()}";
+            string func_name = $"{func.Method.Name}_{ops.uid_function()}";
 
             // IntPtr func_handle;
             func_graph = new FuncGraph(func_name);

diff --git a/src/TensorFlowNET.Core/Graphs/AutoGraph.cs b/src/TensorFlowNET.Core/Graphs/AutoGraph.cs
@@ -8,7 +8,7 @@ public class AutoGraph
     {
         public Func<Tensor, Tensor> to_graph(Func<Tensor, Tensor> func)
         {
-            string func_name = $"{func.Method.Name}_{Guid.NewGuid()}";
+            string func_name = $"{func.Method.Name}_{ops.uid_function()}";
 
             var graph = new FuncGraph(func_name);
             graph.as_default();
@@ -38,7 +38,7 @@ public class AutoGraph
 
         public Func<Tensor, Tensor, Tensor> to_graph(Func<Tensor, Tensor, Tensor> func)
         {
-            string func_name = $"{func.Method.Name}_{Guid.NewGuid()}";
+            string func_name = $"{func.Method.Name}_{ops.uid_function()}";
 
             var graph = new FuncGraph(func_name);
             graph.as_default();

diff --git a/src/TensorFlowNET.Core/Graphs/AutoGraphAttribute.cs b/src/TensorFlowNET.Core/Graphs/AutoGraphAttribute.cs
@@ -22,7 +22,7 @@ public sealed class AutoGraphAttribute : OnMethodBoundaryAspect
         public override void OnEntry(MethodExecutionArgs args)
         {
             // TODO: func_name can be cache in FullName + Args
-            func_name = $"{args.Method.DeclaringType.FullName}.{args.Method.Name}_{Guid.NewGuid()}";
+            func_name = $"{args.Method.DeclaringType.FullName}.{args.Method.Name}_{ops.uid_function()}";
 
             if (functions.ContainsKey(func_name))
             {

diff --git a/src/TensorFlowNET.Core/ops.cs b/src/TensorFlowNET.Core/ops.cs
@@ -353,6 +353,10 @@ public static int uid()
             return Interlocked.Increment(ref uid_number);
         }
 
+        static int uid_number_for_function = 0;
+        public static int uid_function()
+            => Interlocked.Increment(ref uid_number_for_function);
+
         public static void reset_uid()
         {
             uid_number = -1;