Graph.Operation: Throw ValueError exception when Current graph is not default graph.

Nucs · Nucs · commit 8cb647082cd4 · 2019-08-30T19:39:26.000+03:00
diff --git a/src/TensorFlowNET.Core/Graphs/Graph.Operation.cs b/src/TensorFlowNET.Core/Graphs/Graph.Operation.cs
@@ -54,19 +54,21 @@ public Operation[] ReturnOperations(IntPtr results)
                     var handle = return_oper_handle.node + tf_op_size * i;
                     return_opers[i] = new Operation(*(IntPtr*)handle);
                 }
-            }
-
+            }
+
             return return_opers;
         }
 
         public Operation OperationByName(string 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.");
+            var defaultKey = tf.get_default_graph().graph_key;
+            if (graph_key != defaultKey)
+            {
+                //Console.WriteLine($"Current graph is not default graph.");
+                throw new ValueError($"Current graph is not default graph. Default Graph Key: {defaultKey}, Current Graph Key: {graph_key}");
             }
+
             return new Operation(handle, g: this);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -54,19 +54,21 @@ public Operation[] ReturnOperations(IntPtr results)`
`54`	`54`	`var handle = return_oper_handle.node + tf_op_size * i;`
`55`	`55`	`return_opers[i] = new Operation((IntPtr)handle);`
`56`	`56`	`}`
`57`		`- }`
`58`		`-`
	`57`	`+ }`
	`58`	`+`
`59`	`59`	`return return_opers;`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`public Operation OperationByName(string operName)`
`63`	`63`	`{`
`64`	`64`	`var handle = c_api.TF_GraphOperationByName(_handle, operName);`
`65`		`- if(graph_key != tf.get_default_graph().graph_key)`
`66`		`- {`
`67`		`- Console.WriteLine($"Current graph is not default graph.");`
`68`		`- // throw new ValueError($"Current graph is not default graph.");`
	`65`	`+ var defaultKey = tf.get_default_graph().graph_key;`
	`66`	`+ if (graph_key != defaultKey)`
	`67`	`+ {`
	`68`	`+ //Console.WriteLine($"Current graph is not default graph.");`
	`69`	`+ throw new ValueError($"Current graph is not default graph. Default Graph Key: {defaultKey}, Current Graph Key: {graph_key}");`
`69`	`70`	`}`
	`71`	`+`
`70`	`72`	`return new Operation(handle, g: this);`
`71`	`73`	`}`
`72`	`74`