Merge updates

build.gradle

@@ -1,34 +1,17 @@
-plugins {
-    id 'java'
-}
-
-repositories {
-    mavenLocal()
-    jcenter()
-    maven {
-        url "https://oss.sonatype.org/content/repositories/snapshots/"
+allprojects {
+    repositories {
+        jcenter()
+        maven {
+            url "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
     }
-}
-
-dependencies {
-    implementation "javax.visrec:visrec-api:1.0-SNAPSHOT"
-    implementation "ai.djl:api:0.3.0-SNAPSHOT"
-    implementation "ai.djl:basicdataset:0.3.0-SNAPSHOT"
-    implementation "ai.djl:model-zoo:0.3.0-SNAPSHOT"
-    implementation "ai.djl.mxnet:mxnet-model-zoo:0.3.0-SNAPSHOT"
-    implementation 'ai.djl.mxnet:mxnet-engine:0.3.0-SNAPSHOT'
-    implementation 'ai.djl.mxnet:mxnet-native-mkl:1.6.0-c-SNAPSHOT'
-    implementation "org.apache.commons:commons-csv:1.7"
-    implementation "org.slf4j:slf4j-simple:1.7.30"
 
-    testImplementation("org.testng:testng:6.14.3") {
-        exclude group: "junit", module: "junit"
+    apply plugin: 'idea'
+    idea {
+        module {
+            outputDir = file('build/classes/java/main')
+            testOutputDir = file('build/classes/java/test')
+            // inheritOutputDirs = true
+        }
     }
 }
-
-test {
-    // Use TestNG for unit tests
-    useTestNG()
-}
-
-apply from: file("${rootProject.projectDir}/tools/gradle/formatter.gradle")

examples/build.gradle

@@ -0,0 +1,30 @@
+plugins {
+    id "java"
+    id "application"
+}
+
+dependencies {
+    implementation project(":jsr381")
+
+    testImplementation("org.testng:testng:6.14.3") {
+        exclude group: "junit", module: "junit"
+    }
+}
+
+test {
+    // Use TestNG for unit tests
+    useTestNG()
+}
+
+application {
+    mainClassName = System.getProperty("main", "ai.djl.jsr381.detection.ObjectDetectorExample")
+}
+
+run {
+    systemProperties System.getProperties()
+    systemProperties.remove("user.dir")
+    systemProperty("file.encoding", "UTF-8")
+}
+tasks.distTar.enabled = false
+
+apply from: file("${rootProject.projectDir}/tools/gradle/formatter.gradle")

examples/gradlew

@@ -0,0 +1 @@
+../gradlew

examples/gradlew.bat

@@ -0,0 +1 @@
+../gradlew.bat

examples/src/main/java/ai/djl/jsr381/classification/BinaryClassifierExample.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2020 Amazon.com, Inc. or its affiliates. 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. A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file 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 ai.djl.jsr381.classification;
+
+import java.io.File;
+import javax.visrec.ml.ClassificationException;
+import javax.visrec.ml.ClassifierCreationException;
+import javax.visrec.ml.classification.BinaryClassifier;
+import javax.visrec.ml.classification.NeuralNetBinaryClassifier;
+
+public class BinaryClassifierExample {
+
+    public static void main(String[] args)
+            throws ClassificationException, ClassifierCreationException {
+        File trainingFile = new File("../jsr381/src/test/resources/spam.csv");
+        BinaryClassifier<float[]> spamClassifier =
+                NeuralNetBinaryClassifier.builder()
+                        .inputClass(float[].class)
+                        .inputsNum(57)
+                        .hiddenLayers(5)
+                        .maxEpochs(2)
+                        .trainingFile(trainingFile)
+                        .build();
+
+        // create test email feature
+        float[] emailFeatures = new float[57];
+        emailFeatures[56] = 1;
+
+        Float result = spamClassifier.classify(emailFeatures);
+        System.out.println(result);
+    }
+}

examples/src/main/java/ai/djl/jsr381/classification/ImageClassifierExample.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020 Amazon.com, Inc. or its affiliates. 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. A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file 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 ai.djl.jsr381.classification;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.util.Map;
+import javax.visrec.ml.ClassificationException;
+import javax.visrec.ml.ClassifierCreationException;
+import javax.visrec.ml.classification.ImageClassifier;
+import javax.visrec.ml.classification.NeuralNetImageClassifier;
+
+public class ImageClassifierExample {
+
+    public static void main(String[] args)
+            throws ClassifierCreationException, ClassificationException {
+        File input = new File("../jsr381/src/test/resources/0.png");
+
+        ImageClassifier<BufferedImage> classifier =
+                NeuralNetImageClassifier.builder()
+                        .inputClass(BufferedImage.class)
+                        .imageHeight(28)
+                        .imageWidth(28)
+                        .build();
+
+        Map<String, Float> result = classifier.classify(input);
+        for (Map.Entry<String, Float> entry : result.entrySet()) {
+            System.out.println(entry.getKey() + ": " + entry.getValue());
+        }
+    }
+}

examples/src/main/java/ai/djl/jsr381/detection/ObjectDetectorExample.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2020 Amazon.com, Inc. or its affiliates. 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. A copy of the License is located at
+ *
+ * http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file 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 ai.djl.jsr381.detection;
+
+import ai.djl.Application;
+import ai.djl.MalformedModelException;
+import ai.djl.modality.cv.DetectedObjects;
+import ai.djl.modality.cv.util.BufferedImageUtils;
+import ai.djl.repository.zoo.Criteria;
+import ai.djl.repository.zoo.ModelNotFoundException;
+import ai.djl.repository.zoo.ModelZoo;
+import ai.djl.repository.zoo.ZooModel;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import javax.visrec.ml.ClassificationException;
+import javax.visrec.util.BoundingBox;
+
+public class ObjectDetectorExample {
+
+    public static void main(String[] args)
+            throws ClassificationException, IOException, ModelNotFoundException,
+                    MalformedModelException {
+        Criteria<BufferedImage, DetectedObjects> criteria =
+                Criteria.builder()
+                        .setTypes(BufferedImage.class, DetectedObjects.class)
+                        .optApplication(Application.CV.OBJECT_DETECTION)
+                        .optArgument("threshold", 0.01)
+                        .build();
+        try (ZooModel<BufferedImage, DetectedObjects> model = ModelZoo.loadModel(criteria)) {
+            SimpleObjectDetector objectDetector = new SimpleObjectDetector(model);
+
+            BufferedImage input =
+                    BufferedImageUtils.fromUrl(
+                            "https://djl-ai.s3.amazonaws.com/resources/images/dog_bike_car.jpg");
+            Map<String, List<BoundingBox>> result = objectDetector.detectObject(input);
+
+            for (List<BoundingBox> boundingBoxes : result.values()) {
+                for (BoundingBox boundingBox : boundingBoxes) {
+                    System.out.println(boundingBox.toString());
+                }
+            }
+        }
+    }
+}

gradle.properties

@@ -1,2 +1,8 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xmx1024M
+
+systemProp.org.gradle.internal.http.socketTimeout=120000
+systemProp.org.gradle.internal.http.connectionTimeout=60000
+
+# FIXME: Workaround gradle publish issue: https://github.com/gradle/gradle/issues/11308
+systemProp.org.gradle.internal.publish.checksums.insecure=true

jsr381/build.gradle

@@ -0,0 +1,118 @@
+plugins {
+    id "java-library"
+    id "maven-publish"
+    id "signing"
+}
+
+group "ai.djl.jsr381"
+boolean isRelease = project.hasProperty("release") || project.hasProperty("staging")
+version = "0.3.0" + (isRelease ? "" : "-SNAPSHOT")
+
+dependencies {
+    api "javax.visrec:visrec-api:1.0-SNAPSHOT"
+    api "ai.djl:api:0.3.0"
+    api "ai.djl:basicdataset:0.3.0"
+    api "ai.djl:model-zoo:0.3.0"
+    api "ai.djl.mxnet:mxnet-model-zoo:0.3.0"
+    api 'ai.djl.mxnet:mxnet-engine:0.3.0'
+    api 'ai.djl.mxnet:mxnet-native-auto:1.6.0'
+    api "org.apache.commons:commons-csv:1.7"
+
+    testImplementation "org.slf4j:slf4j-simple:1.7.30"
+    testImplementation("org.testng:testng:6.14.3") {
+        exclude group: "junit", module: "junit"
+    }
+}
+
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
+test {
+    // Use TestNG for unit tests
+    useTestNG()
+}
+
+apply from: file("${rootProject.projectDir}/tools/gradle/formatter.gradle")
+
+project.tasks.withType(GenerateModuleMetadata) {
+    enabled = false
+}
+
+signing {
+    required(project.hasProperty("staging") || project.hasProperty("snapshot"))
+    def signingKey = findProperty("signingKey")
+    def signingPassword = findProperty("signingPassword")
+    useInMemoryPgpKeys(signingKey, signingPassword)
+    sign publishing.publications
+}
+
+if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+    if (gradle.startParameter.taskNames.contains("publish")) {
+        throw new GradleException("JDK 1.8 is required to run publish task.")
+    }
+    return
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+            artifacts = [jar, javadocJar, sourcesJar]
+            pom {
+                name = "Deep Java Library implementation of JSR-381"
+                description = "Deep Java Library implementation of JSR-381"
+                url = "http://www.djl.ai/"
+
+                packaging = "jar"
+
+                licenses {
+                    license {
+                        name = 'The Apache License, Version 2.0'
+                        url = 'https://www.apache.org/licenses/LICENSE-2.0'
+                    }
+                }
+
+                scm {
+                    connection = "scm:git:[email protected]:awslabs/djl.git"
+                    developerConnection = "scm:git:[email protected]:awslabs/djl.git"
+                    url = "https://github.com/awslabs/djl"
+                    tag = "HEAD"
+                }
+
+                developers {
+                    developer {
+                        name = "DJL.AI Team"
+                        email = "[email protected]"
+                        organization = "Amazon AI"
+                        organizationUrl = "https://amazon.com"
+                    }
+                }
+            }
+        }
+    }
+
+    repositories {
+        maven {
+            if (project.hasProperty("snapshot")) {
+                name = "snapshot"
+                url = "https://oss.sonatype.org/content/repositories/snapshots/"
+                credentials {
+                    username = findProperty("ossrhUsername")
+                    password = findProperty("ossrhPassword")
+                }
+            } else if (project.hasProperty("staging")) {
+                name = "staging"
+                url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+                credentials {
+                    username = findProperty("ossrhUsername")
+                    password = findProperty("ossrhPassword")
+                }
+            } else {
+                name = "local"
+                url = "build/repo"
+            }
+        }
+    }
+}

jsr381/gradlew

@@ -0,0 +1 @@
+../gradlew

jsr381/gradlew.bat

@@ -0,0 +1 @@
+../gradlew.bat

src/main/java/visrec/djl/ml/classification/SimpleBinaryClassifier.java → jsr381/src/main/java/ai/djl/jsr381/classification/SimpleBinaryClassifier.java

@@ -1,4 +1,4 @@
-package visrec.djl.ml.classification;
+package ai.djl.jsr381.classification;
 
 import ai.djl.inference.Predictor;
 import ai.djl.repository.zoo.ZooModel;

src/main/java/visrec/djl/ml/classification/SimpleImageClassifier.java → jsr381/src/main/java/ai/djl/jsr381/classification/SimpleImageClassifier.java

@@ -1,4 +1,4 @@
-package visrec.djl.ml.classification;
+package ai.djl.jsr381.classification;
 
 import ai.djl.inference.Predictor;
 import ai.djl.modality.Classifications;

src/main/java/visrec/djl/ml/dataset/CsvDataset.java → jsr381/src/main/java/ai/djl/jsr381/dataset/CsvDataset.java

@@ -1,4 +1,4 @@
-package visrec.djl.ml.dataset;
+package ai.djl.jsr381.dataset;
 
 import ai.djl.ndarray.NDArray;
 import ai.djl.ndarray.NDList;

src/main/java/visrec/djl/ml/detection/SimpleObjectDetector.java → jsr381/src/main/java/ai/djl/jsr381/detection/SimpleObjectDetector.java

@@ -1,4 +1,4 @@
-package visrec.djl.ml.detection;
+package ai.djl.jsr381.detection;
 
 import ai.djl.inference.Predictor;
 import ai.djl.modality.cv.DetectedObjects;