Merge branch 'master' into torch_index

deepjavalibrary · Jun 21, 2022 · 33a78d1 · 33a78d1
2 parents 8aead4e + fe5ee3f
commit 33a78d1
Show file tree

Hide file tree

Showing 592 changed files with 1,742 additions and 729 deletions.
diff --git a/.github/workflows/serving_publish.yml b/.github/workflows/serving_publish.yml
@@ -58,9 +58,17 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-2
-      - name: Publish deb
+      - name: Publish snapshot deb
+        if: ${{ github.event.inputs.mode == '' || github.event.inputs.mode == 'snapshot' }}
+        run: |
+          ./gradlew :serving:createDeb -Psnapshot
+          DJL_VERSION=$(cat gradle.properties | awk -F '=' '/djl_version/ {print $2}')
+          aws s3 cp serving/build/distributions/*.deb s3://djl-ai/publish/djl-serving/
+          aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/djl-serving/djl-serving_${DJL_VERSION}~SNAPSHOT*"
+      - name: Publish release deb
+        if: ${{ github.event.inputs.mode == 'staging' }}
         run: |
-          cd serving
-          ./gradlew createDeb -P${{ github.event.inputs.mode }}
-          aws s3 cp build/distributions/*.deb s3://djl-ai/publish/djl-serving/
-          aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/djl-serving/*"
+          ./gradlew :serving:createDeb -Pstaging
+          DJL_VERSION=$(cat gradle.properties | awk -F '=' '/djl_version/ {print $2}')
+          aws s3 cp serving/build/distributions/*.deb s3://djl-ai/publish/djl-serving/
+          aws cloudfront create-invalidation --distribution-id E371VB8JQ6NRVY --paths "/djl-serving/djl-serving_${DJL_VERSION}*"
diff --git a/api/src/main/java/ai/djl/BaseModel.java b/api/src/main/java/ai/djl/BaseModel.java
@@ -27,6 +27,10 @@
 import ai.djl.util.Pair;
 import ai.djl.util.PairList;
 import ai.djl.util.Utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.DataInputStream;
@@ -46,8 +50,6 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /** {@code BaseModel} is the basic implementation of {@link Model}. */
 public abstract class BaseModel implements Model {

diff --git a/api/src/main/java/ai/djl/Device.java b/api/src/main/java/ai/djl/Device.java
@@ -13,6 +13,7 @@
 package ai.djl;
 
 import ai.djl.engine.Engine;
+
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/api/src/main/java/ai/djl/Model.java b/api/src/main/java/ai/djl/Model.java
@@ -22,6 +22,7 @@
 import ai.djl.training.TrainingConfig;
 import ai.djl.translate.Translator;
 import ai.djl.util.PairList;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;

diff --git a/api/src/main/java/ai/djl/engine/Engine.java b/api/src/main/java/ai/djl/engine/Engine.java
@@ -22,6 +22,10 @@
 import ai.djl.training.optimizer.Optimizer;
 import ai.djl.util.Utils;
 import ai.djl.util.cuda.CudaUtils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.lang.management.MemoryUsage;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -30,8 +34,6 @@
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The {@code Engine} interface is the base of the provided implementation for DJL.
@@ -127,7 +129,9 @@ public static Engine getInstance() {
             throw new EngineException(
                     "No deep learning engine found."
                             + System.lineSeparator()
-                            + "Please refer to https://github.com/deepjavalibrary/djl/blob/master/docs/development/troubleshooting.md for more details.");
+                            + "Please refer to"
+                            + " https://github.com/deepjavalibrary/djl/blob/master/docs/development/troubleshooting.md"
+                            + " for more details.");
         }
         return getEngine(getDefaultEngineName());
     }

diff --git a/api/src/main/java/ai/djl/inference/Predictor.java b/api/src/main/java/ai/djl/inference/Predictor.java
@@ -26,13 +26,15 @@
 import ai.djl.translate.TranslateException;
 import ai.djl.translate.Translator;
 import ai.djl.translate.TranslatorContext;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The {@code Predictor} interface provides a session for model inference.

diff --git a/api/src/main/java/ai/djl/metric/Metric.java b/api/src/main/java/ai/djl/metric/Metric.java
@@ -13,6 +13,7 @@
 package ai.djl.metric;
 
 import com.google.gson.annotations.SerializedName;
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.regex.Matcher;

diff --git a/api/src/main/java/ai/djl/modality/Classifications.java b/api/src/main/java/ai/djl/modality/Classifications.java
@@ -16,10 +16,12 @@
 import ai.djl.ndarray.types.DataType;
 import ai.djl.util.JsonSerializable;
 import ai.djl.util.JsonUtils;
+
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
+
 import java.lang.reflect.Type;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;

diff --git a/api/src/main/java/ai/djl/modality/Input.java b/api/src/main/java/ai/djl/modality/Input.java
@@ -18,6 +18,7 @@
 import ai.djl.ndarray.NDManager;
 import ai.djl.util.Pair;
 import ai.djl.util.PairList;
+
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.Map.Entry;

diff --git a/api/src/main/java/ai/djl/modality/cv/BufferedImageFactory.java b/api/src/main/java/ai/djl/modality/cv/BufferedImageFactory.java
@@ -25,6 +25,7 @@
 import ai.djl.ndarray.types.DataType;
 import ai.djl.ndarray.types.Shape;
 import ai.djl.util.RandomUtils;
+
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.FontMetrics;
@@ -39,6 +40,7 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.IntStream;
+
 import javax.imageio.ImageIO;
 
 /** {@code BufferedImageFactory} is the default implementation of {@link ImageFactory}. */

diff --git a/api/src/main/java/ai/djl/modality/cv/Image.java b/api/src/main/java/ai/djl/modality/cv/Image.java
@@ -17,6 +17,7 @@
 import ai.djl.modality.cv.output.Joints;
 import ai.djl.ndarray.NDArray;
 import ai.djl.ndarray.NDManager;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;

diff --git a/api/src/main/java/ai/djl/modality/cv/ImageFactory.java b/api/src/main/java/ai/djl/modality/cv/ImageFactory.java
@@ -13,14 +13,16 @@
 package ai.djl.modality.cv;
 
 import ai.djl.ndarray.NDArray;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * {@code ImageFactory} contains image creation mechanism on top of different platforms like PC and

diff --git a/api/src/main/java/ai/djl/modality/cv/MultiBoxPrior.java b/api/src/main/java/ai/djl/modality/cv/MultiBoxPrior.java
@@ -13,6 +13,7 @@
 package ai.djl.modality.cv;
 
 import ai.djl.ndarray.NDArray;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

diff --git a/api/src/main/java/ai/djl/modality/cv/output/DetectedObjects.java b/api/src/main/java/ai/djl/modality/cv/output/DetectedObjects.java
@@ -14,7 +14,9 @@
 
 import ai.djl.modality.Classifications;
 import ai.djl.util.JsonUtils;
+
 import com.google.gson.Gson;
+
 import java.util.List;
 
 /**

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/BaseImageTranslator.java b/api/src/main/java/ai/djl/modality/cv/translator/BaseImageTranslator.java
@@ -27,6 +27,7 @@
 import ai.djl.translate.Translator;
 import ai.djl.translate.TranslatorContext;
 import ai.djl.util.Utils;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/BigGANTranslatorFactory.java b/api/src/main/java/ai/djl/modality/cv/translator/BigGANTranslatorFactory.java
@@ -19,6 +19,7 @@
 import ai.djl.translate.Translator;
 import ai.djl.translate.TranslatorFactory;
 import ai.djl.util.Pair;
+
 import java.lang.reflect.Type;
 import java.util.Collections;
 import java.util.Map;

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/ImageClassificationTranslator.java b/api/src/main/java/ai/djl/modality/cv/translator/ImageClassificationTranslator.java
@@ -18,6 +18,7 @@
 import ai.djl.ndarray.NDList;
 import ai.djl.translate.ArgumentsUtil;
 import ai.djl.translate.TranslatorContext;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/ImageClassificationTranslatorFactory.java b/api/src/main/java/ai/djl/modality/cv/translator/ImageClassificationTranslatorFactory.java
@@ -23,6 +23,7 @@
 import ai.djl.translate.Translator;
 import ai.djl.translate.TranslatorFactory;
 import ai.djl.util.Pair;
+
 import java.io.InputStream;
 import java.lang.reflect.Type;
 import java.net.URL;

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/ImageServingTranslator.java b/api/src/main/java/ai/djl/modality/cv/translator/ImageServingTranslator.java
@@ -23,6 +23,7 @@
 import ai.djl.translate.Translator;
 import ai.djl.translate.TranslatorContext;
 import ai.djl.util.JsonSerializable;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/InstanceSegmentationTranslator.java b/api/src/main/java/ai/djl/modality/cv/translator/InstanceSegmentationTranslator.java
@@ -23,6 +23,7 @@
 import ai.djl.translate.ArgumentsUtil;
 import ai.djl.translate.Transform;
 import ai.djl.translate.TranslatorContext;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/InstanceSegmentationTranslatorFactory.java b/api/src/main/java/ai/djl/modality/cv/translator/InstanceSegmentationTranslatorFactory.java
@@ -22,6 +22,7 @@
 import ai.djl.modality.cv.translator.wrapper.UrlTranslator;
 import ai.djl.translate.Translator;
 import ai.djl.translate.TranslatorFactory;
+
 import java.io.InputStream;
 import java.net.URL;
 import java.nio.file.Path;

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/ObjectDetectionTranslator.java b/api/src/main/java/ai/djl/modality/cv/translator/ObjectDetectionTranslator.java
@@ -16,6 +16,7 @@
 import ai.djl.ndarray.NDArray;
 import ai.djl.translate.ArgumentsUtil;
 import ai.djl.translate.TranslatorContext;
+
 import java.util.List;
 import java.util.Map;
 

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/ObjectDetectionTranslatorFactory.java b/api/src/main/java/ai/djl/modality/cv/translator/ObjectDetectionTranslatorFactory.java
@@ -18,6 +18,7 @@
 import ai.djl.modality.cv.output.DetectedObjects;
 import ai.djl.translate.TranslatorFactory;
 import ai.djl.util.Pair;
+
 import java.io.InputStream;
 import java.lang.reflect.Type;
 import java.net.URL;

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/SimplePoseTranslator.java b/api/src/main/java/ai/djl/modality/cv/translator/SimplePoseTranslator.java
@@ -21,6 +21,7 @@
 import ai.djl.ndarray.types.Shape;
 import ai.djl.translate.ArgumentsUtil;
 import ai.djl.translate.TranslatorContext;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/SimplePoseTranslatorFactory.java b/api/src/main/java/ai/djl/modality/cv/translator/SimplePoseTranslatorFactory.java
@@ -20,6 +20,7 @@
 import ai.djl.translate.Translator;
 import ai.djl.translate.TranslatorFactory;
 import ai.djl.util.Pair;
+
 import java.lang.reflect.Type;
 import java.util.HashSet;
 import java.util.Map;

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/SingleShotDetectionTranslator.java b/api/src/main/java/ai/djl/modality/cv/translator/SingleShotDetectionTranslator.java
@@ -18,6 +18,7 @@
 import ai.djl.ndarray.NDArray;
 import ai.djl.ndarray.NDList;
 import ai.djl.translate.TranslatorContext;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/SingleShotDetectionTranslatorFactory.java b/api/src/main/java/ai/djl/modality/cv/translator/SingleShotDetectionTranslatorFactory.java
@@ -22,6 +22,7 @@
 import ai.djl.modality.cv.translator.wrapper.UrlTranslator;
 import ai.djl.translate.Translator;
 import ai.djl.translate.TranslatorFactory;
+
 import java.io.InputStream;
 import java.net.URL;
 import java.nio.file.Path;

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/StyleTransferTranslatorFactory.java b/api/src/main/java/ai/djl/modality/cv/translator/StyleTransferTranslatorFactory.java
@@ -18,6 +18,7 @@
 import ai.djl.translate.Translator;
 import ai.djl.translate.TranslatorFactory;
 import ai.djl.util.Pair;
+
 import java.lang.reflect.Type;
 import java.util.Collections;
 import java.util.Map;

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/YoloTranslator.java b/api/src/main/java/ai/djl/modality/cv/translator/YoloTranslator.java
@@ -19,6 +19,7 @@
 import ai.djl.ndarray.NDList;
 import ai.djl.ndarray.types.DataType;
 import ai.djl.translate.TranslatorContext;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/YoloTranslatorFactory.java b/api/src/main/java/ai/djl/modality/cv/translator/YoloTranslatorFactory.java
@@ -23,6 +23,7 @@
 import ai.djl.translate.TranslateException;
 import ai.djl.translate.Translator;
 import ai.djl.translate.TranslatorFactory;
+
 import java.io.InputStream;
 import java.net.URL;
 import java.nio.file.Path;

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/YoloV5Translator.java b/api/src/main/java/ai/djl/modality/cv/translator/YoloV5Translator.java
@@ -19,6 +19,7 @@
 import ai.djl.ndarray.types.DataType;
 import ai.djl.translate.ArgumentsUtil;
 import ai.djl.translate.TranslatorContext;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/YoloV5TranslatorFactory.java b/api/src/main/java/ai/djl/modality/cv/translator/YoloV5TranslatorFactory.java
@@ -23,6 +23,7 @@
 import ai.djl.translate.TranslateException;
 import ai.djl.translate.Translator;
 import ai.djl.translate.TranslatorFactory;
+
 import java.io.InputStream;
 import java.net.URL;
 import java.nio.file.Path;

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/wrapper/FileTranslator.java b/api/src/main/java/ai/djl/modality/cv/translator/wrapper/FileTranslator.java
@@ -18,6 +18,7 @@
 import ai.djl.translate.Batchifier;
 import ai.djl.translate.Translator;
 import ai.djl.translate.TranslatorContext;
+
 import java.nio.file.Path;
 
 /**

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/wrapper/InputStreamTranslator.java b/api/src/main/java/ai/djl/modality/cv/translator/wrapper/InputStreamTranslator.java
@@ -18,6 +18,7 @@
 import ai.djl.translate.Batchifier;
 import ai.djl.translate.Translator;
 import ai.djl.translate.TranslatorContext;
+
 import java.io.InputStream;
 
 /**

diff --git a/api/src/main/java/ai/djl/modality/cv/translator/wrapper/UrlTranslator.java b/api/src/main/java/ai/djl/modality/cv/translator/wrapper/UrlTranslator.java
@@ -18,6 +18,7 @@
 import ai.djl.translate.Batchifier;
 import ai.djl.translate.Translator;
 import ai.djl.translate.TranslatorContext;
+
 import java.net.URL;
 
 /**

diff --git a/api/src/main/java/ai/djl/modality/nlp/Decoder.java b/api/src/main/java/ai/djl/modality/nlp/Decoder.java
@@ -21,6 +21,7 @@
 import ai.djl.nn.Block;
 import ai.djl.training.ParameterStore;
 import ai.djl.util.PairList;
+
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;