new operation alwasy in current graph.

Oceania2018 · Oceania2018 · commit de696fb34186 · 2019-08-03T02:39:54.000-05:00
diff --git a/src/TensorFlowNET.Core/Graphs/Graph.Import.cs b/src/TensorFlowNET.Core/Graphs/Graph.Import.cs
@@ -59,12 +59,16 @@ public Status Import(byte[] bytes, string prefix = "")
             return status;
         }
 
+        static object locker = new object();
         public static Graph ImportFromPB(string file_path, string name = null)
         {
-            var graph = tf.Graph().as_default();
-            var graph_def = GraphDef.Parser.ParseFrom(File.ReadAllBytes(file_path));
-            importer.import_graph_def(graph_def, name: name);
-            return graph;
+            lock (locker)
+            {
+                var graph = tf.Graph().as_default();
+                var graph_def = GraphDef.Parser.ParseFrom(File.ReadAllBytes(file_path));
+                importer.import_graph_def(graph_def, name: name);
+                return graph;
+            }
         }
     }
 }
diff --git a/src/TensorFlowNET.Core/Graphs/Graph.Operation.cs b/src/TensorFlowNET.Core/Graphs/Graph.Operation.cs
@@ -55,7 +55,13 @@ public unsafe Operation[] ReturnOperations(IntPtr results)
 
         public Operation OperationByName(string operName)
         {
-            return c_api.TF_GraphOperationByName(_handle, operName);
+            var handle = c_api.TF_GraphOperationByName(_handle, operName);
+            if(graph_key != tf.get_default_graph().graph_key)
+            {
+                Console.WriteLine($"Current graph is not default graph.");
+                // throw new ValueError($"Current graph is not default graph.");
+            }
+            return new Operation(handle, g: this);
         }
 
         public ITensorOrOperation[] get_operations()
diff --git a/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj b/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>TensorFlow.NET</AssemblyName>
     <RootNamespace>Tensorflow</RootNamespace>
     <TargetTensorFlow>1.14.0</TargetTensorFlow>
-    <Version>0.10.8</Version>
+    <Version>0.10.9</Version>
     <Authors>Haiping Chen, Meinrad Recheis</Authors>
     <Company>SciSharp STACK</Company>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -17,7 +17,7 @@
     <PackageTags>TensorFlow, NumSharp, SciSharp, MachineLearning, TensorFlow.NET, C#</PackageTags>
     <Description>Google's TensorFlow full binding in .NET Standard.
 Docs: https://tensorflownet.readthedocs.io</Description>
-    <AssemblyVersion>0.10.8.0</AssemblyVersion>
+    <AssemblyVersion>0.10.9.0</AssemblyVersion>
     <PackageReleaseNotes>Changes since v0.9.0:
 
 1. Added full connected Convolution Neural Network example.
@@ -37,7 +37,7 @@ Docs: https://tensorflownet.readthedocs.io</Description>
 15. Fix Tensor memory leak.
 16. Rename with to tf_with that is only used to build graph purpose.</PackageReleaseNotes>
     <LangVersion>7.2</LangVersion>
-    <FileVersion>0.10.8.0</FileVersion>
+    <FileVersion>0.10.9.0</FileVersion>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <SignAssembly>true</SignAssembly>

Original file line number	Diff line number	Diff line change
`@@ -59,12 +59,16 @@ public Status Import(byte[] bytes, string prefix = "")`
`59`	`59`	`return status;`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ static object locker = new object();`
`62`	`63`	`public static Graph ImportFromPB(string file_path, string name = null)`
`63`	`64`	`{`
`64`		`- var graph = tf.Graph().as_default();`
`65`		`- var graph_def = GraphDef.Parser.ParseFrom(File.ReadAllBytes(file_path));`
`66`		`- importer.import_graph_def(graph_def, name: name);`
`67`		`- return graph;`
	`65`	`+ lock (locker)`
	`66`	`+ {`
	`67`	`+ var graph = tf.Graph().as_default();`
	`68`	`+ var graph_def = GraphDef.Parser.ParseFrom(File.ReadAllBytes(file_path));`
	`69`	`+ importer.import_graph_def(graph_def, name: name);`
	`70`	`+ return graph;`
	`71`	`+ }`
`68`	`72`	`}`
`69`	`73`	`}`
`70`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,13 @@ public unsafe Operation[] ReturnOperations(IntPtr results)`
`55`	`55`
`56`	`56`	`public Operation OperationByName(string operName)`
`57`	`57`	`{`
`58`		`- return c_api.TF_GraphOperationByName(_handle, operName);`
	`58`	`+ var handle = c_api.TF_GraphOperationByName(_handle, operName);`
	`59`	`+ if(graph_key != tf.get_default_graph().graph_key)`
	`60`	`+ {`
	`61`	`+ Console.WriteLine($"Current graph is not default graph.");`
	`62`	`+ // throw new ValueError($"Current graph is not default graph.");`
	`63`	`+ }`
	`64`	`+ return new Operation(handle, g: this);`
`59`	`65`	`}`
`60`	`66`
`61`	`67`	`public ITensorOrOperation[] get_operations()`