tfimport.

Signed-off-by: Robert Altena <[email protected]>

Author: RobAltena

dl4j-examples/src/main/java/org/deeplearning4j/examples/samediff/tfimport/SameDiffTFImportMobileNetExample.java

@@ -1,21 +1,19 @@
 package org.deeplearning4j.examples.samediff.tfimport;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Arrays;
 import org.apache.commons.io.FilenameUtils;
 import org.datavec.image.loader.ImageLoader;
-import org.deeplearning4j.zoo.model.helper.InceptionResNetHelper;
 import org.deeplearning4j.zoo.util.imagenet.ImageNetLabels;
 import org.nd4j.autodiff.samediff.SameDiff;
 import org.nd4j.linalg.api.ndarray.INDArray;
 import org.nd4j.linalg.api.ops.DynamicCustomOp;
 import org.nd4j.linalg.factory.Nd4j;
-import org.nd4j.linalg.indexing.INDArrayIndex;
 import org.nd4j.linalg.indexing.NDArrayIndex;
 import org.nd4j.resources.Downloader;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+
 /**
  * This example shows the ability to import and use Tensorflow models, specifically mobilenet, and use them for inference.
  */
@@ -64,11 +62,8 @@ public static void main(String[] args) throws Exception {
     }
 
 
-
-    public static String MODEL_URL = "https://storage.googleapis.com/mobilenet_v2/checkpoints/mobilenet_v2_1.0_224.tgz";
-
     // download and extract the model file in the ~/dl4j-examples-data directory used by other examples
-    public static File downloadModel() throws Exception{
+    static File downloadModel() throws Exception{
         String dataDir = FilenameUtils.concat(System.getProperty("user.home"), "dl4j-examples-data/tf_resnet");
         String modelFile = FilenameUtils.concat(dataDir, "mobilenet_v2_1.0_224.tgz");
 
@@ -78,14 +73,15 @@ public static File downloadModel() throws Exception{
             return frozenFile;
         }
 
+        String MODEL_URL = "https://storage.googleapis.com/mobilenet_v2/checkpoints/mobilenet_v2_1.0_224.tgz";
         Downloader.downloadAndExtract("tf_resnet", new URL(MODEL_URL), new File(modelFile), new File(dataDir), "519bba7052fd279c66d2a28dc3f51f46", 5);
 
         return frozenFile;
     }
 
     // gets the image we use to test the network.
     // This isn't a single class ImageNet image, so it won't do very well, but it will at least classify it as a dog or a cat.
-    public static INDArray getTestImage() throws IOException {
+    private static INDArray getTestImage() throws IOException {
         URL url = new URL("https://github.com/tensorflow/models/blob/master/research/deeplab/g3doc/img/image2.jpg?raw=true");
         return new ImageLoader(358, 500, 3).asMatrix(url.openStream());
     }
@@ -99,7 +95,8 @@ public static INDArray getTestImage() throws IOException {
      * @param height the height to resize to
      * @param width the width to resize to
      */
-    public static INDArray inceptionPreprocessing(INDArray img, int height, int width){
+    @SuppressWarnings("SameParameterValue")
+    private static INDArray inceptionPreprocessing(INDArray img, int height, int width){
         // add batch dimension
         img = Nd4j.expandDims(img, 0);
 

dl4j-examples/src/main/java/org/deeplearning4j/examples/samediff/tfimport/SameDiffTransferLearningExample.java

@@ -1,12 +1,7 @@
 package org.deeplearning4j.examples.samediff.tfimport;
 
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 import org.deeplearning4j.datasets.fetchers.DataSetType;
 import org.deeplearning4j.datasets.iterator.impl.Cifar10DataSetIterator;
-import org.deeplearning4j.datasets.iterator.impl.MnistDataSetIterator;
 import org.deeplearning4j.examples.samediff.training.SameDiffCustomListenerExample;
 import org.deeplearning4j.examples.samediff.training.SameDiffMNISTTrainingExample;
 import org.nd4j.autodiff.listeners.At;
@@ -21,25 +16,25 @@
 import org.nd4j.autodiff.samediff.internal.SameDiffOp;
 import org.nd4j.autodiff.samediff.transform.GraphTransformUtil;
 import org.nd4j.autodiff.samediff.transform.OpPredicate;
-import org.nd4j.autodiff.samediff.transform.SubGraph;
 import org.nd4j.autodiff.samediff.transform.SubGraphPredicate;
-import org.nd4j.autodiff.samediff.transform.SubGraphProcessor;
 import org.nd4j.evaluation.classification.Evaluation;
 import org.nd4j.evaluation.classification.Evaluation.Metric;
 import org.nd4j.linalg.api.buffer.DataType;
 import org.nd4j.linalg.api.ndarray.INDArray;
 import org.nd4j.linalg.api.ops.DynamicCustomOp;
-import org.nd4j.linalg.api.ops.impl.broadcast.BiasAdd;
-import org.nd4j.linalg.api.ops.impl.layers.convolution.AvgPooling2D;
 import org.nd4j.linalg.api.ops.impl.layers.convolution.Conv2D;
 import org.nd4j.linalg.api.ops.impl.layers.convolution.config.Conv2DConfig;
-import org.nd4j.linalg.dataset.api.DataSet;
 import org.nd4j.linalg.dataset.api.MultiDataSet;
 import org.nd4j.linalg.dataset.api.iterator.DataSetIterator;
 import org.nd4j.linalg.factory.Nd4j;
 import org.nd4j.linalg.learning.config.Adam;
 import org.nd4j.weightinit.impl.XavierInitScheme;
 
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * This is an example of doing transfer learning by importing a tensorflow model of mobilenet and replacing the last layer.
  *
@@ -50,6 +45,7 @@
  * See {@link SameDiffCustomListenerExample} for an example of how to use custom listeners (we use one here to find the shapes of an activation).
  *
  */
+@SuppressWarnings("unused") //
 public class SameDiffTransferLearningExample {
 
     public static void main(String[] args) throws Exception {