Go back to VarHandleOp

migueldeicaza · migueldeicaza · commit b09c2e466fe3 · 2017-09-14T21:10:01.000-04:00
diff --git a/TensorFlowSharp/OperationsExtras.cs b/TensorFlowSharp/OperationsExtras.cs
@@ -104,9 +104,9 @@ public TFOutput Variable (TFOutput initialValue, out TFOperation init, out TFOut
 
 			using (var newScope = WithScope (scopeName)) {
 				var type = initialValue.OutputType;
-				var handle = VariableV2 (new TFShape (GetShape (initialValue)), type);
+				var handle = VarHandleOp (type, new TFShape (GetShape (initialValue)));
 				using (var aScope = WithScope ("Assign")) {
-					init = Assign (handle, initialValue).Operation;
+					init = AssignVariableOp (handle, initialValue);
 					if (trainable)
 						AddTrainableVariable (handle.Operation);
 					using (var rScope = WithScope ("Read")) {
@@ -187,10 +187,10 @@ public TFOutput Variable (TFOutput initialValue, out TFOutput value, bool traina
 
 			using (var newScope = WithScope (scopeName)) {
 				var type = initialValue.OutputType;
-				var handle = VariableV2 (new TFShape (GetShape (initialValue)), type);
+				var handle = VarHandleOp (type, new TFShape (GetShape (initialValue)));
 				using (var aScope = WithScope ("Assign")) {
-					var init = Assign (handle, initialValue);
-					AddInitVariable (init.Operation);
+					var init = AssignVariableOp (handle, initialValue);
+					AddInitVariable (init);
 					if (trainable)
 						AddTrainableVariable (handle.Operation);
 					using (var rScope = WithScope ("Read")) {
@@ -207,7 +207,7 @@ public TFOutput Variable (TFOutput initialValue, out TFOutput value, bool traina
 		/// <param name="initialValue">Initial value.</param>
 		/// <param name="trainable">If true, this add the variable to the graph's TrainableVariables, this collection is intended to be used by the Optimizer classes.</param>
 		/// <param name="operName">Operation name, optional.</param>
-		/// <returns>The returning TFOutput returns the handle to the variable.</returns>
+		/// <returns>The returning TFOutput returns the handle to the variable, this is a VarHandleOp, if you want to read it, create a ReadVariableOp on result.</returns>
 		/// <remarks>
 		/// Variables need to be initialized before the main execution so you will typically want to
 		/// run the session on the variable.
@@ -221,10 +221,10 @@ public TFOutput Variable (TFOutput initialValue, bool trainable = true, string o
 			using (var newScope = WithScope (scopeName)) {
 				var type = initialValue.OutputType;
 
-				var handle = VariableV2 (new TFShape (GetShape (initialValue)), type);
+				var handle = VarHandleOp (type, new TFShape (GetShape (initialValue)));
 				using (var aScope = WithScope ("Assign")) {
-					var init = Assign (handle, initialValue);
-					AddInitVariable (handle.Operation);
+					var init = AssignVariableOp (handle, initialValue);
+					AddInitVariable (init);
 					if (trainable)
 						AddTrainableVariable (handle.Operation);
 					return handle;
