reset_metrics for every epoch.

Oceania2018 · Oceania2018 · commit f0030ca9bb40 · 2021-03-28T14:32:01.000-05:00
diff --git a/src/TensorFlowNET.Core/tensorflow.cs b/src/TensorFlowNET.Core/tensorflow.cs
@@ -48,7 +48,7 @@ public partial class tensorflow : ITensorFlowObject
         public tensorflow()
         {
             Logger = new LoggerConfiguration()
-                .MinimumLevel.Debug()
+                .MinimumLevel.Error()
                 .WriteTo.Console()
                 .CreateLogger();
 
diff --git a/src/TensorFlowNET.Keras/Engine/DataAdapters/TensorLikeDataAdapter.cs b/src/TensorFlowNET.Keras/Engine/DataAdapters/TensorLikeDataAdapter.cs
@@ -23,7 +23,7 @@ public TensorLikeDataAdapter(DataAdapterArgs args)
             num_samples = args.X.shape[0];
             var batch_size = args.BatchSize == -1 ? 32 : args.BatchSize;
             _batch_size = batch_size;
-            _size = num_samples < batch_size ? num_samples % batch_size : num_samples / batch_size;
+            _size = Convert.ToInt32(Math.Ceiling(num_samples / (batch_size + 0.0f)));
             num_full_batches = num_samples / batch_size;
             _partial_batch_size = num_samples % batch_size;
 
diff --git a/src/TensorFlowNET.Keras/Engine/Model.Fit.cs b/src/TensorFlowNET.Keras/Engine/Model.Fit.cs
@@ -89,7 +89,7 @@ void FitInternal(int epochs, int verbose)
             _train_counter.assign(0);
             foreach (var (epoch, iterator) in data_handler.enumerate_epochs())
             {
-                // reset_metrics();
+                reset_metrics();
                 // callbacks.on_epoch_begin(epoch)
                 // data_handler.catch_stop_iteration();
                 foreach (var step in data_handler.steps())
diff --git a/src/TensorFlowNET.Keras/Engine/Model.Metrics.cs b/src/TensorFlowNET.Keras/Engine/Model.Metrics.cs
@@ -10,6 +10,7 @@ public IEnumerable<Metric> metrics
             get
             {
                 var _metrics = new List<Metric>();
+
                 if (_is_compiled)
                 {
                     if (compiled_loss != null)
@@ -18,13 +19,17 @@ public IEnumerable<Metric> metrics
                         _metrics.add(compiled_metrics.metrics);
                 }
 
-                foreach (var layer in _flatten_layers())
-                {
-                    // _metrics.extend(layer.metrics);
-                }
+                /*foreach (var layer in _flatten_layers())
+                    _metrics.extend(layer.metrics);*/
 
                 return _metrics;
             }
         }
+
+        void reset_metrics()
+        {
+            foreach (var metric in metrics)
+                metric.reset_states();
+        }
     }
 }
diff --git a/src/TensorFlowNET.Keras/Metrics/Metric.cs b/src/TensorFlowNET.Keras/Metrics/Metric.cs
@@ -2,6 +2,7 @@
 using Tensorflow.Keras.ArgsDefinition;
 using Tensorflow.Keras.Engine;
 using static Tensorflow.Binding;
+using static Tensorflow.KerasApi;
 
 namespace Tensorflow.Keras.Metrics
 {
@@ -53,6 +54,12 @@ protected override IVariableV1 add_weight(string name,
         public virtual Tensor update_state(Tensor y_true, Tensor y_pred, Tensor sample_weight = null)
             => throw new NotImplementedException("");
 
+        public virtual void reset_states()
+        {
+            foreach (var v in weights)
+                v.assign(0);
+        }
+
         public virtual Tensor result()
             => throw new NotImplementedException("");
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public partial class tensorflow : ITensorFlowObject`
`48`	`48`	`public tensorflow()`
`49`	`49`	`{`
`50`	`50`	`Logger = new LoggerConfiguration()`
`51`		`- .MinimumLevel.Debug()`
	`51`	`+ .MinimumLevel.Error()`
`52`	`52`	`.WriteTo.Console()`
`53`	`53`	`.CreateLogger();`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ void FitInternal(int epochs, int verbose)`
`89`	`89`	`_train_counter.assign(0);`
`90`	`90`	`foreach (var (epoch, iterator) in data_handler.enumerate_epochs())`
`91`	`91`	`{`
`92`		`- // reset_metrics();`
	`92`	`+ reset_metrics();`
`93`	`93`	`// callbacks.on_epoch_begin(epoch)`
`94`	`94`	`// data_handler.catch_stop_iteration();`
`95`	`95`	`foreach (var step in data_handler.steps())`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ public IEnumerable<Metric> metrics`
`10`	`10`	`get`
`11`	`11`	`{`
`12`	`12`	`var _metrics = new List<Metric>();`
	`13`	`+`
`13`	`14`	`if (_is_compiled)`
`14`	`15`	`{`
`15`	`16`	`if (compiled_loss != null)`
`@@ -18,13 +19,17 @@ public IEnumerable<Metric> metrics`
`18`	`19`	`_metrics.add(compiled_metrics.metrics);`
`19`	`20`	`}`
`20`	`21`
`21`		`- foreach (var layer in _flatten_layers())`
`22`		`- {`
`23`		`- // _metrics.extend(layer.metrics);`
`24`		`- }`
	`22`	`+ /*foreach (var layer in _flatten_layers())`
	`23`	`+ _metrics.extend(layer.metrics);*/`
`25`	`24`
`26`	`25`	`return _metrics;`
`27`	`26`	`}`
`28`	`27`	`}`
	`28`	`+`
	`29`	`+ void reset_metrics()`
	`30`	`+ {`
	`31`	`+ foreach (var metric in metrics)`
	`32`	`+ metric.reset_states();`
	`33`	`+ }`
`29`	`34`	`}`
`30`	`35`	`}`