Fix conv_net.load_weights #956

Oceania2018 · Oceania2018 · commit 27a287135054 · 2022-12-30T09:18:55.000-06:00
diff --git a/src/TensorFlowNET.Examples/GAN/MnistGAN.cs b/src/TensorFlowNET.Examples/GAN/MnistGAN.cs
@@ -18,11 +18,12 @@ public class MnistGAN : SciSharpExample, IExample
         float LeakyReLU_alpha = 0.2f;
 
 #if GPU
-        int epochs = 2000; // Better effect, but longer time
+        int epochs = 1000; // Better effect, but longer time
+        int batch_size = 16;
 #else
         int epochs = 20;
-#endif
         int batch_size = 64;
+#endif
 
         string imgpath = "dcgan\\imgs";
         string modelpath = "dcgan\\models";
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/ImageClassificationKeras.cs b/src/TensorFlowNET.Examples/ImageProcessing/ImageClassificationKeras.cs
@@ -17,7 +17,7 @@ public class ImageClassificationKeras : SciSharpExample, IExample
     {
         int batch_size = 32;
         int epochs = 3;
-        Shape img_dim = (180, 180);
+        Shape img_dim = (64, 64);
         IDatasetV2 train_ds, val_ds;
         Model model;
 
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/MnistCnnKerasSubclass.cs b/src/TensorFlowNET.Examples/ImageProcessing/MnistCnnKerasSubclass.cs
@@ -62,7 +62,8 @@ public bool Run()
             PrepareData();
 
             Train();
-            Test();
+
+            // Test();
 
             return accuracy_test > 0.85;
         }
@@ -102,7 +103,7 @@ public override void Train()
                 print($"Test Accuracy: {accuracy_test}");
             }
 
-            conv_net.save_weights("model.weights");
+            conv_net.save_weights("weights.h5");
         }
 
         public override void Test()
@@ -112,12 +113,14 @@ public override void Test()
                 NumClasses = num_classes
             });
 
-            conv_net.load_weights("model.weights");
-
-            // Test model on validation set.
+            // Test model on testing set.
             {
                 x_test = x_test["::100"];
                 y_test = y_test["::100"];
+
+                conv_net.build(x_test.shape);
+                conv_net.load_weights("weights.h5");
+
                 var pred = conv_net.Apply(x_test);
                 accuracy_test = (float)accuracy(pred, y_test);
                 print($"Test Accuracy: {accuracy_test}");
diff --git a/src/TensorFlowNET.Examples/Program.cs b/src/TensorFlowNET.Examples/Program.cs
@@ -37,7 +37,7 @@ static void Main(string[] args)
                 .Where(x => x.GetInterfaces().Contains(typeof(IExample)))
                 //.Where(x => x.Name == nameof(WeatherPrediction))
                 //.Where(x => x.Name == nameof(SentimentClassification))
-                //.Where(x => x.Name == nameof(MnistInYOLOv3))
+                .Where(x => x.Name == nameof(MnistCnnKerasSubclass))
                 .ToArray();
 
             Console.WriteLine(Environment.OSVersion, Color.Yellow);
diff --git a/src/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj b/src/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj
@@ -47,7 +47,6 @@
 
   <ItemGroup>
     <PackageReference Include="Colorful.Console" Version="1.2.15" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.4.0.20200915" />
 	<PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.10.0" Condition="'$(Configuration)'!='GPU'" />
     <PackageReference Include="SciSharp.TensorFlow.Redist-Windows-GPU" Version="2.10.0" Condition="'$(Configuration)'=='GPU'" />

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class ImageClassificationKeras : SciSharpExample, IExample`
`17`	`17`	`{`
`18`	`18`	`int batch_size = 32;`
`19`	`19`	`int epochs = 3;`
`20`		`- Shape img_dim = (180, 180);`
	`20`	`+ Shape img_dim = (64, 64);`
`21`	`21`	`IDatasetV2 train_ds, val_ds;`
`22`	`22`	`Model model;`
`23`	`23`