create_estimator_and_inputs

Oceania2018 · Oceania2018 · commit de3ecc8556b2 · 2019-09-12T06:31:17.000-05:00
diff --git a/src/TensorFlowNET.Core/APIs/tf.estimator.cs b/src/TensorFlowNET.Core/APIs/tf.estimator.cs
@@ -26,8 +26,8 @@ public partial class tensorflow
 
         public class Estimator_Internal
         {
-            public Estimator Estimator(RunConfig config) 
-                => new Estimator(config: config);
+            public Estimator Estimator(Action model_fn, RunConfig config) 
+                => new Estimator(model_fn: model_fn, config: config);
 
             public RunConfig RunConfig(string model_dir)
                 => new RunConfig(model_dir: model_dir);
diff --git a/src/TensorFlowNET.Core/Estimators/Estimator.cs b/src/TensorFlowNET.Core/Estimators/Estimator.cs
@@ -18,7 +18,7 @@ public class Estimator : IObjectLife
 
         string _model_dir;
 
-        public Estimator(RunConfig config)
+        public Estimator(Action model_fn, RunConfig config)
         {
             _config = config;
             _model_dir = _config.model_dir;
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.11.3</Version>
+    <Version>0.11.4</Version>
     <Authors>Haiping Chen, Meinrad Recheis, Eli Belash</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.11.3.0</AssemblyVersion>
+    <AssemblyVersion>0.11.4.0</AssemblyVersion>
     <PackageReleaseNotes>Changes since v0.10.0:
 1. Upgrade NumSharp to v0.20.
 2. Add DisposableObject class to manage object lifetime.
@@ -30,7 +30,7 @@ Docs: https://tensorflownet.readthedocs.io</Description>
 9. MultiThread is safe.
 10. Support n-dim indexing for tensor.</PackageReleaseNotes>
     <LangVersion>7.3</LangVersion>
-    <FileVersion>0.11.3.0</FileVersion>
+    <FileVersion>0.11.4.0</FileVersion>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <SignAssembly>true</SignAssembly>
diff --git a/src/TensorFlowNET.Models/ObjectDetection/ModelLib.cs b/src/TensorFlowNET.Models/ObjectDetection/ModelLib.cs
@@ -18,18 +18,20 @@ public TrainAndEvalDict create_estimator_and_inputs(RunConfig run_config,
             int sample_1_of_n_eval_examples = 0,
             int sample_1_of_n_eval_on_train_examples = 1)
         {
-            var estimator = tf.estimator.Estimator(config: run_config);
-
             var config = ConfigUtil.get_configs_from_pipeline_file(pipeline_config_path);
             var eval_input_configs = config.EvalInputReader;
 
             var eval_input_fns = new Action[eval_input_configs.Count];
+            var eval_input_names = eval_input_configs.Select(eval_input_config => eval_input_config.Name).ToArray();
+            Action model_fn = () => { };
+            var estimator = tf.estimator.Estimator(model_fn: model_fn, config: run_config);
 
             return new TrainAndEvalDict
             {
                 estimator = estimator,
                 train_steps = train_steps,
-                eval_input_fns = eval_input_fns
+                eval_input_fns = eval_input_fns,
+                eval_input_names = eval_input_names
             };
         }
 
diff --git a/test/TensorFlowNET.UnitTest/Estimators/RunConfigTest.cs b/test/TensorFlowNET.UnitTest/Estimators/RunConfigTest.cs
@@ -53,7 +53,6 @@ public void test_default_property_values()
             Assert.IsNull(config.tf_random_seed);
             Assert.AreEqual(100, config.save_summary_steps);
             Assert.AreEqual(600, config.save_checkpoints_secs);
-            Assert.IsNull(config.save_checkpoints_steps);
             Assert.AreEqual(5, config.keep_checkpoint_max);
             Assert.AreEqual(10000, config.keep_checkpoint_every_n_hours);
             Assert.IsNull(config.service);
diff --git a/test/TensorFlowNET.UnitTest/MultithreadingTests.cs b/test/TensorFlowNET.UnitTest/MultithreadingTests.cs
@@ -289,6 +289,9 @@ void Core(int tid)
         [TestMethod]
         public void TF_GraphOperationByName_FromModel()
         {
+            if (!Directory.Exists(modelPath))
+                return;
+
             MultiThreadedUnitTestExecuter.Run(8, Core);
 
             //the core method

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ public partial class tensorflow`
`26`	`26`
`27`	`27`	`public class Estimator_Internal`
`28`	`28`	`{`
`29`		`- public Estimator Estimator(RunConfig config)`
`30`		`- => new Estimator(config: config);`
	`29`	`+ public Estimator Estimator(Action model_fn, RunConfig config)`
	`30`	`+ => new Estimator(model_fn: model_fn, config: config);`
`31`	`31`
`32`	`32`	`public RunConfig RunConfig(string model_dir)`
`33`	`33`	`=> new RunConfig(model_dir: model_dir);`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class Estimator : IObjectLife`
`18`	`18`
`19`	`19`	`string _model_dir;`
`20`	`20`
`21`		`- public Estimator(RunConfig config)`
	`21`	`+ public Estimator(Action model_fn, RunConfig config)`
`22`	`22`	`{`
`23`	`23`	`_config = config;`
`24`	`24`	`_model_dir = _config.model_dir;`
Original file line number	Diff line number	Diff line change
`@@ -289,6 +289,9 @@ void Core(int tid)`
`289`	`289`	`[TestMethod]`
`290`	`290`	`public void TF_GraphOperationByName_FromModel()`
`291`	`291`	`{`
	`292`	`+ if (!Directory.Exists(modelPath))`
	`293`	`+ return;`
	`294`	`+`
`292`	`295`	`MultiThreadedUnitTestExecuter.Run(8, Core);`
`293`	`296`
`294`	`297`	`//the core method`