Merge branch 'master' of https://github.com/SciSharp/TensorFlow.NET

Oceania2018 · Oceania2018 · commit 0595ea1b0f35 · 2019-06-15T09:01:25.000-05:00
diff --git a/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj b/src/TensorFlowNET.Core/TensorFlowNET.Core.csproj
@@ -48,7 +48,7 @@ Docs: https://tensorflownet.readthedocs.io</Description>
 
   <ItemGroup>
     <PackageReference Include="Google.Protobuf" Version="3.8.0" />
-    <PackageReference Include="NumSharp" Version="0.10.2" />
+    <PackageReference Include="NumSharp" Version="0.10.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/TensorFlowNET.Core/Train/Saving/BaseSaverBuilder.cs b/src/TensorFlowNET.Core/Train/Saving/BaseSaverBuilder.cs
@@ -16,6 +16,12 @@ public BaseSaverBuilder(SaverDef.Types.CheckpointFormatVersion write_version = S
             _write_version = write_version;
         }
 
+        /// <summary>
+        /// Create an Op to save 'saveables'.
+        /// </summary>
+        /// <param name="filename_tensor"></param>
+        /// <param name="saveables"></param>
+        /// <returns></returns>
         public virtual Operation save_op(Tensor filename_tensor, SaveableObject[] saveables)
         {
             var tensor_names = new List<string>();
@@ -105,6 +111,10 @@ public virtual SaverDef _build_internal(VariableV1[] names_to_saveables,
                 }
 
                 var graph = ops.get_default_graph();
+                // Do some sanity checking on collections containing
+                // PartitionedVariables. If a saved collection has a PartitionedVariable,
+                // the GraphDef needs to include concat ops to get the value (or there'll
+                // be a lookup error on load).
                 var check_collection_list = graph.get_all_collection_keys();
                 foreach (var collection_type in check_collection_list)
                 {
diff --git a/src/TensorFlowNET.Core/Train/Saving/Saver.cs b/src/TensorFlowNET.Core/Train/Saving/Saver.cs
@@ -158,7 +158,10 @@ public string save(Session sess,
             string model_checkpoint_path = "";
             string checkpoint_file = "";
 
-            checkpoint_file = $"{save_path}-{global_step}";
+            if (global_step > 0)
+                checkpoint_file = $"{save_path}-{global_step}";
+            else
+                checkpoint_file = save_path;
 
             var save_path_parent = Path.GetDirectoryName(save_path);
 
@@ -291,15 +294,13 @@ private void _RecordLastCheckpoint(string latest_save_path)
             if (_saver_def.MaxToKeep <= 0) return;
 
             // Remove first from list if the same name was used before.
-            foreach (var p in _last_checkpoints)
-                if (latest_save_path == _CheckpointFilename((p.Key, p.Value)))
-                    _last_checkpoints.Remove(p.Key);
-
-            // Append new path to list
-            _last_checkpoints.Add(latest_save_path, Python.time());
+            var _existed_checkpoints = _last_checkpoints.FirstOrDefault(p => latest_save_path == _CheckpointFilename((p.Key, p.Value)));
+            if (_existed_checkpoints.Key != null)
+                _last_checkpoints.Remove(_existed_checkpoints.Key);
+            _last_checkpoints.Add(latest_save_path, time());
 
             // If more than max_to_keep, remove oldest.
-            if(_last_checkpoints.Count > _saver_def.MaxToKeep)
+            if (_last_checkpoints.Count > _saver_def.MaxToKeep)
             {
                 var first = _last_checkpoints.First();
                 _last_checkpoints.Remove(first.Key);
diff --git a/src/TensorFlowNET.Core/Train/Saving/saver.py.cs b/src/TensorFlowNET.Core/Train/Saving/saver.py.cs
@@ -25,7 +25,7 @@ public static (Saver, object) _import_meta_graph_with_return_elements(string met
             var saver = _create_saver_from_imported_meta_graph(
                 meta_graph_def, import_scope, imported_vars);
 
-            return (saver, null);
+            return (saver, imported_return_elements);
         }
 
         /// <summary>
diff --git a/test/KerasNET.Test/Keras.UnitTest.csproj b/test/KerasNET.Test/Keras.UnitTest.csproj
@@ -26,7 +26,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
   </ItemGroup>
diff --git a/test/TensorFlowNET.Examples/ImageProcess/RetrainImageClassifier.cs b/test/TensorFlowNET.Examples/ImageProcess/RetrainImageClassifier.cs
@@ -105,6 +105,8 @@ public bool Run()
                 // Create a train saver that is used to restore values into an eval graph
                 // when exporting models.
                 var train_saver = tf.train.Saver();
+                train_saver.save(sess, CHECKPOINT_NAME);
+
                 sw.Restart();
 
                 for (int i = 0; i < how_many_training_steps; i++)
diff --git a/test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj b/test/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj
@@ -17,6 +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" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/TensorFlowNET.UnitTest/TensorFlowNET.UnitTest.csproj b/test/TensorFlowNET.UnitTest/TensorFlowNET.UnitTest.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,12 @@ public BaseSaverBuilder(SaverDef.Types.CheckpointFormatVersion write_version = S`
`16`	`16`	`_write_version = write_version;`
`17`	`17`	`}`
`18`	`18`
	`19`	`+ /// <summary>`
	`20`	`+ /// Create an Op to save 'saveables'.`
	`21`	`+ /// </summary>`
	`22`	`+ /// <param name="filename_tensor"></param>`
	`23`	`+ /// <param name="saveables"></param>`
	`24`	`+ /// <returns></returns>`
`19`	`25`	`public virtual Operation save_op(Tensor filename_tensor, SaveableObject[] saveables)`
`20`	`26`	`{`
`21`	`27`	`var tensor_names = new List<string>();`
`@@ -105,6 +111,10 @@ public virtual SaverDef _build_internal(VariableV1[] names_to_saveables,`
`105`	`111`	`}`
`106`	`112`
`107`	`113`	`var graph = ops.get_default_graph();`
	`114`	`+ // Do some sanity checking on collections containing`
	`115`	`+ // PartitionedVariables. If a saved collection has a PartitionedVariable,`
	`116`	`+ // the GraphDef needs to include concat ops to get the value (or there'll`
	`117`	`+ // be a lookup error on load).`
`108`	`118`	`var check_collection_list = graph.get_all_collection_keys();`
`109`	`119`	`foreach (var collection_type in check_collection_list)`
`110`	`120`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public static (Saver, object) _import_meta_graph_with_return_elements(string met`
`25`	`25`	`var saver = _create_saver_from_imported_meta_graph(`
`26`	`26`	`meta_graph_def, import_scope, imported_vars);`
`27`	`27`
`28`		`- return (saver, null);`
	`28`	`+ return (saver, imported_return_elements);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/// <summary>`