Setup examples for testing

agibsonccc · agibsonccc · commit 8ec173a979ac · 2021-04-02T10:24:31.000+09:00
diff --git a/.github/workflows/example-sanity-check.yml b/.github/workflows/example-sanity-check.yml
diff --git a/.github/workflows/run-sanity-checks.sh b/.github/workflows/run-sanity-checks.sh
diff --git a/android-examples/app/build.gradle b/android-examples/app/build.gradle
@@ -11,7 +11,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+       testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
diff --git a/android-examples/app/src/androidTest/java/com/example/androidclassifier/ExampleInstrumentedTest.java b/android-examples/app/src/androidTest/java/com/example/androidclassifier/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.example.androidDl4jClassifier;
+package com.example.androidclassifier;
 
 import android.content.Context;
 
diff --git a/android-examples/app/src/main/AndroidManifest.xml b/android-examples/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.androidDl4jClassifier">
+    package="com.example.androidclassifier">
 
     <application
         android:allowBackup="true"
@@ -10,7 +10,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
         android:fullBackupContent="@xml/backup_descriptor">
-        <activity android:name="com.example.androidDl4jClassifier.MainActivity">
+        <activity android:name="com.example.org.deeplearning4j.examples.androidclassifier.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -19,4 +19,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>
diff --git a/android-examples/app/src/main/java/org/deeplearning4j/examples/androidclassifier/MainActivity.java b/android-examples/app/src/main/java/org/deeplearning4j/examples/androidclassifier/MainActivity.java
@@ -1,10 +1,11 @@
-package com.example.androidDl4jClassifier;
+package org.deeplearning4j.examples.androidclassifier;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
+import com.example.androidclassifier.R;
 
 
 public class MainActivity extends AppCompatActivity {
diff --git a/android-examples/app/src/main/java/org/deeplearning4j/examples/androidclassifier/ScatterView.java b/android-examples/app/src/main/java/org/deeplearning4j/examples/androidclassifier/ScatterView.java
@@ -1,4 +1,4 @@
-package com.example.androidDl4jClassifier;
+package org.deeplearning4j.examples.androidclassifier;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/android-examples/app/src/main/java/org/deeplearning4j/examples/androidclassifier/TrainingTask.java b/android-examples/app/src/main/java/org/deeplearning4j/examples/androidclassifier/TrainingTask.java
@@ -1,4 +1,4 @@
-package com.example.androidDl4jClassifier;
+package org.deeplearning4j.examples.androidclassifier;
 
 import org.deeplearning4j.nn.conf.MultiLayerConfiguration;
 import org.deeplearning4j.nn.conf.NeuralNetConfiguration;
diff --git a/android-examples/app/src/main/res/layout/activity_main.xml b/android-examples/app/src/main/res/layout/activity_main.xml
@@ -4,16 +4,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context="org.deeplearning4j.examples.androidclassifier.MainActivity">
 
 
     <view
         android:id="@+id/id_scatterview"
-        class="com.example.androidDl4jClassifier.ScatterView"
+        class="org.deeplearning4j.examples.androidclassifier.ScatterView"
         android:layout_width="fill_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android-examples/app/src/test/java/com/example/androidDl4jClassifier/ExampleUnitTest.java b/android-examples/app/src/test/java/com/example/androidDl4jClassifier/ExampleUnitTest.java
diff --git a/dl4j-examples/pom.xml b/dl4j-examples/pom.xml
@@ -41,6 +41,9 @@
         <jfreechart.version>1.0.13</jfreechart.version>
         <logback.version>1.1.7</logback.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <junit.version>5.8.0-M1</junit.version>
+        <javacv.version>1.5.5</javacv.version>
+
     </properties>
 
 	<dependencyManagement>
@@ -135,8 +138,25 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>javacv-platform</artifactId>
-            <version>1.5.2</version>
+            <version>${javacv.version}</version>
         </dependency>
+
+        <!-- Test dependency. Ignore for your own application. -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+
     </dependencies>
     <!-- Maven Enforcer: Ensures user has an up to date version of Maven before building -->
     <build>
diff --git a/dl4j-examples/src/main/java/org/deeplearning4j/examples/quickstart/features/tsne/TSNEStandardExample.java b/dl4j-examples/src/main/java/org/deeplearning4j/examples/quickstart/features/tsne/TSNEStandardExample.java
diff --git a/dl4j-examples/src/test/java/org/deeplearning4j/examples/QuickTest.java b/dl4j-examples/src/test/java/org/deeplearning4j/examples/QuickTest.java
@@ -0,0 +1,19 @@
+package org.deeplearning4j.examples;
+
+import org.deeplearning4j.examples.quickstart.modeling.convolution.LeNetMNIST;
+import org.deeplearning4j.examples.quickstart.modeling.variationalautoencoder.VaeMNISTAnomaly;
+import org.junit.jupiter.api.Test;
+
+public class QuickTest {
+    @Test
+    public void test() throws Exception {
+        System.out.println("Beginning LenetMNIST");
+        LeNetMNIST.main(new String[]{});
+        System.out.println("Ending LenetMNIST");
+        System.out.println("Beginning VaeMNISTAnomaly");
+        VaeMNISTAnomaly.main(new String[]{});
+        System.out.println("Beginning VaeMNISTAnomaly");
+
+    }
+
+}
diff --git a/nd4j-ndarray-examples/pom.xml b/nd4j-ndarray-examples/pom.xml
@@ -37,6 +37,8 @@
         <maven.minimum.version>3.3.1</maven.minimum.version>
         <logback.version>1.1.7</logback.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <junit.version>5.8.0-M1</junit.version>
+
     </properties>
 
     <dependencies>
@@ -55,6 +57,22 @@
             <artifactId>deeplearning4j-utility-iterators</artifactId>
             <version>${dl4j-master.version}</version>
         </dependency>
+
+        <!-- Test dependency. Ignore for your own application. -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <!-- Maven Enforcer: Ensures user has an up to date version of Maven before building -->
diff --git a/nd4j-ndarray-examples/src/test/java/org/nd4j/examples/QuickTest.java b/nd4j-ndarray-examples/src/test/java/org/nd4j/examples/QuickTest.java
@@ -0,0 +1,25 @@
+package org.nd4j.examples;
+
+import org.junit.jupiter.api.Test;
+import org.nd4j.examples.advanced.lowlevelmodeling.MultiClassLogitExample;
+import org.nd4j.examples.advanced.memoryoptimization.WorkspacesExample;
+import org.nd4j.examples.advanced.operations.CustomOpsExamples;
+
+public class QuickTest {
+
+
+    @Test
+    public void runTestExamples() throws Exception {
+        System.out.println("Beginning MultiClassLogitExample");
+        MultiClassLogitExample.main(new String[]{});
+        System.out.println("Ending WorkspacesExample");
+        WorkspacesExample.main(new String[]{});
+        System.out.println("Beginning WorkspacesExample");
+        System.out.println("Ending MultiClassLogitExample");
+        CustomOpsExamples.main(new String[]{});
+
+
+    }
+
+
+}
diff --git a/tensorflow-keras-import-examples/pom.xml b/tensorflow-keras-import-examples/pom.xml
@@ -41,6 +41,7 @@
         <javacpp.version>1.5.5</javacpp.version>
         <tensorflow.version>1.15.5</tensorflow.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <junit.version>5.8.0-M1</junit.version>
     </properties>
 
     <repositories>
@@ -89,6 +90,28 @@
             <artifactId>deeplearning4j-zoo</artifactId>
             <version>${dl4j-master.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.nd4j</groupId>
+            <artifactId>samediff-import-tensorflow</artifactId>
+            <version>${dl4j-master.version}</version>
+        </dependency>
+
+        <!-- Test dependency. Ignore for your own application. -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <!-- Maven Enforcer: Ensures user has an up to date version of Maven before building -->
diff --git a/tensorflow-keras-import-examples/src/main/java/org/deeplearning4j/modelimportexamples/tf/advanced/bert/BertInferenceExample.java b/tensorflow-keras-import-examples/src/main/java/org/deeplearning4j/modelimportexamples/tf/advanced/bert/BertInferenceExample.java
@@ -35,6 +35,8 @@
 import org.nd4j.linalg.learning.config.Sgd;
 import org.nd4j.common.primitives.Pair;
 import org.nd4j.common.resources.Downloader;
+import org.nd4j.samediff.frameworkimport.tensorflow.importer.TensorflowFrameworkImporter;
+
 import java.io.File;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -56,7 +58,9 @@
  * <p>
  * Similar to all tensorflow models the frozen pb is imported into a SameDiff graph. In the case of BERT the graph has to be
  * preprocessed (removing unneeded nodes etc) before inference can be carried out on it. More details with code below.
+ * @deprecated "Note this example uses an older TF import API that will be going away. Please consider using the newer import api."
  */
+@Deprecated()
 public class BertInferenceExample {
 
     public static String bertModelPath;
diff --git a/tensorflow-keras-import-examples/src/main/java/org/deeplearning4j/modelimportexamples/tf/advanced/mobilenet/ImportMobileNetExample.java b/tensorflow-keras-import-examples/src/main/java/org/deeplearning4j/modelimportexamples/tf/advanced/mobilenet/ImportMobileNetExample.java
@@ -9,10 +9,12 @@
 import org.nd4j.linalg.api.ops.impl.image.ResizeBilinear;
 import org.nd4j.linalg.factory.Nd4j;
 import org.nd4j.linalg.indexing.NDArrayIndex;
+import org.nd4j.samediff.frameworkimport.tensorflow.importer.TensorflowFrameworkImporter;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.util.Collections;
 
 /**
  * This example shows the ability to import and use Tensorflow models, specifically mobilenet, and use them for inference.
@@ -24,8 +26,12 @@ public static void main(String[] args) throws Exception {
         // download and extract a tensorflow frozen model file (usually a .pb file)
         File modelFile = downloadModel();
 
+        //new tensorflow import api
+        TensorflowFrameworkImporter tensorflowFrameworkImporter = new TensorflowFrameworkImporter();
+
         // import the frozen model into a SameDiff instance
-        SameDiff sd = SameDiff.importFrozenTF(modelFile);
+        //note: this uses the new tensorflow import api
+        SameDiff sd = tensorflowFrameworkImporter.runImport(modelFile.getAbsolutePath(), Collections.emptyMap());
 
         System.out.println(sd.summary());
 
diff --git a/tensorflow-keras-import-examples/src/test/java/org/deeplearning4j/modelimportexamples/QuickTest.java b/tensorflow-keras-import-examples/src/test/java/org/deeplearning4j/modelimportexamples/QuickTest.java

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ android {`
`11`	`11`	`versionCode 1`
`12`	`12`	`versionName "1.0"`
`13`	`13`
`14`		`- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
	`14`	`+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`buildTypes {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.example.androidDl4jClassifier;`
	`1`	`+package com.example.androidclassifier;`
`2`	`2`
`3`	`3`	`import android.content.Context;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.example.androidDl4jClassifier;`
	`1`	`+package org.deeplearning4j.examples.androidclassifier;`
`2`	`2`
`3`	`3`	`import android.content.Context;`
`4`	`4`	`import android.graphics.Canvas;`