VGG'11 model on FashionMNIST dataset

tensorflow-examples/pom.xml

@@ -52,7 +52,7 @@
               <archive>
                 <manifest>
                   <mainClass>
-                    org.tensorflow.model.examples.mnist.SimpleMnist
+                      org.tensorflow.model.examples.dense.SimpleMnist
                   </mainClass>
                 </manifest>
               </archive>

tensorflow-examples/src/main/java/org/tensorflow/model/examples/mnist/CnnMnist.java → tensorflow-examples/src/main/java/org/tensorflow/model/examples/cnn/lenet/CnnMnist.java

@@ -1,19 +1,20 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright 2020 The TensorFlow 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
+ *  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
+ *      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.
+ *  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.
+ *  =======================================================================
  */
-package org.tensorflow.model.examples.mnist;
+package org.tensorflow.model.examples.cnn.lenet;
 
 import java.util.Arrays;
 import java.util.logging.Level;
@@ -22,8 +23,8 @@
 import org.tensorflow.Operand;
 import org.tensorflow.Session;
 import org.tensorflow.Tensor;
-import org.tensorflow.model.examples.mnist.data.ImageBatch;
-import org.tensorflow.model.examples.mnist.data.MnistDataset;
+import org.tensorflow.model.examples.datasets.ImageBatch;
+import org.tensorflow.model.examples.datasets.mnist.MnistDataset;
 import org.tensorflow.op.Op;
 import org.tensorflow.op.Ops;
 import org.tensorflow.op.core.Constant;
@@ -76,6 +77,11 @@ public class CnnMnist {
   public static final String TRAINING_LOSS = "training_loss";
   public static final String INIT = "init";
 
+  private static final String TRAINING_IMAGES_ARCHIVE = "mnist/train-images-idx3-ubyte.gz";
+  private static final String TRAINING_LABELS_ARCHIVE = "mnist/train-labels-idx1-ubyte.gz";
+  private static final String TEST_IMAGES_ARCHIVE = "mnist/t10k-images-idx3-ubyte.gz";
+  private static final String TEST_LABELS_ARCHIVE = "mnist/t10k-labels-idx1-ubyte.gz";
+
   public static Graph build(String optimizerName) {
     Graph graph = new Graph();
 
@@ -294,7 +300,8 @@ public static void main(String[] args) {
     logger.info(
         "Usage: MNISTTest <num-epochs> <minibatch-size> <optimizer-name>");
 
-    MnistDataset dataset = MnistDataset.create(0);
+    MnistDataset dataset = MnistDataset.create(0, TRAINING_IMAGES_ARCHIVE, TRAINING_LABELS_ARCHIVE,
+            TEST_IMAGES_ARCHIVE, TEST_LABELS_ARCHIVE);
 
     logger.info("Loaded data.");
 

tensorflow-examples/src/main/java/org/tensorflow/model/examples/cnn/vgg/VGG11OnFashionMNIST.java

@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2020 The TensorFlow 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.
+ *  =======================================================================
+ */
+package org.tensorflow.model.examples.cnn.vgg;
+
+import org.tensorflow.model.examples.datasets.mnist.MnistDataset;
+
+import java.util.logging.Logger;
+
+/**
+ * Trains and evaluates VGG'11 model on FashionMNIST dataset.
+ */
+public class VGG11OnFashionMNIST {
+    // Hyper-parameters
+    public static final int EPOCHS = 1;
+    public static final int BATCH_SIZE = 500;
+
+    // Fashion MNIST dataset paths
+    public static final String TRAINING_IMAGES_ARCHIVE = "fashionmnist/train-images-idx3-ubyte.gz";
+    public static final String TRAINING_LABELS_ARCHIVE = "fashionmnist/train-labels-idx1-ubyte.gz";
+    public static final String TEST_IMAGES_ARCHIVE = "fashionmnist/t10k-images-idx3-ubyte.gz";
+    public static final String TEST_LABELS_ARCHIVE = "fashionmnist/t10k-labels-idx1-ubyte.gz";
+
+    private static final Logger logger = Logger.getLogger(VGG11OnFashionMNIST.class.getName());
+
+    public static void main(String[] args) {
+        logger.info("Data loading.");
+        MnistDataset dataset = MnistDataset.create(0, TRAINING_IMAGES_ARCHIVE, TRAINING_LABELS_ARCHIVE, TEST_IMAGES_ARCHIVE, TEST_LABELS_ARCHIVE);
+
+        try (VGGModel vggModel = new VGGModel()) {
+            logger.info("Model training.");
+            vggModel.train(dataset, EPOCHS, BATCH_SIZE);
+
+            logger.info("Model evaluation.");
+            vggModel.test(dataset, BATCH_SIZE);
+        }
+    }
+}