Merge branch 'tf.keras-0.2'

Oceania2018 · Oceania2018 · commit 059841b35811 · 2020-12-12T09:32:54.000-06:00
diff --git a/README.md b/README.md
@@ -55,7 +55,5 @@ Example runner will download all the required files like training data and model
 
 ### Welcome to PR your example to us.
 Your contribution will make .NET community better than ever.
-
-TensorFlow.NET is a part of [SciSharp STACK](https://scisharp.github.io/SciSharp/)
 <br>
-<a href="http://scisharpstack.org"><img src="https://github.com/SciSharp/SciSharp/blob/master/art/scisharp-stack.png" width="391" height="100" /></a>
+<a href="http://scisharpstack.org"><img src="https://github.com/SciSharp/SciSharp/blob/master/art/scisharp-stack.png" width="391" height="100" /></a>
diff --git a/src/TensorFlowNET.Examples/BasicModels/NaiveBayesClassifier.cs b/src/TensorFlowNET.Examples/BasicModels/NaiveBayesClassifier.cs
@@ -19,6 +19,7 @@ limitations under the License.
 using System.Collections.Generic;
 using System.IO;
 using Tensorflow;
+using Tensorflow.Keras.Utils;
 using TensorFlowNET.Examples.Utility;
 using static Tensorflow.Binding;
 
diff --git a/src/TensorFlowNET.Examples/Converting/ConvertTensorflowModelToOpenCv.cs b/src/TensorFlowNET.Examples/Converting/ConvertTensorflowModelToOpenCv.cs
@@ -1,6 +1,7 @@
 ﻿using Google.Protobuf;
 using System.IO;
 using Tensorflow;
+using Tensorflow.Keras.Utils;
 using TensorFlowNET.Examples.Utility;
 using static Tensorflow.Binding;
 
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/Cifar10ResNetKerasFunctional.cs b/src/TensorFlowNET.Examples/ImageProcessing/Cifar10ResNetKerasFunctional.cs
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/CnnInYourOwnData.cs b/src/TensorFlowNET.Examples/ImageProcessing/CnnInYourOwnData.cs
@@ -26,6 +26,7 @@ limitations under the License.
 using System.Linq;
 using System.Threading.Tasks;
 using Tensorflow;
+using Tensorflow.Keras.Utils;
 using static SharpCV.Binding;
 using static Tensorflow.Binding;
 
@@ -132,8 +133,8 @@ public override void PrepareData()
         {
             string url = "https://github.com/SciSharp/SciSharp-Stack-Examples/raw/master/data/data_CnnInYourOwnData.zip";
             Directory.CreateDirectory(Config.Name);
-            Utility.Web.Download(url, Config.Name, "data_CnnInYourOwnData.zip");
-            Utility.Compress.UnZip(Config.Name + "\\data_CnnInYourOwnData.zip", Config.Name);
+            Web.Download(url, Config.Name, "data_CnnInYourOwnData.zip");
+            Compress.UnZip(Config.Name + "\\data_CnnInYourOwnData.zip", Config.Name);
 
             FillDictionaryLabel(Config.Name + "\\train");
 
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/DigitRecognitionRNN.cs b/src/TensorFlowNET.Examples/ImageProcessing/DigitRecognitionRNN.cs
@@ -57,7 +57,7 @@ public ExampleConfig InitConfig()
             => Config = new ExampleConfig
             {
                 Name = "MNIST RNN (Graph)",
-                Enabled = true,
+                Enabled = false,
                 IsImportingGraph = false,
                 Priority = 20
             };
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/ImageBackgroundRemoval.cs b/src/TensorFlowNET.Examples/ImageProcessing/ImageBackgroundRemoval.cs
@@ -1,5 +1,6 @@
 ﻿using System.IO;
 using Tensorflow;
+using Tensorflow.Keras.Utils;
 using TensorFlowNET.Examples.Utility;
 using static Tensorflow.Binding;
 
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/ImageClassificationKeras.cs b/src/TensorFlowNET.Examples/ImageProcessing/ImageClassificationKeras.cs
@@ -16,7 +16,7 @@ public ExampleConfig InitConfig()
             => Config = new ExampleConfig
             {
                 Name = "Image Classification (Keras)",
-                Enabled = true,
+                Enabled = false,
                 Priority = 18
             };
 
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/ImageRecognitionInception.cs b/src/TensorFlowNET.Examples/ImageProcessing/ImageRecognitionInception.cs
@@ -4,6 +4,7 @@
 using System.Drawing;
 using System.IO;
 using Tensorflow;
+using Tensorflow.Keras.Utils;
 using static Tensorflow.Binding;
 using Console = Colorful.Console;
 
@@ -93,17 +94,17 @@ public override void PrepareData()
             // get model file
             string url = "https://storage.googleapis.com/download.tensorflow.org/models/inception5h.zip";
 
-            Utility.Web.Download(url, dir, "inception5h.zip");
+            Web.Download(url, dir, "inception5h.zip");
 
-            Utility.Compress.UnZip(Path.Join(dir, "inception5h.zip"), dir);
+            Compress.UnZip(Path.Join(dir, "inception5h.zip"), dir);
 
             // download sample picture
             Directory.CreateDirectory(Path.Join(dir, "img"));
             url = $"https://raw.githubusercontent.com/tensorflow/tensorflow/master/tensorflow/examples/label_image/data/grace_hopper.jpg";
-            Utility.Web.Download(url, Path.Join(dir, "img"), "grace_hopper.jpg");
+            Web.Download(url, Path.Join(dir, "img"), "grace_hopper.jpg");
 
             url = $"https://raw.githubusercontent.com/SciSharp/TensorFlow.NET/master/data/shasta-daisy.jpg";
-            Utility.Web.Download(url, Path.Join(dir, "img"), "shasta-daisy.jpg");
+            Web.Download(url, Path.Join(dir, "img"), "shasta-daisy.jpg");
 
             // load image file
             var files = Directory.GetFiles(Path.Join(dir, "img"));
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/InceptionArchGoogLeNet.cs b/src/TensorFlowNET.Examples/ImageProcessing/InceptionArchGoogLeNet.cs
@@ -3,6 +3,8 @@
 using System.IO;
 using System.Linq;
 using Tensorflow;
+using Tensorflow.Keras.Utils;
+using TensorFlowNET.Examples.Utility;
 using static Tensorflow.Binding;
 
 namespace TensorFlowNET.Examples
@@ -98,14 +100,14 @@ public override void PrepareData()
             // get model file
             string url = "https://storage.googleapis.com/download.tensorflow.org/models/inception_v3_2016_08_28_frozen.pb.tar.gz";
 
-            Utility.Web.Download(url, dir, $"{pbFile}.tar.gz");
+            Web.Download(url, dir, $"{pbFile}.tar.gz");
 
-            Utility.Compress.ExtractTGZ(Path.Join(dir, $"{pbFile}.tar.gz"), dir);
+            Compress.ExtractTGZ(Path.Join(dir, $"{pbFile}.tar.gz"), dir);
 
             // download sample picture
             string pic = "grace_hopper.jpg";
             url = $"https://raw.githubusercontent.com/tensorflow/tensorflow/master/tensorflow/examples/label_image/data/{pic}";
-            Utility.Web.Download(url, dir, pic);
+            Web.Download(url, dir, pic);
         }
     }
 }
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/MnistFnnKerasFunctional.cs b/src/TensorFlowNET.Examples/ImageProcessing/MnistFnnKerasFunctional.cs
@@ -45,6 +45,7 @@ public bool Run()
 
             PrepareData();
             BuildModel();
+            Train();
 
             return true;
         }
@@ -79,7 +80,10 @@ public override void BuildModel()
             model.compile(loss: keras.losses.SparseCategoricalCrossentropy(from_logits: true),
                 optimizer: keras.optimizers.RMSprop(),
                 metrics: new[] { "accuracy" });
+        }
 
+        public override void Train()
+        {
             // train model by feeding data and labels.
             model.fit(x_train, y_train, batch_size: 64, epochs: 2, validation_split: 0.2f);
 
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/ToyResNet.cs b/src/TensorFlowNET.Examples/ImageProcessing/ToyResNet.cs
@@ -0,0 +1,105 @@
+﻿/*****************************************************************************
+   Copyright 2018 The TensorFlow.NET Authors. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+******************************************************************************/
+
+using NumSharp;
+using Tensorflow;
+using Tensorflow.Keras.Engine;
+using Tensorflow.Keras.Utils;
+using static Tensorflow.Binding;
+using static Tensorflow.KerasApi;
+
+namespace TensorFlowNET.Examples
+{
+    /// <summary>
+    /// A toy ResNet model
+    /// https://keras.io/guides/functional_api/
+    /// </summary>
+    public class CIFAR10_CNN : SciSharpExample, IExample
+    {
+        Model model;
+        NDArray x_train, y_train;
+        NDArray x_test, y_test;
+
+        public ExampleConfig InitConfig()
+            => Config = new ExampleConfig
+            {
+                Name = "Toy ResNet",
+                Enabled = true
+            };
+
+        public bool Run()
+        {
+            tf.enable_eager_execution();
+
+            BuildModel();
+            PrepareData();
+            Train();
+
+            return true;
+        }
+
+        public override void BuildModel()
+        {
+            var inputs = keras.Input(shape: (32, 32, 3), name: "img");
+            var x = layers.Conv2D(32, 3, activation: "relu").Apply(inputs);
+            x = layers.Conv2D(64, 3, activation: "relu").Apply(x);
+
+            // x = layers.BatchNormalization().Apply(x);
+            var block_1_output = layers.MaxPooling2D(3).Apply(x);
+
+            x = layers.Conv2D(64, 3, activation: "relu", padding: "same").Apply(block_1_output);
+            x = layers.Conv2D(64, 3, activation: "relu", padding: "same").Apply(x);
+            var block_2_output = layers.Add().Apply(new Tensors(x, block_1_output));
+
+            x = layers.Conv2D(64, 3, activation: "relu", padding: "same").Apply(block_2_output);
+            x = layers.Conv2D(64, 3, activation: "relu", padding: "same").Apply(x);
+            var block_3_output = layers.Add().Apply(new Tensors(x, block_2_output));
+
+            x = layers.Conv2D(64, 3, activation: "relu").Apply(block_3_output);
+            x = layers.GlobalAveragePooling2D().Apply(x);
+            x = layers.Dense(256, activation: "relu").Apply(x);
+            x = layers.Dropout(0.5f).Apply(x);
+            var outputs = layers.Dense(10).Apply(x);
+
+            model = keras.Model(inputs, outputs, name: "toy_resnet");
+            model.summary();
+
+            model.compile(
+                optimizer: keras.optimizers.RMSprop(1e-3f),
+                loss: keras.losses.CategoricalCrossentropy(from_logits: true),
+                metrics: new[] { "acc" });
+        }
+
+        public override void PrepareData()
+        {
+            ((x_train, y_train), (x_test, y_test)) = keras.datasets.cifar10.load_data();
+
+            x_train = x_train / 255.0f;
+            x_test = x_test / 255.0f;
+
+            y_train = np_utils.to_categorical(y_train, 10);
+            y_test = np_utils.to_categorical(y_test, 10);
+        }
+
+        public override void Train()
+        {
+            model.fit(x_train[new Slice(0, 2000)], y_train[new Slice(0, 2000)], 
+                batch_size: 64, 
+                epochs: 3, 
+                validation_split: 0.2f);
+        }
+    }
+}
diff --git a/src/TensorFlowNET.Examples/ImageProcessing/TransferLearningWithInceptionV3.cs b/src/TensorFlowNET.Examples/ImageProcessing/TransferLearningWithInceptionV3.cs
@@ -23,6 +23,7 @@ limitations under the License.
 using System.Linq;
 using System.Threading.Tasks;
 using Tensorflow;
+using Tensorflow.Keras.Utils;
 using TensorFlowNET.Examples.Utility;
 using static Tensorflow.Binding;
 
diff --git a/src/TensorFlowNET.Examples/NeuralNetworks/NeuralNetXor.cs b/src/TensorFlowNET.Examples/NeuralNetworks/NeuralNetXor.cs
@@ -17,6 +17,7 @@ limitations under the License.
 using NumSharp;
 using System;
 using Tensorflow;
+using Tensorflow.Keras.Utils;
 using TensorFlowNET.Examples.Utility;
 using static Tensorflow.Binding;
 using static Tensorflow.KerasApi;
diff --git a/src/TensorFlowNET.Examples/ObjectDetection/DetectInMobilenet.cs b/src/TensorFlowNET.Examples/ObjectDetection/DetectInMobilenet.cs
@@ -21,6 +21,7 @@ limitations under the License.
 using System.IO;
 using System.Linq;
 using Tensorflow;
+using Tensorflow.Keras.Utils;
 using TensorFlowNET.Examples.Utility;
 using static Tensorflow.Binding;
 
diff --git a/src/TensorFlowNET.Examples/ObjectDetection/YoloCoco.cs b/src/TensorFlowNET.Examples/ObjectDetection/YoloCoco.cs
@@ -21,6 +21,7 @@ limitations under the License.
 using System.IO;
 using System.Linq;
 using Tensorflow;
+using Tensorflow.Keras.Utils;
 using TensorFlowNET.Examples.Utility;
 using static SharpCV.Binding;
 using static Tensorflow.Binding;
diff --git a/src/TensorFlowNET.Examples/Program.cs b/src/TensorFlowNET.Examples/Program.cs
@@ -45,9 +45,10 @@ static void Main(string[] args)
 
             Console.WriteLine(Environment.OSVersion, Color.Yellow);
             Console.WriteLine($"64Bit Operating System: {Environment.Is64BitOperatingSystem}", Color.Yellow);
-            Console.WriteLine($"TensorFlow.NET v{Assembly.GetAssembly(typeof(TF_DataType)).GetName().Version}", Color.Yellow);
-            Console.WriteLine($"TensorFlow Binary v{tf.VERSION}", Color.Yellow);
             Console.WriteLine($".NET CLR: {Environment.Version}", Color.Yellow);
+            Console.WriteLine($"TensorFlow Binary v{tf.VERSION}", Color.Yellow);
+            Console.WriteLine($"TensorFlow.NET v{Assembly.GetAssembly(typeof(TF_DataType)).GetName().Version}", Color.Yellow);
+            Console.WriteLine($"TensorFlow.Keras v{Assembly.GetAssembly(typeof(KerasApi)).GetName().Version}", Color.Yellow);
             Console.WriteLine(Environment.CurrentDirectory, Color.Yellow);
 
             while (true)
@@ -105,8 +106,9 @@ private static void RunExamples(string key, IExample[] examples)
             success.ForEach(x => Console.WriteLine($"{x} is OK!", Color.Green));
             errors.ForEach(x => Console.WriteLine($"{x} is Failed!", Color.Red));
 
-            Console.WriteLine($"TensorFlow.NET v{Assembly.GetAssembly(typeof(TF_DataType)).GetName().Version}");
             Console.WriteLine($"TensorFlow Binary v{tf.VERSION}");
+            Console.WriteLine($"TensorFlow.NET v{Assembly.GetAssembly(typeof(TF_DataType)).GetName().Version}");
+            Console.WriteLine($"TensorFlow.Keras v{Assembly.GetAssembly(typeof(KerasApi)).GetName().Version}");
             Console.WriteLine($"{finished} of {examples.Length} example(s) are completed.");
             Console.Write("Press [Enter] to continue...");
             Console.ReadLine();
diff --git a/src/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj b/src/TensorFlowNET.Examples/TensorFlowNET.Examples.csproj
@@ -43,9 +43,9 @@
     <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.4.0.20200915" />
     <PackageReference Include="SciSharp.TensorFlow.Redist" Version="2.3.1" />
     <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" />
+    <PackageReference Include="TensorFlow.Keras" Version="0.2.0" />
+    <PackageReference Include="TensorFlow.NET" Version="0.31.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/TensorFlowNET.Examples/TextProcessing/BinaryTextClassification.cs b/src/TensorFlowNET.Examples/TextProcessing/BinaryTextClassification.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Tensorflow.Keras.Utils;
 using static Tensorflow.KerasApi;
 
 namespace TensorFlowNET.Examples
@@ -64,8 +65,8 @@ public override void PrepareData()
             // get model file
             string url = $"https://github.com/SciSharp/TensorFlow.NET/raw/master/data/{dataFile}";
 
-            Utility.Web.Download(url, dir, "imdb.zip");
-            Utility.Compress.UnZip(Path.Join(dir, $"imdb.zip"), dir);
+            Web.Download(url, dir, "imdb.zip");
+            Compress.UnZip(Path.Join(dir, $"imdb.zip"), dir);
 
             // prepare training dataset
             var x_train = ReadData(Path.Join(dir, "x_train.txt"));
diff --git a/src/TensorFlowNET.Examples/TextProcessing/CnnTextClassification.cs b/src/TensorFlowNET.Examples/TextProcessing/CnnTextClassification.cs
@@ -21,6 +21,7 @@ limitations under the License.
 using System.IO;
 using System.Linq;
 using Tensorflow;
+using Tensorflow.Keras.Utils;
 using Tensorflow.Sessions;
 using TensorFlowNET.Examples.Text;
 using TensorFlowNET.Examples.Utility;
@@ -61,7 +62,7 @@ public ExampleConfig InitConfig()
             => Config = new ExampleConfig
             {
                 Name = "CNN Text Classification (Graph)",
-                Enabled = true,
+                Enabled = false,
                 IsImportingGraph = false
             };
 
diff --git a/src/TensorFlowNET.Examples/TextProcessing/DataHelpers.cs b/src/TensorFlowNET.Examples/TextProcessing/DataHelpers.cs
diff --git a/src/TensorFlowNET.Examples/TextProcessing/Word2Vec.cs b/src/TensorFlowNET.Examples/TextProcessing/Word2Vec.cs
diff --git a/src/TensorFlowNET.Examples/TextProcessing/cnn_models/CharCnn.cs b/src/TensorFlowNET.Examples/TextProcessing/cnn_models/CharCnn.cs
diff --git a/src/TensorFlowNET.Examples/TextProcessing/cnn_models/VdCnn.cs b/src/TensorFlowNET.Examples/TextProcessing/cnn_models/VdCnn.cs
diff --git a/src/TensorFlowNET.Examples/TextProcessing/cnn_models/WordCnn.cs b/src/TensorFlowNET.Examples/TextProcessing/cnn_models/WordCnn.cs
diff --git a/src/TensorFlowNET.Examples/Utility/Compress.cs b/src/TensorFlowNET.Examples/Utility/Compress.cs
diff --git a/src/TensorFlowNET.Examples/Utility/Web.cs b/src/TensorFlowNET.Examples/Utility/Web.cs

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public ExampleConfig InitConfig()`
`57`	`57`	`=> Config = new ExampleConfig`
`58`	`58`	`{`
`59`	`59`	`Name = "MNIST RNN (Graph)",`
`60`		`- Enabled = true,`
	`60`	`+ Enabled = false,`
`61`	`61`	`IsImportingGraph = false,`
`62`	`62`	`Priority = 20`
`63`	`63`	`};`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public ExampleConfig InitConfig()`
`16`	`16`	`=> Config = new ExampleConfig`
`17`	`17`	`{`
`18`	`18`	`Name = "Image Classification (Keras)",`
`19`		`- Enabled = true,`
	`19`	`+ Enabled = false,`
`20`	`20`	`Priority = 18`
`21`	`21`	`};`
`22`	`22`