Add repository with fixes for import modules

Author: agibsonccc

data-pipeline-examples/pom.xml

@@ -71,7 +71,7 @@ information regarding copyright ownership.
         </repository>
         <repository>
             <id>M2-1</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1024</url>
+            <url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1028</url>
             <releases>
                 <enabled>true</enabled>
             </releases>

dl4j-distributed-training-examples/pom.xml

@@ -77,7 +77,7 @@ information regarding copyright ownership.
         </repository>
         <repository>
             <id>M2-1</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1024</url>
+            <url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1028</url>
             <releases>
                 <enabled>true</enabled>
             </releases>

dl4j-examples/pom.xml

@@ -73,7 +73,7 @@ information regarding copyright ownership.
         </repository>
         <repository>
             <id>M2-1</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1024</url>
+            <url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1028</url>
             <releases>
                 <enabled>true</enabled>
             </releases>

nd4j-ndarray-examples/pom.xml

@@ -53,7 +53,7 @@ information regarding copyright ownership.
         </repository>
         <repository>
             <id>M2-1</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1024</url>
+            <url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1028</url>
             <releases>
                 <enabled>true</enabled>
             </releases>

samediff-examples/pom.xml

@@ -76,7 +76,7 @@ information regarding copyright ownership.
         </repository>
         <repository>
             <id>M2-1</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1024</url>
+            <url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1028</url>
             <releases>
                 <enabled>true</enabled>
             </releases>

tensorflow-keras-import-examples/pom.xml

@@ -70,7 +70,7 @@ information regarding copyright ownership.
         </repository>
         <repository>
             <id>M2-1</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1024</url>
+            <url>https://s01.oss.sonatype.org/content/repositories/orgdeeplearning4j-1028</url>
             <releases>
                 <enabled>true</enabled>
             </releases>

tensorflow-keras-import-examples/src/main/java/org/deeplearning4j/modelimportexamples/keras/advanced/deepmoji/ImportDeepMoji.java

@@ -22,6 +22,8 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.deeplearning4j.nn.graph.ComputationGraph;
+import org.deeplearning4j.nn.modelimport.keras.KerasLayer;
+import org.deeplearning4j.nn.modelimport.keras.KerasModelImport;
 import org.nd4j.linalg.api.ndarray.INDArray;
 import org.nd4j.linalg.factory.Nd4j;
 

tensorflow-keras-import-examples/src/main/java/org/deeplearning4j/modelimportexamples/keras/quickstart/SimpleFunctionalMlpImport.java

@@ -30,6 +30,7 @@
 import org.nd4j.linalg.api.ndarray.INDArray;
 import org.nd4j.linalg.factory.Nd4j;
 import org.nd4j.linalg.lossfunctions.LossFunctions;
+import org.nd4j.linalg.lossfunctions.impl.LossMCXENT;
 
 import java.io.File;
 
@@ -108,6 +109,6 @@ public static void main(String[] args) throws Exception {
         // layer in this MLP.
         Layer loss = model.getLayer(2);
         LossLayer lossConf = (LossLayer) loss.conf().getLayer();
-        assert lossConf.getLossFn().equals(LossFunctions.LossFunction.MCXENT);
+        assert lossConf.getLossFn() instanceof LossMCXENT;
     }
 }

tensorflow-keras-import-examples/src/main/java/org/deeplearning4j/modelimportexamples/keras/quickstart/SimpleSequentialMlpImport.java

@@ -30,6 +30,7 @@
 import org.nd4j.linalg.api.ndarray.INDArray;
 import org.nd4j.linalg.factory.Nd4j;
 import org.nd4j.linalg.lossfunctions.LossFunctions;
+import org.nd4j.linalg.lossfunctions.impl.LossMCXENT;
 
 import java.io.File;
 
@@ -105,6 +106,6 @@ public static void main(String[] args) throws Exception {
         // layer in this MLP.
         Layer loss = model.getLayer(2);
         LossLayer lossConf = (LossLayer) loss.conf().getLayer();
-        assert lossConf.getLossFn().equals(LossFunctions.LossFunction.MCXENT);
+        assert lossConf.getLossFn() instanceof LossMCXENT;
     }
 }

tensorflow-keras-import-examples/src/main/java/org/deeplearning4j/modelimportexamples/tf/advanced/mobilenet/ImportMobileNetExample.java

@@ -29,11 +29,6 @@ public static void main(String[] args) throws Exception {
         //new tensorflow import api
         TensorflowFrameworkImporter tensorflowFrameworkImporter = new TensorflowFrameworkImporter();
 
-        // import the frozen model into a SameDiff instance
-        //note: this uses the new tensorflow import api
-        SameDiff sd = tensorflowFrameworkImporter.runImport(modelFile.getAbsolutePath(), Collections.emptyMap());
-
-        System.out.println(sd.summary());
 
         System.out.println("\n\n");
 
@@ -43,6 +38,10 @@ public static void main(String[] args) throws Exception {
         // preprocess image with inception preprocessing
         INDArray preprocessedImage = inceptionPreprocessing(testImage, 224, 224);
 
+        SameDiff sd = tensorflowFrameworkImporter.runImport(modelFile.getAbsolutePath(), Collections.singletonMap("input",preprocessedImage),false);
+        System.out.println(sd.summary());
+
+
         // Input and output names are found by looking at sd.summary() (printed earlyer).
         // The input variable is the output of no ops, and the output variable is the input of no ops.
 
@@ -72,7 +71,9 @@ public static void main(String[] args) 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");
-
+        File modelFile2 = new File(modelFile);
+        if(!modelFile2.exists())
+            modelFile2.getParentFile().mkdirs();
         File frozenFile = new File(FilenameUtils.concat(dataDir, "mobilenet_v2_1.0_224_frozen.pb"));
 
         if(frozenFile.exists()){
@@ -104,7 +105,6 @@ private static INDArray getTestImage() throws IOException {
     @SuppressWarnings("SameParameterValue")
     private static INDArray inceptionPreprocessing(INDArray img, int height, int width){
         // add batch dimension
-        img = Nd4j.expandDims(img, 0);
 
         // change to channels-last
         img = img.permute(0, 2, 3, 1);