Using Keras for .NET v0.1.0.

Oceania2018 · Oceania2018 · commit bc4eea022a3d · 2020-11-14T07:49:51.000-06:00
diff --git a/SciSharp STACK Examples.sln b/SciSharp STACK Examples.sln
@@ -9,10 +9,6 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "TensorFlowNET.Examples.FSha
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpCV.Exmaples", "src\SharpCV.Exmaples\SharpCV.Exmaples.csproj", "{935764FA-5297-4E49-945C-D04F1EF84EAF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tensorflow.Binding", "..\TensorFlow.NET\src\TensorFlowNET.Core\Tensorflow.Binding.csproj", "{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tensorflow.Keras", "..\TensorFlow.NET\src\TensorFlowNET.Keras\Tensorflow.Keras.csproj", "{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -101,54 +97,6 @@ Global
 		{935764FA-5297-4E49-945C-D04F1EF84EAF}.Release|x64.Build.0 = Release|Any CPU
 		{935764FA-5297-4E49-945C-D04F1EF84EAF}.Release|x86.ActiveCfg = Release|Any CPU
 		{935764FA-5297-4E49-945C-D04F1EF84EAF}.Release|x86.Build.0 = Release|Any CPU
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Debug|x64.ActiveCfg = Debug|x64
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Debug|x64.Build.0 = Debug|x64
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Debug|x86.Build.0 = Debug|Any CPU
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Debug-Minimal|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Debug-Minimal|Any CPU.Build.0 = Debug|Any CPU
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Debug-Minimal|x64.ActiveCfg = Debug|x64
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Debug-Minimal|x64.Build.0 = Debug|x64
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Debug-Minimal|x86.ActiveCfg = Debug|Any CPU
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Debug-Minimal|x86.Build.0 = Debug|Any CPU
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Publish|Any CPU.ActiveCfg = Release|Any CPU
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Publish|Any CPU.Build.0 = Release|Any CPU
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Publish|x64.ActiveCfg = Debug|x64
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Publish|x64.Build.0 = Debug|x64
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Publish|x86.ActiveCfg = Release|Any CPU
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Publish|x86.Build.0 = Release|Any CPU
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Release|x64.ActiveCfg = Release|x64
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Release|x64.Build.0 = Release|x64
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Release|x86.ActiveCfg = Release|Any CPU
-		{F0DEC3F1-418F-46D4-8AC4-A0A49EB79EB4}.Release|x86.Build.0 = Release|Any CPU
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Debug|x64.ActiveCfg = Debug|x64
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Debug|x64.Build.0 = Debug|x64
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Debug|x86.Build.0 = Debug|Any CPU
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Debug-Minimal|Any CPU.ActiveCfg = Debug|Any CPU
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Debug-Minimal|Any CPU.Build.0 = Debug|Any CPU
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Debug-Minimal|x64.ActiveCfg = Debug|x64
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Debug-Minimal|x64.Build.0 = Debug|x64
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Debug-Minimal|x86.ActiveCfg = Debug|Any CPU
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Debug-Minimal|x86.Build.0 = Debug|Any CPU
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Publish|Any CPU.ActiveCfg = Release|Any CPU
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Publish|Any CPU.Build.0 = Release|Any CPU
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Publish|x64.ActiveCfg = Debug|x64
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Publish|x64.Build.0 = Debug|x64
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Publish|x86.ActiveCfg = Release|Any CPU
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Publish|x86.Build.0 = Release|Any CPU
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Release|x64.ActiveCfg = Release|x64
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Release|x64.Build.0 = Release|x64
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Release|x86.ActiveCfg = Release|Any CPU
-		{520BE7D7-C0DC-4E92-A339-BDF6775E02A7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/TensorFlowNET.Examples/BasicModels/LinearRegressionEager.cs b/src/TensorFlowNET.Examples/BasicModels/LinearRegressionEager.cs
@@ -16,7 +16,7 @@ limitations under the License.
 
 using NumSharp;
 using static Tensorflow.Binding;
-using static Tensorflow.KerasExt;
+using static Tensorflow.KerasApi;
 
 namespace TensorFlowNET.Examples
 {
diff --git a/src/TensorFlowNET.Examples/BasicModels/LogisticRegressionEager.cs b/src/TensorFlowNET.Examples/BasicModels/LogisticRegressionEager.cs
@@ -20,7 +20,7 @@ limitations under the License.
 using System.IO;
 using Tensorflow;
 using static Tensorflow.Binding;
-using static Tensorflow.KerasExt;
+using static Tensorflow.KerasApi;
 
 namespace TensorFlowNET.Examples
 {
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/DigitRecognitionCnnEager.cs b/src/TensorFlowNET.Examples/ImageProcessing/DigitRecognitionCnnEager.cs
@@ -19,7 +19,7 @@ limitations under the License.
 using Tensorflow;
 using Tensorflow.Keras.Optimizers;
 using static Tensorflow.Binding;
-using static Tensorflow.KerasExt;
+using static Tensorflow.KerasApi;
 
 namespace TensorFlowNET.Examples
 {
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/DigitRecognitionRNN.cs b/src/TensorFlowNET.Examples/ImageProcessing/DigitRecognitionRNN.cs
@@ -17,7 +17,7 @@ limitations under the License.
 using NumSharp;
 using Tensorflow;
 using static Tensorflow.Binding;
-using static Tensorflow.KerasExt;
+using static Tensorflow.KerasApi;
 
 namespace TensorFlowNET.Examples
 {
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/DigitRecognitionRnnKeras.cs b/src/TensorFlowNET.Examples/ImageProcessing/DigitRecognitionRnnKeras.cs
@@ -21,7 +21,7 @@ limitations under the License.
 using Tensorflow.Keras.Engine;
 using Tensorflow.Keras.Optimizers;
 using static Tensorflow.Binding;
-using static Tensorflow.KerasExt;
+using static Tensorflow.KerasApi;
 
 namespace TensorFlowNET.Examples
 {
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/ImageClassificationKeras.cs b/src/TensorFlowNET.Examples/ImageProcessing/ImageClassificationKeras.cs
@@ -2,7 +2,7 @@
 using Tensorflow;
 using Tensorflow.Keras;
 using static Tensorflow.Binding;
-using static Tensorflow.KerasExt;
+using static Tensorflow.KerasApi;
 
 namespace TensorFlowNET.Examples
 {
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/MnistCnnKerasSubclass .cs b/src/TensorFlowNET.Examples/ImageProcessing/MnistCnnKerasSubclass .cs
@@ -21,7 +21,7 @@ limitations under the License.
 using Tensorflow.Keras.Engine;
 using Tensorflow.Keras.Optimizers;
 using static Tensorflow.Binding;
-using static Tensorflow.KerasExt;
+using static Tensorflow.KerasApi;
 
 namespace TensorFlowNET.Examples
 {
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/MnistFnnKerasFunctional.cs b/src/TensorFlowNET.Examples/ImageProcessing/MnistFnnKerasFunctional.cs
@@ -17,7 +17,7 @@ limitations under the License.
 using NumSharp;
 using Tensorflow.Keras.Engine;
 using static Tensorflow.Binding;
-using static Tensorflow.KerasExt;
+using static Tensorflow.KerasApi;
 
 namespace TensorFlowNET.Examples
 {
@@ -82,6 +82,15 @@ public override void BuildModel()
 
             // train model by feeding data and labels.
             model.fit(x_train, y_train, batch_size: 64, epochs: 2, validation_split: 0.2f);
+
+            // evluate the model
+            model.evaluate(x_test, y_test, verbose: 2);
+
+            // save and serialize model
+            model.save("mnist_model");
+
+            // recreate the exact same model purely from the file:
+            // model = keras.models.load_model("path_to_my_model");
         }
     }
 }
diff --git a/src/TensorFlowNET.Examples/NeuralNetworks/FullyConnectedEager.cs b/src/TensorFlowNET.Examples/NeuralNetworks/FullyConnectedEager.cs
@@ -19,7 +19,7 @@ limitations under the License.
 using Tensorflow;
 using Tensorflow.Keras.Optimizers;
 using static Tensorflow.Binding;
-using static Tensorflow.KerasExt;
+using static Tensorflow.KerasApi;
 
 namespace TensorFlowNET.Examples
 {
diff --git a/src/TensorFlowNET.Examples/NeuralNetworks/FullyConnectedKeras.cs b/src/TensorFlowNET.Examples/NeuralNetworks/FullyConnectedKeras.cs
@@ -22,7 +22,7 @@ limitations under the License.
 using Tensorflow.Keras.ArgsDefinition;
 using Tensorflow.Keras.Engine;
 using static Tensorflow.Binding;
-using static Tensorflow.KerasExt;
+using static Tensorflow.KerasApi;
 
 namespace TensorFlowNET.Examples
 {
diff --git a/src/TensorFlowNET.Examples/NeuralNetworks/NeuralNetXor.cs b/src/TensorFlowNET.Examples/NeuralNetworks/NeuralNetXor.cs
@@ -19,7 +19,7 @@ limitations under the License.
 using Tensorflow;
 using TensorFlowNET.Examples.Utility;
 using static Tensorflow.Binding;
-using static Tensorflow.KerasExt;
+using static Tensorflow.KerasApi;
 
 namespace TensorFlowNET.Examples
 {
diff --git a/src/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj b/src/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj
@@ -45,13 +45,10 @@
     <PackageReference Include="SharpCV" Version="0.6.0" />
     <PackageReference Include="SharpZipLib" Version="1.3.0" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
+    <PackageReference Include="TensorFlow.Keras" Version="0.1.0" />
   </ItemGroup>
 
   <ItemGroup>
     <Folder Include="TextProcessing\NER\" />
   </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\TensorFlow.NET\src\TensorFlowNET.Keras\Tensorflow.Keras.csproj" />
-  </ItemGroup>
 </Project>
diff --git a/src/TensorFlowNET.Examples/TextProcessing/BinaryTextClassification.cs b/src/TensorFlowNET.Examples/TextProcessing/BinaryTextClassification.cs
@@ -4,8 +4,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using static Tensorflow.Binding;
-using static Tensorflow.KerasExt;
+using static Tensorflow.KerasApi;
 
 namespace TensorFlowNET.Examples
 {
diff --git a/src/TensorFlowNET.Examples/TextProcessing/cnn_models/CharCnn.cs b/src/TensorFlowNET.Examples/TextProcessing/cnn_models/CharCnn.cs
@@ -1,6 +1,6 @@
 ﻿using Tensorflow;
 using static Tensorflow.Binding;
-using static Tensorflow.KerasExt;
+using static Tensorflow.KerasApi;
 
 namespace TensorFlowNET.Examples.Text
 {
diff --git a/src/TensorFlowNET.Examples/TextProcessing/cnn_models/VdCnn.cs b/src/TensorFlowNET.Examples/TextProcessing/cnn_models/VdCnn.cs
@@ -1,7 +1,7 @@
 ﻿using System.Linq;
 using Tensorflow;
 using static Tensorflow.Binding;
-using static Tensorflow.KerasExt;
+using static Tensorflow.KerasApi;
 
 namespace TensorFlowNET.Examples.Text
 {
diff --git a/src/TensorFlowNET.Examples/TextProcessing/cnn_models/WordCnn.cs b/src/TensorFlowNET.Examples/TextProcessing/cnn_models/WordCnn.cs
@@ -17,7 +17,7 @@ limitations under the License.
 using System.Collections.Generic;
 using Tensorflow;
 using static Tensorflow.Binding;
-using static Tensorflow.KerasExt;
+using static Tensorflow.KerasApi;
 
 namespace TensorFlowNET.Examples.Text
 {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ limitations under the License.`
`16`	`16`
`17`	`17`	`using NumSharp;`
`18`	`18`	`using static Tensorflow.Binding;`
`19`		`-using static Tensorflow.KerasExt;`
	`19`	`+using static Tensorflow.KerasApi;`
`20`	`20`
`21`	`21`	`namespace TensorFlowNET.Examples`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ limitations under the License.`
`20`	`20`	`using System.IO;`
`21`	`21`	`using Tensorflow;`
`22`	`22`	`using static Tensorflow.Binding;`
`23`		`-using static Tensorflow.KerasExt;`
	`23`	`+using static Tensorflow.KerasApi;`
`24`	`24`
`25`	`25`	`namespace TensorFlowNET.Examples`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ limitations under the License.`
`19`	`19`	`using Tensorflow;`
`20`	`20`	`using Tensorflow.Keras.Optimizers;`
`21`	`21`	`using static Tensorflow.Binding;`
`22`		`-using static Tensorflow.KerasExt;`
	`22`	`+using static Tensorflow.KerasApi;`
`23`	`23`
`24`	`24`	`namespace TensorFlowNET.Examples`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ limitations under the License.`
`17`	`17`	`using NumSharp;`
`18`	`18`	`using Tensorflow;`
`19`	`19`	`using static Tensorflow.Binding;`
`20`		`-using static Tensorflow.KerasExt;`
	`20`	`+using static Tensorflow.KerasApi;`
`21`	`21`
`22`	`22`	`namespace TensorFlowNET.Examples`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ limitations under the License.`
`21`	`21`	`using Tensorflow.Keras.Engine;`
`22`	`22`	`using Tensorflow.Keras.Optimizers;`
`23`	`23`	`using static Tensorflow.Binding;`
`24`		`-using static Tensorflow.KerasExt;`
	`24`	`+using static Tensorflow.KerasApi;`
`25`	`25`
`26`	`26`	`namespace TensorFlowNET.Examples`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using Tensorflow;`
`3`	`3`	`using Tensorflow.Keras;`
`4`	`4`	`using static Tensorflow.Binding;`
`5`		`-using static Tensorflow.KerasExt;`
	`5`	`+using static Tensorflow.KerasApi;`
`6`	`6`
`7`	`7`	`namespace TensorFlowNET.Examples`
`8`	`8`	`{`