fix create_slot_with_initializer, upgrade to v1.14.0.

Oceania2018 · Oceania2018 · commit 9a71f758dc30 · 2019-06-19T21:36:40.000-05:00
diff --git a/src/TensorFlowNET.Core/APIs/tf.variable.cs b/src/TensorFlowNET.Core/APIs/tf.variable.cs
@@ -23,6 +23,8 @@ public static RefVariable get_variable(string name,
             TF_DataType dtype = TF_DataType.DtInvalid,
             object initializer = null, // IInitializer or Tensor
             bool? trainable = null,
+            bool? use_resource = null,
+            bool validate_shape = true,
             VariableSynchronization synchronization = VariableSynchronization.Auto,
             VariableAggregation aggregation = VariableAggregation.None)
         {
@@ -32,6 +34,8 @@ public static RefVariable get_variable(string name,
                 name, 
                 shape: shape, 
                 dtype: dtype,
+                use_resource: use_resource,
+                validate_shape: validate_shape,
                 initializer: initializer,
                 trainable: trainable);
         }
diff --git a/src/TensorFlowNET.Core/Train/AdamOptimizer.cs b/src/TensorFlowNET.Core/Train/AdamOptimizer.cs
@@ -73,7 +73,8 @@ protected override void _create_slots(RefVariable[] var_list)
             // Create slots for the first and second moments.
             foreach(var v in var_list)
             {
-                _zero_slot(v, "m", Name);
+                _zeros_slot(v, "m", Name);
+                _zeros_slot(v, "v", Name);
             }
         }
 
diff --git a/src/TensorFlowNET.Core/Train/Optimizer.cs b/src/TensorFlowNET.Core/Train/Optimizer.cs
@@ -21,7 +21,8 @@ public abstract class Optimizer : Trackable
         public static int GATE_OP = 1;
         public static int GATE_GRAPH = 2;
 
-        public string Name { get; set; }
+        string _name;
+        public string Name => _name;
         public float LearningRate { get; set; }
         public Tensor LearningRateTensor { get; set; }
         public bool _use_locking;
@@ -35,7 +36,7 @@ public Optimizer(float learning_rate, bool use_locking, string name = null)
             if (String.IsNullOrEmpty(name))
                 throw new NotImplementedException("Must specify the optimizer name");
 
-            Name = name;
+            _name = name;
             _use_locking = use_locking;
             LearningRate = learning_rate;
             // Dictionary of slots.
@@ -391,22 +392,34 @@ protected T _call_if_callable<T>(T param)
         /// <param name="slot_name"></param>
         /// <param name="op_name"></param>
         /// <returns></returns>
-        protected RefVariable _zero_slot(RefVariable var, string slot_name, string op_name)
+        protected RefVariable _zeros_slot(RefVariable var, string slot_name, string op_name)
         {
             var named_slots = _slot_dict(slot_name);
             if (!named_slots.ContainsKey(_var_key(var)))
             {
                 var new_slot_variable = slot_creator.create_zeros_slot(var, op_name);
+                _restore_slot_variable(slot_name: slot_name, variable: var, slot_variable: new_slot_variable);
+                named_slots[_var_key(var)] = new_slot_variable;
             }
             return named_slots[_var_key(var)];
         }
 
+        /// <summary>
+        /// Restore a newly created slot variable's value.
+        /// </summary>
+        protected void _restore_slot_variable(string slot_name, RefVariable variable, RefVariable slot_variable)
+        {
+            var variable_key = _var_key(variable);
+            // TODO
+        }
+
         protected Dictionary<string, RefVariable> _slot_dict(string slot_name)
         {
             var named_slots = _slots.ContainsKey(slot_name) ? _slots[slot_name] : null;
             if(named_slots == null)
             {
-                _slots[slot_name] = new Dictionary<string, RefVariable>();
+                named_slots = new Dictionary<string, RefVariable>();
+                _slots[slot_name] = named_slots;
             }
 
             return named_slots;
diff --git a/src/TensorFlowNET.Core/Train/SlotCreator.cs b/src/TensorFlowNET.Core/Train/SlotCreator.cs
@@ -43,7 +43,7 @@ public RefVariable create_slot_with_initializer(RefVariable primary, IInitialize
         {
             var validate_shape = shape.is_fully_defined();
             var prefix = primary.op.name;
-            return with(new variable_scope(prefix + "/" + name), delegate
+            return with(new variable_scope(string.Empty, prefix + "/" + name), delegate
             {
                 return _create_slot_var(primary, initializer, "", validate_shape, shape, dtype);
             });
@@ -62,11 +62,11 @@ public RefVariable create_slot_with_initializer(RefVariable primary, IInitialize
         private RefVariable _create_slot_var(VariableV1 primary, IInitializer val, string scope, bool validate_shape, 
             TensorShape shape, TF_DataType dtype)
         {
-            bool use_resource = primary is RefVariable;
+            bool use_resource = primary is ResourceVariable;
             if (resource_variable_ops.is_resource_variable(primary))
                 use_resource = true;
 
-            var slot = variable_scope.get_variable(
+            var slot = tf.get_variable(
               scope,
               initializer: val,
               trainable: false,
diff --git a/src/TensorFlowNET.Core/Variables/VariableScope.cs b/src/TensorFlowNET.Core/Variables/VariableScope.cs
@@ -37,6 +37,8 @@ public RefVariable get_variable(_VariableStore var_store,
             TF_DataType dtype = TF_DataType.DtInvalid,
             object initializer = null, // IInitializer or Tensor
             bool? trainable = null,
+            bool? use_resource = null,
+            bool validate_shape = true,
             VariableSynchronization synchronization = VariableSynchronization.Auto,
             VariableAggregation aggregation= VariableAggregation.None)
         {
diff --git a/src/TensorFlowNET.Core/Variables/variable_scope.py.cs b/src/TensorFlowNET.Core/Variables/variable_scope.py.cs
@@ -104,7 +104,7 @@ private VariableScope _enter_scope_uncached()
                 current_name_scope = ops.name_scope(name_scope);
             }
 
-            if (_name != null || _scope != null)
+            if (!string.IsNullOrEmpty(_name) || _scope != null)
             {
                 var name_scope = _scope.name.Split('/').Last();
                 if (current_name_scope == null)
diff --git a/tensorflowlib/README.md b/tensorflowlib/README.md
@@ -3,12 +3,12 @@ TensorFlow.NET pack all required libraries in architecture-specific assemblies f
 Here are some pre-built TensorFlow binaries you can use for each platform:
 
 - Linux
-  - CPU-only: https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.13.1.tar.gz
-  - GPU-enabled: https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.13.1.tar.gz
-- Mac: https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.13.1.tar.gz
+  - CPU-only: https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz
+  - GPU-enabled: https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz
+- Mac: https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz
 - Windows
-  - CPU-only: https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-windows-x86_64-1.13.1.zip
-  - GPU-enabled: https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-windows-x86_64-1.13.1.zip
+  - CPU-only: https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-windows-x86_64-1.14.0.zip
+  - GPU-enabled: https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-windows-x86_64-1.14.0.zip
 
 ### Run in Linux
 
@@ -41,7 +41,7 @@ pacman -S git patch unzip
 
 4. Install from local wheel file.
 
-`pip install C:/tmp/tensorflow_pkg/tensorflow-1.13.0-cp36-cp36m-win_amd64.whl`
+`pip install C:/tmp/tensorflow_pkg/tensorflow-1.14.0-cp36-cp36m-win_amd64.whl`
 
 ### Export more APIs
 
diff --git a/tensorflowlib/runtimes/win-x64/native/tensorflow.dll b/tensorflowlib/runtimes/win-x64/native/tensorflow.dll
diff --git a/test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj b/test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="SharpZipLib" Version="1.1.0" />
     <PackageReference Include="System.Drawing.Common" Version="4.5.1" />
-    <PackageReference Include="TensorFlow.NET" Version="0.8.0" />
+    <PackageReference Include="TensorFlow.NET" Version="0.8.2" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,8 @@ protected override void _create_slots(RefVariable[] var_list)`
`73`	`73`	`// Create slots for the first and second moments.`
`74`	`74`	`foreach(var v in var_list)`
`75`	`75`	`{`
`76`		`- _zero_slot(v, "m", Name);`
	`76`	`+ _zeros_slot(v, "m", Name);`
	`77`	`+ _zeros_slot(v, "v", Name);`
`77`	`78`	`}`
`78`	`79`	`}`
`79`	`80`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ public RefVariable get_variable(_VariableStore var_store,`
`37`	`37`	`TF_DataType dtype = TF_DataType.DtInvalid,`
`38`	`38`	`object initializer = null, // IInitializer or Tensor`
`39`	`39`	`bool? trainable = null,`
	`40`	`+ bool? use_resource = null,`
	`41`	`+ bool validate_shape = true,`
`40`	`42`	`VariableSynchronization synchronization = VariableSynchronization.Auto,`
`41`	`43`	`VariableAggregation aggregation= VariableAggregation.None)`
`42`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ private VariableScope _enter_scope_uncached()`
`104`	`104`	`current_name_scope = ops.name_scope(name_scope);`
`105`	`105`	`}`
`106`	`106`
`107`		`- if (_name != null \|\| _scope != null)`
	`107`	`+ if (!string.IsNullOrEmpty(_name) \|\| _scope != null)`
`108`	`108`	`{`
`109`	`109`	`var name_scope = _scope.name.Split('/').Last();`
`110`	`110`	`if (current_name_scope == null)`