From 6bfd9a0010f98106519770a8511341395ed4cb19 Mon Sep 17 00:00:00 2001 From: Frank Liu Date: Mon, 20 Jun 2022 11:03:15 -0700 Subject: [PATCH 1/7] [ci] Fixes publish serving deb (#1725) Change-Id: Id55884b5d5c9e2d81c5b6c50abbea5b11441f50c --- .github/workflows/serving_publish.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/serving_publish.yml b/.github/workflows/serving_publish.yml index 81a5780b0649..2a10ef668cba 100644 --- 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}*" From 1fc1c5292ffda70c1e367887284febb4185effd8 Mon Sep 17 00:00:00 2001 From: Frank Liu Date: Mon, 20 Jun 2022 11:17:19 -0700 Subject: [PATCH 2/7] Add ai.djl.audio and ai.djl.tablesaw to BOM (#1728) Change-Id: I5344c53102b180e964e13dcb1534032f70cbde2a --- bom/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bom/build.gradle b/bom/build.gradle index e5b8afaeedf3..c40ba041035e 100644 --- a/bom/build.gradle +++ b/bom/build.gradle @@ -20,6 +20,7 @@ dependencies { api "ai.djl:model-zoo:${version}" api "ai.djl:serving:${version}" api "ai.djl.aws:aws-ai:${version}" + api "ai.djl.audio:audio:${version}" api "ai.djl.dlr:dlr-engine:${version}" api "ai.djl.fasttext:fasttext-engine:${version}" api "ai.djl.hadoop:hadoop:${version}" @@ -35,6 +36,7 @@ dependencies { api "ai.djl.pytorch:pytorch-jni:${pytorch_version}-${version}" api "ai.djl.pytorch:pytorch-model-zoo:${version}" api "ai.djl.sentencepiece:sentencepiece:${version}" + api "ai.djl.tablesaw:tablesaw:${version}" api "ai.djl.tensorflow:tensorflow-api:${version}" api "ai.djl.tensorflow:tensorflow-engine:${version}" api "ai.djl.tensorflow:tensorflow-model-zoo:${version}" From f2e3636059513cb312f1479ded9d4f8ef7d3fa5a Mon Sep 17 00:00:00 2001 From: Frank Liu Date: Mon, 20 Jun 2022 11:17:37 -0700 Subject: [PATCH 3/7] [format] Upgrade java format to 1.15.0 (#1727) Change-Id: I84800194e7919df2f8b2251188a44680d8075c4b --- api/src/main/java/ai/djl/BaseModel.java | 6 ++-- api/src/main/java/ai/djl/Device.java | 1 + api/src/main/java/ai/djl/Model.java | 1 + api/src/main/java/ai/djl/engine/Engine.java | 10 ++++-- .../main/java/ai/djl/inference/Predictor.java | 6 ++-- api/src/main/java/ai/djl/metric/Metric.java | 1 + .../java/ai/djl/modality/Classifications.java | 2 ++ api/src/main/java/ai/djl/modality/Input.java | 1 + .../djl/modality/cv/BufferedImageFactory.java | 2 ++ .../main/java/ai/djl/modality/cv/Image.java | 1 + .../java/ai/djl/modality/cv/ImageFactory.java | 6 ++-- .../ai/djl/modality/cv/MultiBoxPrior.java | 1 + .../modality/cv/output/DetectedObjects.java | 2 ++ .../cv/translator/BaseImageTranslator.java | 1 + .../translator/BigGANTranslatorFactory.java | 1 + .../ImageClassificationTranslator.java | 1 + .../ImageClassificationTranslatorFactory.java | 1 + .../cv/translator/ImageServingTranslator.java | 1 + .../InstanceSegmentationTranslator.java | 1 + ...InstanceSegmentationTranslatorFactory.java | 1 + .../translator/ObjectDetectionTranslator.java | 1 + .../ObjectDetectionTranslatorFactory.java | 1 + .../cv/translator/SimplePoseTranslator.java | 1 + .../SimplePoseTranslatorFactory.java | 1 + .../SingleShotDetectionTranslator.java | 1 + .../SingleShotDetectionTranslatorFactory.java | 1 + .../StyleTransferTranslatorFactory.java | 1 + .../cv/translator/YoloTranslator.java | 1 + .../cv/translator/YoloTranslatorFactory.java | 1 + .../cv/translator/YoloV5Translator.java | 1 + .../translator/YoloV5TranslatorFactory.java | 1 + .../cv/translator/wrapper/FileTranslator.java | 1 + .../wrapper/InputStreamTranslator.java | 1 + .../cv/translator/wrapper/UrlTranslator.java | 1 + .../java/ai/djl/modality/nlp/Decoder.java | 1 + .../djl/modality/nlp/DefaultVocabulary.java | 13 ++++---- .../java/ai/djl/modality/nlp/Encoder.java | 1 + .../ai/djl/modality/nlp/EncoderDecoder.java | 1 + .../modality/nlp/bert/BertFullTokenizer.java | 1 + .../djl/modality/nlp/bert/BertTokenizer.java | 1 + .../modality/nlp/bert/WordpieceTokenizer.java | 1 + .../nlp/embedding/ModelZooTextEmbedding.java | 1 + .../nlp/embedding/SimpleTextEmbedding.java | 1 + .../modality/nlp/embedding/TextEmbedding.java | 1 + .../nlp/embedding/TrainableTextEmbedding.java | 1 + .../nlp/embedding/TrainableWordEmbedding.java | 1 + .../modality/nlp/translator/QATranslator.java | 1 + .../nlp/translator/QaServingTranslator.java | 1 + .../translator/SimpleText2TextTranslator.java | 1 + .../java/ai/djl/modality/rl/ActionSpace.java | 1 + .../java/ai/djl/modality/rl/agent/QAgent.java | 1 + .../java/ai/djl/ndarray/BaseNDManager.java | 9 ++++-- .../ai/djl/ndarray/BytesSupplierImpl.java | 1 + api/src/main/java/ai/djl/ndarray/NDArray.java | 1 + .../java/ai/djl/ndarray/NDArrayAdapter.java | 1 + .../main/java/ai/djl/ndarray/NDArrays.java | 1 + api/src/main/java/ai/djl/ndarray/NDList.java | 1 + .../main/java/ai/djl/ndarray/NDManager.java | 1 + .../java/ai/djl/ndarray/NDSerializer.java | 1 + api/src/main/java/ai/djl/ndarray/NDUtils.java | 4 ++- .../ai/djl/ndarray/index/NDArrayIndexer.java | 1 + .../java/ai/djl/ndarray/index/NDIndex.java | 1 + .../ndarray/index/full/NDIndexFullPick.java | 1 + .../ndarray/index/full/NDIndexFullSlice.java | 1 + .../ai/djl/ndarray/internal/NDArrayEx.java | 1 + .../ai/djl/ndarray/internal/NDFormat.java | 5 ++- .../java/ai/djl/ndarray/types/DataType.java | 1 + .../main/java/ai/djl/ndarray/types/Shape.java | 1 + .../java/ai/djl/nn/AbstractBaseBlock.java | 5 ++- .../main/java/ai/djl/nn/AbstractBlock.java | 1 + api/src/main/java/ai/djl/nn/Block.java | 1 + api/src/main/java/ai/djl/nn/BlockFactory.java | 1 + api/src/main/java/ai/djl/nn/BlockList.java | 1 + api/src/main/java/ai/djl/nn/LambdaBlock.java | 1 + .../main/java/ai/djl/nn/ParallelBlock.java | 7 ++-- api/src/main/java/ai/djl/nn/Parameter.java | 1 + .../main/java/ai/djl/nn/ParameterList.java | 1 + .../main/java/ai/djl/nn/SequentialBlock.java | 1 + .../ai/djl/nn/convolutional/Convolution.java | 1 + .../djl/nn/convolutional/Deconvolution.java | 1 + .../ai/djl/nn/core/ConstantEmbedding.java | 1 + .../main/java/ai/djl/nn/core/Embedding.java | 1 + api/src/main/java/ai/djl/nn/core/Linear.java | 1 + .../java/ai/djl/nn/core/LinearCollection.java | 1 + api/src/main/java/ai/djl/nn/core/Prelu.java | 1 + .../main/java/ai/djl/nn/norm/BatchNorm.java | 1 + api/src/main/java/ai/djl/nn/norm/Dropout.java | 1 + .../main/java/ai/djl/nn/norm/LayerNorm.java | 1 + api/src/main/java/ai/djl/nn/pooling/Pool.java | 1 + .../ai/djl/nn/recurrent/RecurrentBlock.java | 1 + .../java/ai/djl/nn/transformer/BertBlock.java | 1 + .../BertMaskedLanguageModelBlock.java | 1 + .../nn/transformer/BertNextSentenceBlock.java | 1 + .../nn/transformer/BertPretrainingBlock.java | 1 + .../nn/transformer/BertPretrainingLoss.java | 1 + .../ai/djl/nn/transformer/IdEmbedding.java | 1 + .../PointwiseFeedForwardBlock.java | 1 + .../transformer/TransformerEncoderBlock.java | 1 + .../ai/djl/repository/AbstractRepository.java | 14 ++++---- .../main/java/ai/djl/repository/Artifact.java | 1 + .../java/ai/djl/repository/JarRepository.java | 6 ++-- .../ai/djl/repository/LocalRepository.java | 6 ++-- api/src/main/java/ai/djl/repository/MRL.java | 6 ++-- .../main/java/ai/djl/repository/Metadata.java | 1 + .../ai/djl/repository/RemoteRepository.java | 1 + .../java/ai/djl/repository/Repository.java | 1 + .../djl/repository/RepositoryFactoryImpl.java | 6 ++-- .../ai/djl/repository/SimpleRepository.java | 6 ++-- .../djl/repository/SimpleUrlRepository.java | 6 ++-- .../djl/repository/zoo/BaseModelLoader.java | 1 + .../java/ai/djl/repository/zoo/Criteria.java | 6 ++-- .../djl/repository/zoo/DefaultModelZoo.java | 6 ++-- .../ai/djl/repository/zoo/ModelLoader.java | 1 + .../java/ai/djl/repository/zoo/ModelZoo.java | 1 + .../java/ai/djl/repository/zoo/ZooModel.java | 1 + .../djl/training/DefaultTrainingConfig.java | 1 + .../main/java/ai/djl/training/EasyTrain.java | 7 ++-- .../java/ai/djl/training/ParameterServer.java | 1 + .../java/ai/djl/training/ParameterStore.java | 1 + .../main/java/ai/djl/training/Trainer.java | 11 +++---- .../java/ai/djl/training/TrainingConfig.java | 1 + .../java/ai/djl/training/TrainingResult.java | 1 + .../ai/djl/training/dataset/ArrayDataset.java | 1 + .../ai/djl/training/dataset/DataIterable.java | 6 ++-- .../java/ai/djl/training/dataset/Dataset.java | 1 + .../training/dataset/RandomAccessDataset.java | 1 + .../djl/training/dataset/RandomSampler.java | 1 + .../training/evaluator/AbstractAccuracy.java | 1 + .../training/evaluator/BoundingBoxError.java | 1 + .../ai/djl/training/evaluator/Evaluator.java | 1 + .../djl/training/evaluator/TopKAccuracy.java | 1 + .../djl/training/hyperparameter/EasyHpo.java | 4 ++- .../optimizer/BaseHpOptimizer.java | 1 + .../hyperparameter/param/HpCategorical.java | 1 + .../DivergenceCheckTrainingListener.java | 4 +-- .../listener/EvaluatorTrainingListener.java | 1 + .../listener/LoggingTrainingListener.java | 6 ++-- .../listener/MemoryTrainingListener.java | 6 ++-- .../listener/SaveModelTrainingListener.java | 6 ++-- .../listener/TimeMeasureTrainingListener.java | 6 ++-- .../training/listener/TrainingListener.java | 1 + .../training/loss/AbstractCompositeLoss.java | 1 + .../main/java/ai/djl/training/loss/Loss.java | 1 + .../training/loss/SimpleCompositeLoss.java | 1 + .../loss/SingleShotDetectionLoss.java | 1 + .../ai/djl/training/optimizer/Adadelta.java | 1 + .../ai/djl/training/optimizer/Adagrad.java | 1 + .../java/ai/djl/training/optimizer/Adam.java | 1 + .../java/ai/djl/training/optimizer/Nag.java | 1 + .../ai/djl/training/optimizer/Optimizer.java | 1 + .../ai/djl/training/optimizer/RmsProp.java | 1 + .../java/ai/djl/training/optimizer/Sgd.java | 1 + .../training/tracker/MultiFactorTracker.java | 6 ++-- .../ai/djl/training/util/DownloadUtils.java | 1 + .../java/ai/djl/translate/Batchifier.java | 1 + .../translate/DefaultTranslatorFactory.java | 1 + .../djl/translate/PaddingStackBatchifier.java | 1 + .../main/java/ai/djl/translate/Pipeline.java | 1 + .../ai/djl/translate/ServingTranslator.java | 1 + .../translate/ServingTranslatorFactory.java | 7 ++-- .../ai/djl/translate/StackBatchifier.java | 1 + .../ai/djl/translate/TranslatorFactory.java | 1 + .../java/ai/djl/util/ClassLoaderUtils.java | 5 +-- .../main/java/ai/djl/util/Float16Utils.java | 1 + .../java/ai/djl/util/JsonSerializable.java | 1 + .../main/java/ai/djl/util/NativeResource.java | 1 + api/src/main/java/ai/djl/util/Platform.java | 1 + api/src/main/java/ai/djl/util/Utils.java | 4 ++- .../main/java/ai/djl/util/cuda/CudaUtils.java | 7 ++-- .../util/passthrough/PassthroughNDArray.java | 1 + .../passthrough/PassthroughNDManager.java | 1 + api/src/test/java/ai/djl/DeviceTest.java | 1 + .../test/java/ai/djl/metric/MetricsTest.java | 5 +-- .../java/ai/djl/modality/InputOutputTest.java | 4 ++- .../embedding/TrainableWordEmbeddingTest.java | 8 +++-- .../nlp/preprocess/HyphenNormalizerTest.java | 3 +- .../preprocess/LowerCaseConverterTest.java | 3 +- .../preprocess/PunctuationSeparatorTest.java | 5 +-- .../nlp/preprocess/SimpleTokenizerTest.java | 3 +- .../nlp/preprocess/TextEndpointTokenTest.java | 5 +-- .../nlp/preprocess/TextTruncatorTest.java | 3 +- .../nlp/preprocess/UnicodeNormalizerTest.java | 3 +- .../test/java/ai/djl/ndarray/NDListTest.java | 6 ++-- .../java/ai/djl/ndarray/NDSerializerTest.java | 6 ++-- .../ai/djl/ndarray/internal/NDFormatTest.java | 1 + .../ai/djl/nn/convolutional/Conv1dTest.java | 4 ++- .../nn/convolutional/Conv1dTransposeTest.java | 4 ++- .../ai/djl/nn/convolutional/Conv2dTest.java | 4 ++- .../nn/convolutional/Conv2dTransposeTest.java | 4 ++- .../ai/djl/nn/convolutional/Conv3dTest.java | 4 ++- .../djl/nn/convolutional/OutputShapeTest.java | 1 + .../ai/djl/nn/norm/GhostBatchNormTest.java | 1 + .../ai/djl/repository/DjlRepositoryTest.java | 4 ++- .../ai/djl/repository/JarRepositoryTest.java | 6 ++-- .../ai/djl/training/LearningRateTest.java | 1 + .../djl/training/util/MinMaxScalerTest.java | 1 + .../djl/translate/ServingTranslatorTest.java | 8 +++-- .../test/java/ai/djl/util/PairListTest.java | 5 +-- .../test/java/ai/djl/util/PlatformTest.java | 7 ++-- api/src/test/java/ai/djl/util/UtilsTest.java | 9 +++--- .../java/ai/djl/util/cuda/CudaUtilsTest.java | 8 +++-- .../java/ai/djl/basicdataset/RawDataset.java | 1 + .../djl/basicdataset/cv/BananaDetection.java | 2 ++ .../ai/djl/basicdataset/cv/CocoDetection.java | 1 + .../ai/djl/basicdataset/cv/CocoMetadata.java | 1 + .../ai/djl/basicdataset/cv/CocoUtils.java | 1 + .../ai/djl/basicdataset/cv/ImageDataset.java | 1 + .../cv/ObjectDetectionDataset.java | 1 + .../djl/basicdataset/cv/PikachuDetection.java | 2 ++ .../classification/AbstractImageFolder.java | 6 ++-- .../cv/classification/CaptchaDataset.java | 1 + .../cv/classification/Cifar10.java | 1 + .../cv/classification/FashionMnist.java | 1 + .../ImageClassificationDataset.java | 1 + .../cv/classification/ImageFolder.java | 1 + .../cv/classification/ImageNet.java | 1 + .../basicdataset/cv/classification/Mnist.java | 1 + .../ai/djl/basicdataset/nlp/AmazonReview.java | 4 ++- .../nlp/CookingStackExchange.java | 1 + .../ai/djl/basicdataset/nlp/GoEmotions.java | 8 +++-- .../basicdataset/nlp/PennTreebankText.java | 1 + .../basicdataset/nlp/StanfordMovieReview.java | 1 + .../nlp/StanfordQuestionAnsweringDataset.java | 2 ++ .../nlp/TatoebaEnglishFrenchDataset.java | 1 + .../ai/djl/basicdataset/nlp/TextDataset.java | 1 + .../nlp/UniversalDependenciesEnglishEWT.java | 5 ++- .../ai/djl/basicdataset/nlp/WikiText2.java | 1 + .../tabular/AirfoilRandomAccess.java | 4 ++- .../tabular/AmesRandomAccess.java | 4 ++- .../djl/basicdataset/tabular/CsvDataset.java | 8 +++-- .../tabular/DailyDelhiClimate.java | 4 ++- .../basicdataset/tabular/MovieLens100k.java | 8 +++-- .../basicdataset/tabular/TabularDataset.java | 1 + .../utils/FixedBucketSampler.java | 6 ++-- .../ai/djl/basicdataset/utils/TextData.java | 1 + .../basicdataset/AirfoilRandomAccessTest.java | 4 ++- .../djl/basicdataset/AmazonReviewsTest.java | 4 ++- .../basicdataset/AmesRandomAccessTest.java | 4 ++- .../java/ai/djl/basicdataset/BananaTest.java | 4 ++- .../java/ai/djl/basicdataset/CaptchaTest.java | 4 ++- .../java/ai/djl/basicdataset/Cifar10Test.java | 4 ++- .../java/ai/djl/basicdataset/CocoTest.java | 4 ++- .../djl/basicdataset/CookingExchangeTest.java | 6 ++-- .../basicdataset/DailyDelhiClimateTest.java | 4 ++- .../ai/djl/basicdataset/DatasetUtilsTest.java | 4 ++- .../ai/djl/basicdataset/FashionMnistTest.java | 4 ++- .../basicdataset/FixedBucketSamplerTest.java | 6 ++-- .../ai/djl/basicdataset/GoEmotionsTest.java | 4 ++- .../ai/djl/basicdataset/ImageFolderTest.java | 6 ++-- .../ai/djl/basicdataset/ImageNetTest.java | 4 ++- .../java/ai/djl/basicdataset/MnistTest.java | 4 ++- .../djl/basicdataset/MovieLens100kTest.java | 4 ++- .../basicdataset/PennTreebankTextTest.java | 4 ++- .../java/ai/djl/basicdataset/PikachuTest.java | 6 ++-- .../basicdataset/RandomAccessDatasetTest.java | 4 ++- .../basicdataset/StanfordMovieReviewTest.java | 4 ++- .../StanfordQuestionAnsweringDatasetTest.java | 6 ++-- .../TatoebaEnglishFrenchDatasetTest.java | 4 ++- .../java/ai/djl/basicdataset/TestUtils.java | 1 + .../UniversalDependenciesEnglishEWTTest.java | 6 ++-- .../ai/djl/basicdataset/WikiText2Test.java | 6 ++-- .../src/main/java/ai/djl/zero/RequireZoo.java | 31 ++++++++++-------- .../ai/djl/zero/cv/ImageClassification.java | 1 + .../djl/zero/cv/ImageClassificationTest.java | 4 ++- .../main/java/ai/djl/dlr/engine/DlrModel.java | 1 + .../java/ai/djl/dlr/engine/DlrNDArray.java | 1 + .../java/ai/djl/dlr/engine/DlrNDManager.java | 1 + .../ai/djl/dlr/engine/DlrSymbolBlock.java | 1 + .../main/java/ai/djl/dlr/jni/LibUtils.java | 6 ++-- .../main/java/ai/djl/dlr/zoo/DlrModelZoo.java | 1 + .../ai/djl/dlr/engine/DlrNDManagerTest.java | 4 ++- .../java/ai/djl/dlr/integration/DlrTest.java | 6 ++-- .../java/ai/djl/ml/xgboost/XgbEngine.java | 4 ++- .../main/java/ai/djl/ml/xgboost/XgbModel.java | 4 ++- .../java/ai/djl/ml/xgboost/XgbNDArray.java | 4 ++- .../java/ai/djl/ml/xgboost/XgbNDManager.java | 7 ++-- .../ai/djl/ml/xgboost/XgbSymbolBlock.java | 4 ++- .../java/ml/dmlc/xgboost4j/java/JniUtils.java | 2 ++ .../java/ai/djl/ml/xgboost/XgbModelTest.java | 8 +++-- .../ai/djl/mxnet/jnarator/AntlrUtils.java | 6 ++-- .../java/ai/djl/mxnet/jnarator/DataType.java | 6 ++-- .../java/ai/djl/mxnet/jnarator/FuncInfo.java | 1 + .../ai/djl/mxnet/jnarator/JnaGenerator.java | 6 ++-- .../java/ai/djl/mxnet/jnarator/JnaParser.java | 14 ++++---- .../main/java/ai/djl/mxnet/jnarator/Main.java | 15 +++++---- .../java/ai/djl/mxnet/jnarator/Parameter.java | 4 ++- .../ai/djl/mxnet/jnarator/TypeDefine.java | 1 + .../java/ai/djl/mxnet/engine/CachedOp.java | 7 ++-- .../java/ai/djl/mxnet/engine/MxDataType.java | 1 + .../java/ai/djl/mxnet/engine/MxEngine.java | 1 + .../java/ai/djl/mxnet/engine/MxModel.java | 6 ++-- .../java/ai/djl/mxnet/engine/MxNDArray.java | 2 ++ .../java/ai/djl/mxnet/engine/MxNDArrayEx.java | 10 ++++-- .../ai/djl/mxnet/engine/MxNDArrayIndexer.java | 1 + .../java/ai/djl/mxnet/engine/MxNDManager.java | 2 ++ .../djl/mxnet/engine/MxParameterServer.java | 2 ++ .../ai/djl/mxnet/engine/MxSymbolBlock.java | 6 ++-- .../main/java/ai/djl/mxnet/engine/Symbol.java | 2 ++ .../java/ai/djl/mxnet/jna/FunctionInfo.java | 8 +++-- .../main/java/ai/djl/mxnet/jna/JnaUtils.java | 2 ++ .../main/java/ai/djl/mxnet/jna/LibUtils.java | 7 ++-- .../java/ai/djl/mxnet/jna/NativeString.java | 1 + .../java/ai/djl/mxnet/jna/StringArray.java | 1 + .../MxBackendOptimizationTest.java | 1 + .../djl/mxnet/integration/MxCoverageTest.java | 4 ++- .../MxGradientCollectorIntegrationTest.java | 1 + .../integration/MxParameterStoreTest.java | 1 + .../java/ai/djl/mxnet/zoo/MxModelZoo.java | 1 + .../GloveWordEmbeddingBlockFactory.java | 1 + .../GloveWordEmbeddingTranslatorFactory.java | 1 + .../utils/BuildModelZooWordEmbedding.java | 1 + .../mxnet/zoo/nlp/qa/MxBertQATranslator.java | 2 ++ .../zoo/nlp/qa/MxBertQATranslatorFactory.java | 1 + .../integration/MxModelZooCoverageTest.java | 4 ++- .../mxnet/integration/MxSymbolBlockTest.java | 9 +++--- .../modality/nlp/WordEmbeddingTest.java | 6 ++-- .../ai/djl/onnxruntime/engine/OrtModel.java | 1 + .../ai/djl/onnxruntime/engine/OrtNDArray.java | 1 + .../djl/onnxruntime/engine/OrtNDManager.java | 1 + .../onnxruntime/engine/OrtSymbolBlock.java | 1 + .../ai/djl/onnxruntime/engine/OrtUtils.java | 4 ++- .../ai/djl/onnxruntime/zoo/OrtModelZoo.java | 1 + .../IrisClassificationTranslatorFactory.java | 1 + .../ai/djl/onnxruntime/engine/OrtTest.java | 8 +++-- .../djl/paddlepaddle/engine/PpDataType.java | 1 + .../ai/djl/paddlepaddle/engine/PpEngine.java | 1 + .../ai/djl/paddlepaddle/engine/PpModel.java | 1 + .../ai/djl/paddlepaddle/engine/PpNDArray.java | 2 ++ .../djl/paddlepaddle/engine/PpNDManager.java | 1 + .../paddlepaddle/engine/PpSymbolBlock.java | 1 + .../ai/djl/paddlepaddle/jni/JniUtils.java | 1 + .../ai/djl/paddlepaddle/jni/LibUtils.java | 6 ++-- .../ai/djl/paddlepaddle/jni/JniUtilsTest.java | 1 + .../ai/djl/paddlepaddle/jni/PpEngineTest.java | 1 + .../ai/djl/paddlepaddle/zoo/PpModelZoo.java | 1 + ...pImageClassificationTranslatorFactory.java | 1 + .../PpWordRotateTranslator.java | 1 + .../PpWordRotateTranslatorFactory.java | 1 + .../zoo/cv/objectdetection/BoundFinder.java | 4 +-- .../PpFaceDetectionTranslator.java | 1 + .../PpFaceDetectionTranslatorFactory.java | 1 + .../PpWordDetectionTranslator.java | 4 +-- .../PpWordDetectionTranslatorFactory.java | 1 + .../PpWordRecognitionTranslator.java | 1 + .../PpWordRecognitionTranslatorFactory.java | 1 + .../paddlepaddle/zoo/MaskDetectionTest.java | 6 ++-- .../java/ai/djl/paddlepaddle/zoo/OCRTest.java | 4 ++- .../java/ai/djl/pytorch/engine/PtEngine.java | 6 ++-- .../java/ai/djl/pytorch/engine/PtModel.java | 1 + .../java/ai/djl/pytorch/engine/PtNDArray.java | 4 ++- .../ai/djl/pytorch/engine/PtNDArrayEx.java | 1 + .../djl/pytorch/engine/PtNDArrayIndexer.java | 1 + .../ai/djl/pytorch/engine/PtNDManager.java | 1 + .../ai/djl/pytorch/engine/PtSymbolBlock.java | 6 ++-- .../main/java/ai/djl/pytorch/jni/IValue.java | 1 + .../java/ai/djl/pytorch/jni/IValueUtils.java | 1 + .../java/ai/djl/pytorch/jni/JniUtils.java | 6 ++-- .../java/ai/djl/pytorch/jni/LibUtils.java | 6 ++-- .../djl/pytorch/integration/IValueTest.java | 6 ++-- .../djl/pytorch/integration/LibUtilsTest.java | 1 + .../djl/pytorch/integration/MkldnnTest.java | 4 ++- .../djl/pytorch/integration/ProfilerTest.java | 6 ++-- .../djl/pytorch/integration/PtModelTest.java | 6 ++-- .../pytorch/integration/TorchScriptTest.java | 6 ++-- .../ai/djl/pytorch/jni/IValueUtilsTest.java | 4 ++- .../java/ai/djl/pytorch/zoo/PtModelZoo.java | 1 + .../cv/objectdetection/PtSsdTranslator.java | 1 + .../PtSsdTranslatorFactory.java | 1 + .../zoo/nlp/qa/PtBertQATranslator.java | 1 + .../zoo/nlp/qa/PtBertQATranslatorFactory.java | 1 + .../PtDistilBertTranslator.java | 1 + .../PtDistilBertTranslatorFactory.java | 1 + .../tensorflow/engine/SavedModelBundle.java | 3 +- .../ai/djl/tensorflow/engine/TfDataType.java | 1 + .../ai/djl/tensorflow/engine/TfEngine.java | 13 +++++--- .../ai/djl/tensorflow/engine/TfModel.java | 7 ++-- .../ai/djl/tensorflow/engine/TfNDArray.java | 6 ++-- .../ai/djl/tensorflow/engine/TfNDArrayEx.java | 4 ++- .../ai/djl/tensorflow/engine/TfNDManager.java | 8 +++-- .../djl/tensorflow/engine/TfOpExecutor.java | 8 +++-- .../djl/tensorflow/engine/TfSymbolBlock.java | 32 +++++++++---------- .../engine/javacpp/JavacppUtils.java | 15 +++++---- .../tensorflow/engine/javacpp/LibUtils.java | 6 ++-- .../tensorflow/engine/TfNDManagerTest.java | 6 ++-- .../integration/TfCoverageTest.java | 4 ++- .../ai/djl/tensorflow/zoo/TfModelZoo.java | 1 + .../cv/objectdetction/TfSsdTranslator.java | 1 + .../TfSsdTranslatorFactory.java | 1 + .../modality/cv/MobileNetTest.java | 6 ++-- .../integration/modality/cv/ResNetTest.java | 6 ++-- .../integration/modality/cv/TfSsdTest.java | 9 +++--- .../ai/djl/tensorrt/engine/TrtEngine.java | 1 + .../java/ai/djl/tensorrt/engine/TrtModel.java | 1 + .../ai/djl/tensorrt/engine/TrtNDArray.java | 1 + .../ai/djl/tensorrt/engine/TrtNDManager.java | 1 + .../ai/djl/tensorrt/engine/TrtSession.java | 6 ++-- .../djl/tensorrt/engine/TrtSymbolBlock.java | 1 + .../java/ai/djl/tensorrt/jni/JniUtils.java | 6 ++-- .../java/ai/djl/tensorrt/jni/LibUtils.java | 6 ++-- .../ai/djl/tensorrt/engine/TrtEngineTest.java | 1 + .../djl/tensorrt/engine/TrtNDManagerTest.java | 1 + .../ai/djl/tensorrt/integration/TrtTest.java | 8 +++-- .../java/ai/djl/tflite/engine/LibUtils.java | 6 ++-- .../ai/djl/tflite/engine/TfLiteDataType.java | 1 + .../ai/djl/tflite/engine/TfLiteModel.java | 4 ++- .../ai/djl/tflite/engine/TfLiteNDArray.java | 4 ++- .../ai/djl/tflite/engine/TfLiteNDManager.java | 4 ++- .../djl/tflite/engine/TfLiteSymbolBlock.java | 4 ++- .../ai/djl/tflite/zoo/TfLiteModelZoo.java | 1 + .../java/org/tensorflow/lite/Interpreter.java | 12 +++---- .../lite/NativeInterpreterWrapper.java | 19 ++++++----- .../main/java/org/tensorflow/lite/Tensor.java | 13 ++++---- .../tflite/engine/TfLiteNDManagerTest.java | 1 + .../java/ai/djl/tflite/engine/TfLiteTest.java | 6 ++-- .../examples/inference/ActionRecognition.java | 6 ++-- .../inference/BertClassification.java | 9 +++--- .../examples/inference/BertQaInference.java | 4 ++- .../ai/djl/examples/inference/BigGAN.java | 6 ++-- .../inference/ImageClassification.java | 6 ++-- .../inference/InstanceSegmentation.java | 6 ++-- .../ai/djl/examples/inference/ListModels.java | 6 ++-- .../examples/inference/ObjectDetection.java | 6 ++-- ...jectDetectionWithTensorflowSavedModel.java | 7 ++-- .../examples/inference/PoseEstimation.java | 6 ++-- .../examples/inference/SentimentAnalysis.java | 4 ++- .../djl/examples/inference/StyleTransfer.java | 6 ++-- .../inference/UniversalSentenceEncoder.java | 6 ++-- .../face/FaceDetectionTranslator.java | 1 + .../inference/face/FeatureComparison.java | 6 ++-- .../inference/face/FeatureExtraction.java | 6 ++-- .../inference/face/LightFaceDetection.java | 6 ++-- .../inference/face/RetinaFaceDetection.java | 6 ++-- .../inference/sr/SuperResolution.java | 6 ++-- .../ai/djl/examples/training/TicTacToe.java | 1 + .../examples/training/TrainBertOnCode.java | 1 + .../djl/examples/training/TrainCaptcha.java | 1 + .../ai/djl/examples/training/TrainMnist.java | 1 + .../examples/training/TrainMnistWithLSTM.java | 1 + .../djl/examples/training/TrainPikachu.java | 1 + .../training/TrainSentimentAnalysis.java | 1 + .../djl/examples/training/TrainSeq2Seq.java | 1 + .../djl/examples/training/TrainTicTacToe.java | 6 ++-- .../djl/examples/training/TrainWithHpo.java | 6 ++-- .../training/TrainWithOptimizers.java | 8 +++-- .../TrainAmazonReviewRanking.java | 4 ++- .../TrainResnetWithCifar10.java | 6 ++-- .../djl/examples/training/util/Arguments.java | 10 ++++-- .../training/util/BertCodeDataset.java | 13 +++----- .../inference/ActionRecognitionTest.java | 4 ++- .../ai/djl/examples/inference/BertQaTest.java | 4 ++- .../ai/djl/examples/inference/BigGANTest.java | 4 ++- .../inference/FeatureComparisonTest.java | 6 ++-- .../inference/FeatureExtractionTest.java | 6 ++-- .../inference/InstanceSegmentationTest.java | 4 ++- .../inference/LightFaceDetectionTest.java | 6 ++-- .../examples/inference/ListModelsTest.java | 8 +++-- .../inference/ObjectDetectionTest.java | 8 +++-- ...DetectionWithTensorflowSavedModelTest.java | 6 ++-- .../inference/PoseEstimationTest.java | 4 ++- .../inference/RetinaFaceDetectionTest.java | 6 ++-- .../inference/SentimentAnalysisTest.java | 4 ++- .../examples/inference/StyleTransferTest.java | 6 ++-- .../inference/SuperResolutionTest.java | 6 ++-- .../UniversalSentenceEncoderTest.java | 6 ++-- .../training/TrainAmazonReviewTest.java | 4 ++- .../djl/examples/training/TrainBertTest.java | 4 ++- .../examples/training/TrainCaptchaTest.java | 4 ++- .../djl/examples/training/TrainMnistTest.java | 4 ++- .../training/TrainMnistWithLSTMTest.java | 4 ++- .../examples/training/TrainPikachuTest.java | 4 ++- .../examples/training/TrainResNetTest.java | 4 ++- .../training/TrainSentimentAnalysisTest.java | 4 ++- .../examples/training/TrainSeq2SeqTest.java | 4 ++- .../examples/training/TrainTicTacToeTest.java | 4 ++- .../java/ai/djl/testing/TestRequirements.java | 4 ++- .../java/ai/djl/audio/dataset/AudioData.java | 12 ++++--- .../ai/djl/audio/dataset/Librispeech.java | 1 + .../dataset/SpeechRecognitionDataset.java | 1 + .../djl/audio/processor/LinearSpecgram.java | 1 + .../ai/djl/audio/dataset/LibrispeechTest.java | 4 ++- .../audio/processor/AudioProcessorTest.java | 8 +++-- .../main/java/ai/djl/aws/s3/S3Repository.java | 19 ++++++----- .../ai/djl/aws/s3/S3RepositoryFactory.java | 4 ++- .../java/ai/djl/aws/sagemaker/SageMaker.java | 28 +++++++++------- .../djl/aws/s3/S3RepositoryFactoryTest.java | 4 ++- .../java/ai/djl/aws/s3/S3RepositoryTest.java | 7 ++-- .../ai/djl/aws/sagemaker/SageMakerTest.java | 16 ++++++---- .../ai/djl/benchmark/AbstractBenchmark.java | 8 +++-- .../main/java/ai/djl/benchmark/Arguments.java | 19 ++++++----- .../main/java/ai/djl/benchmark/Benchmark.java | 6 ++-- .../djl/benchmark/MultithreadedBenchmark.java | 6 ++-- .../ai/djl/benchmark/NDListGenerator.java | 16 ++++++---- .../java/ai/djl/benchmark/BenchmarkTest.java | 8 +++-- .../java/ai/djl/fasttext/FtAbstractBlock.java | 1 + .../main/java/ai/djl/fasttext/FtModel.java | 1 + .../ai/djl/fasttext/FtTrainingConfig.java | 1 + .../java/ai/djl/fasttext/TrainFastText.java | 1 + .../java/ai/djl/fasttext/jni/FtWrapper.java | 1 + .../java/ai/djl/fasttext/jni/LibUtils.java | 6 ++-- .../java/ai/djl/fasttext/zoo/FtModelZoo.java | 1 + .../FtTextClassification.java | 1 + .../TextClassificationModelLoader.java | 1 + .../fasttext/CookingStackExchangeTest.java | 13 +++++--- .../ai/djl/hadoop/hdfs/HdfsRepository.java | 12 ++++--- .../hadoop/hdfs/HdfsRepositoryFactory.java | 4 ++- .../hdfs/HdfsRepositoryFactoryTest.java | 4 ++- .../djl/hadoop/hdfs/HdfsRepositoryTest.java | 12 ++++--- .../main/java/ai/djl/opencv/OpenCVImage.java | 22 +++++++------ .../ai/djl/opencv/OpenCVImageFactory.java | 9 ++++-- .../ai/djl/opencv/OpenCVImageFactoryTest.java | 6 ++-- .../ai/djl/sentencepiece/SpTextEmbedding.java | 1 + .../ai/djl/sentencepiece/SpTokenizer.java | 1 + .../ai/djl/sentencepiece/jni/LibUtils.java | 6 ++-- .../sentencepiece/SpTextEmbeddingTest.java | 8 +++-- .../ai/djl/sentencepiece/SpTokenizerTest.java | 8 +++-- .../djl/sentencepiece/SpVocabularyTest.java | 8 +++-- .../java/ai/djl/tablesaw/TablesawDataset.java | 6 ++-- .../ai/djl/tablesaw/TablesawDatasetTest.java | 7 ++-- .../tokenizers/HuggingFaceTokenizer.java | 1 + .../huggingface/tokenizers/jni/LibUtils.java | 6 ++-- .../tokenizers/HuggingFaceTokenizerTest.java | 6 ++-- .../ai/djl/integration/IntegrationTest.java | 28 ++++++++-------- .../tests/inference/PredictorTest.java | 1 + .../modality/cv/BufferedImageFactoryTest.java | 4 ++- .../modality/cv/MultiBoxDetectionTest.java | 1 + .../tests/modality/cv/MultiBoxPriorTest.java | 6 ++-- .../tests/modality/cv/MultiBoxTargetTest.java | 1 + .../tests/modality/cv/NDImageUtilsTest.java | 1 + .../modality/cv/SingleShotDetectionTest.java | 6 ++-- .../modality/nlp/SimpleTextEncoderTest.java | 4 ++- .../tests/model_zoo/CustomTranslatorTest.java | 11 ++++--- .../model_zoo/ImperativeModelZooTest.java | 4 ++- .../tests/model_zoo/ModelZooTest.java | 8 +++-- .../model_zoo/classification/AlexNetTest.java | 6 ++-- .../classification/GoogLeNetTest.java | 6 ++-- .../model_zoo/classification/LeNetTest.java | 6 ++-- .../model_zoo/classification/NiNTest.java | 6 ++-- .../model_zoo/classification/ResnetTest.java | 4 ++- .../classification/SqueezenetTest.java | 1 + .../model_zoo/classification/VGGTest.java | 6 ++-- .../SingleShotDetectionTest.java | 6 ++-- .../tests/ndarray/NDArrayAttachmentTest.java | 1 + .../tests/ndarray/NDArrayCreationOpTest.java | 6 ++-- .../NDArrayElementArithmeticOpTest.java | 6 ++-- .../NDArrayElementComparisonOpTest.java | 1 + .../tests/ndarray/NDArrayLogicalOpTest.java | 1 + .../tests/ndarray/NDArrayNumericOpTest.java | 4 ++- .../tests/ndarray/NDArrayOtherOpTest.java | 4 ++- .../tests/ndarray/NDArrayReductionOpTest.java | 1 + .../NDArrayShapesManipulationOpTest.java | 1 + .../tests/ndarray/NDIndexTest.java | 1 + .../integration/tests/ndarray/NDListTest.java | 1 + .../integration/tests/nn/BlockCoreTest.java | 6 ++-- .../tests/nn/BlockFactoryTest.java | 6 ++-- .../tests/nn/PoolingOperationsTest.java | 1 + .../ScaledDotProductAttentionBlockTest.java | 1 + .../tests/repository/RepositoryTest.java | 10 +++--- .../tests/training/ActivationTest.java | 1 + .../tests/training/BlocksTest.java | 1 + .../tests/training/DatasetTest.java | 6 ++-- .../tests/training/EvaluateDatasetTest.java | 4 ++- .../tests/training/EvaluatorTest.java | 1 + .../GradientCollectorIntegrationTest.java | 4 ++- .../integration/tests/training/LossTest.java | 1 + .../integration/tests/training/ModelTest.java | 6 ++-- .../tests/training/OptimizerTest.java | 4 +-- .../tests/training/WeightDecayTest.java | 1 + .../translate/PaddingStackBatchifierTest.java | 1 + .../tests/translate/StackBatchifierTest.java | 4 ++- .../integration/util/DebugEnvironment.java | 1 + .../ai/djl/integration/util/TestUtils.java | 1 + .../src/test/java/ai/djl/CoverageTest.java | 4 ++- .../ai/djl/integration/IntegrationTests.java | 1 + .../ai/djl/basicmodelzoo/BasicModelZoo.java | 1 + .../java/ai/djl/basicmodelzoo/basic/Mlp.java | 1 + .../basicmodelzoo/basic/MlpBlockFactory.java | 5 ++- .../cv/classification/GoogLeNet.java | 1 + .../cv/classification/ResNetV1.java | 1 + .../cv/classification/ResnetBlockFactory.java | 5 ++- .../cv/classification/SqueezeNet.java | 1 + .../ssd/SingleShotDetection.java | 1 + .../object_detection/ssd/SsdBlockFactory.java | 21 ++++++------ .../main/java/ai/djl/testing/Assertions.java | 1 + .../java/ai/djl/testing/CoverageUtils.java | 1 + .../java/ai/djl/testing/TestRequirements.java | 4 ++- tools/conf/checkstyle.xml | 2 +- tools/gradle/java-formatter.gradle | 14 ++------ 587 files changed, 1518 insertions(+), 673 deletions(-) diff --git a/api/src/main/java/ai/djl/BaseModel.java b/api/src/main/java/ai/djl/BaseModel.java index 43233a0d2690..982b2ef8cd72 100644 --- 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 index a360ba1e59c5..ce9b29ae5ba9 100644 --- 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 index 30f1ab53e01d..95b9866d987d 100644 --- 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 index e99d6367bf7a..69cdd7c7ecd0 100644 --- 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 index 1e234bf74c3e..fb5663602f45 100644 --- 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 index 3a2923d34384..b3c172ce8b35 100644 --- 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 index 379da2a07ab6..ba87736e7eb6 100644 --- 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 index 472f530705ab..4fb28bfe0b98 100644 --- 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 index e9af175cec0b..a39e575c3137 100644 --- 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 index 3053d85ddd29..6e93aba69611 100644 --- 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 index dbc1e3985c97..5e73d7ae6788 100644 --- 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 index a360874e6bbb..03275566abe4 100644 --- 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 index 6f75da348e83..236a3b3e14ca 100644 --- 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 index 56d630917786..a0352ff8b37e 100644 --- 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 index 1c5ca0727902..e2319dbcd170 100644 --- 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 index feb98f5a3a58..866ba830fef9 100644 --- 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 index 87357b4b08a3..a963e856fc5a 100644 --- 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 index f4034b681a20..a33c54ec6b3f 100644 --- 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 index b7db568769f7..efd05d7be269 100644 --- 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 index 51d5dbe93104..613a098322cf 100644 --- 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 index 84821362aea0..b0f21bb69f25 100644 --- 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 index 46a9c7f173ca..3cd2dac1aa7b 100644 --- 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 index db00b3f0c613..697c889aafa6 100644 --- 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 index 3c6711548401..ad2bd9b6fa35 100644 --- 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 index 1f01cf825b24..40b24f26eb8d 100644 --- 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 index 3c2b4b425678..aeb874737763 100644 --- 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 index 55ce7859d8c6..68af21ff8c1a 100644 --- 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 index 2644a5be44d4..6cb411158b30 100644 --- 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 index 97288bffda8a..9b57a2f3111f 100644 --- 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 index c6b3a2481cc1..a4ebfcb9df1a 100644 --- 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 index 2835511cd414..da26aae6b346 100644 --- 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 index 0718d9b4115e..b3c9b9a42446 100644 --- 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 index e23403652165..1ed0698c0887 100644 --- 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 index aa7177a13d96..bf6b06a76c32 100644 --- 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 index e6dd38fedf3f..e80816669504 100644 --- 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; diff --git a/api/src/main/java/ai/djl/modality/nlp/DefaultVocabulary.java b/api/src/main/java/ai/djl/modality/nlp/DefaultVocabulary.java index 19801565d6df..6f8ac5eaf59d 100644 --- a/api/src/main/java/ai/djl/modality/nlp/DefaultVocabulary.java +++ b/api/src/main/java/ai/djl/modality/nlp/DefaultVocabulary.java @@ -13,6 +13,7 @@ package ai.djl.modality.nlp; import ai.djl.util.Utils; + import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -121,8 +122,7 @@ private boolean pruneTokens(int minFrequency, int maxSize) { // Prune number of tokens to maxSize if (maxSize > 0 && tokens.size() > maxSize) { - tokens.entrySet() - .stream() + tokens.entrySet().stream() .sorted( Map.Entry.comparingByValue( Comparator.comparingInt( @@ -155,8 +155,7 @@ private void initializeIndexToTokenKeepingIndices() { */ private void initializeIndexToTokenReplacingIndices() { indexToToken = - tokens.entrySet() - .stream() + tokens.entrySet().stream() .sorted(Comparator.comparingLong(token -> token.getValue().index)) .map(Entry::getKey) .collect(Collectors.toList()); @@ -192,7 +191,8 @@ public long getIndex(String token) { } throw new IllegalStateException( - "Unexpected token in getIndex. Define an unknownToken for the vocabulary to enable support for unknown tokens."); + "Unexpected token in getIndex. Define an unknownToken for the vocabulary to enable" + + " support for unknown tokens."); } /** {@inheritDoc} */ @@ -355,7 +355,8 @@ public Builder addFromCustomizedFile(URL url, Function> lambda public DefaultVocabulary build() { if (maxTokens > 0 && maxTokens < reservedTokens.size()) { throw new IllegalArgumentException( - "The vocabulary maxTokens can not be smaller than the number of reserved tokens"); + "The vocabulary maxTokens can not be smaller than the number of reserved" + + " tokens"); } return new DefaultVocabulary(this); } diff --git a/api/src/main/java/ai/djl/modality/nlp/Encoder.java b/api/src/main/java/ai/djl/modality/nlp/Encoder.java index e3b1631322fc..4c5a44693882 100644 --- a/api/src/main/java/ai/djl/modality/nlp/Encoder.java +++ b/api/src/main/java/ai/djl/modality/nlp/Encoder.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; diff --git a/api/src/main/java/ai/djl/modality/nlp/EncoderDecoder.java b/api/src/main/java/ai/djl/modality/nlp/EncoderDecoder.java index a7c47380a9dc..58cc67867c75 100644 --- a/api/src/main/java/ai/djl/modality/nlp/EncoderDecoder.java +++ b/api/src/main/java/ai/djl/modality/nlp/EncoderDecoder.java @@ -20,6 +20,7 @@ import ai.djl.nn.AbstractBlock; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/api/src/main/java/ai/djl/modality/nlp/bert/BertFullTokenizer.java b/api/src/main/java/ai/djl/modality/nlp/bert/BertFullTokenizer.java index 4ef050a44411..0e7c28490d04 100644 --- a/api/src/main/java/ai/djl/modality/nlp/bert/BertFullTokenizer.java +++ b/api/src/main/java/ai/djl/modality/nlp/bert/BertFullTokenizer.java @@ -21,6 +21,7 @@ import ai.djl.modality.nlp.preprocess.TextCleaner; import ai.djl.modality.nlp.preprocess.TextProcessor; import ai.djl.modality.nlp.preprocess.UnicodeNormalizer; + import java.text.Normalizer; import java.util.ArrayList; import java.util.Collections; diff --git a/api/src/main/java/ai/djl/modality/nlp/bert/BertTokenizer.java b/api/src/main/java/ai/djl/modality/nlp/bert/BertTokenizer.java index 7789cc29a9d5..5ec1ab638dec 100644 --- a/api/src/main/java/ai/djl/modality/nlp/bert/BertTokenizer.java +++ b/api/src/main/java/ai/djl/modality/nlp/bert/BertTokenizer.java @@ -13,6 +13,7 @@ package ai.djl.modality.nlp.bert; import ai.djl.modality.nlp.preprocess.SimpleTokenizer; + import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; diff --git a/api/src/main/java/ai/djl/modality/nlp/bert/WordpieceTokenizer.java b/api/src/main/java/ai/djl/modality/nlp/bert/WordpieceTokenizer.java index 67893c329d83..dc40cbf8748c 100644 --- a/api/src/main/java/ai/djl/modality/nlp/bert/WordpieceTokenizer.java +++ b/api/src/main/java/ai/djl/modality/nlp/bert/WordpieceTokenizer.java @@ -14,6 +14,7 @@ import ai.djl.modality.nlp.Vocabulary; import ai.djl.modality.nlp.preprocess.SimpleTokenizer; + import java.util.ArrayList; import java.util.List; diff --git a/api/src/main/java/ai/djl/modality/nlp/embedding/ModelZooTextEmbedding.java b/api/src/main/java/ai/djl/modality/nlp/embedding/ModelZooTextEmbedding.java index 647a1c991036..5d3e89ac13a5 100644 --- a/api/src/main/java/ai/djl/modality/nlp/embedding/ModelZooTextEmbedding.java +++ b/api/src/main/java/ai/djl/modality/nlp/embedding/ModelZooTextEmbedding.java @@ -21,6 +21,7 @@ import ai.djl.translate.Batchifier; import ai.djl.translate.NoopTranslator; import ai.djl.translate.TranslateException; + import java.util.List; /** A {@link WordEmbedding} using a {@link ZooModel}. */ diff --git a/api/src/main/java/ai/djl/modality/nlp/embedding/SimpleTextEmbedding.java b/api/src/main/java/ai/djl/modality/nlp/embedding/SimpleTextEmbedding.java index f69f0e9d7f42..d5e836f59671 100644 --- a/api/src/main/java/ai/djl/modality/nlp/embedding/SimpleTextEmbedding.java +++ b/api/src/main/java/ai/djl/modality/nlp/embedding/SimpleTextEmbedding.java @@ -15,6 +15,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDArrays; import ai.djl.ndarray.NDList; + import java.util.ArrayList; import java.util.List; diff --git a/api/src/main/java/ai/djl/modality/nlp/embedding/TextEmbedding.java b/api/src/main/java/ai/djl/modality/nlp/embedding/TextEmbedding.java index a5597bbb90bf..e8696db2ed60 100644 --- a/api/src/main/java/ai/djl/modality/nlp/embedding/TextEmbedding.java +++ b/api/src/main/java/ai/djl/modality/nlp/embedding/TextEmbedding.java @@ -14,6 +14,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDManager; + import java.util.List; /** diff --git a/api/src/main/java/ai/djl/modality/nlp/embedding/TrainableTextEmbedding.java b/api/src/main/java/ai/djl/modality/nlp/embedding/TrainableTextEmbedding.java index 5fcb4879bed2..af153cb0b235 100644 --- a/api/src/main/java/ai/djl/modality/nlp/embedding/TrainableTextEmbedding.java +++ b/api/src/main/java/ai/djl/modality/nlp/embedding/TrainableTextEmbedding.java @@ -20,6 +20,7 @@ import ai.djl.nn.AbstractBlock; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.util.ArrayList; import java.util.List; diff --git a/api/src/main/java/ai/djl/modality/nlp/embedding/TrainableWordEmbedding.java b/api/src/main/java/ai/djl/modality/nlp/embedding/TrainableWordEmbedding.java index d5995e65437c..8d4d6f3d539f 100644 --- a/api/src/main/java/ai/djl/modality/nlp/embedding/TrainableWordEmbedding.java +++ b/api/src/main/java/ai/djl/modality/nlp/embedding/TrainableWordEmbedding.java @@ -17,6 +17,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.types.SparseFormat; import ai.djl.nn.core.Embedding; + import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Optional; diff --git a/api/src/main/java/ai/djl/modality/nlp/translator/QATranslator.java b/api/src/main/java/ai/djl/modality/nlp/translator/QATranslator.java index 0524d06d1af3..ba3998e762eb 100644 --- a/api/src/main/java/ai/djl/modality/nlp/translator/QATranslator.java +++ b/api/src/main/java/ai/djl/modality/nlp/translator/QATranslator.java @@ -17,6 +17,7 @@ import ai.djl.translate.ArgumentsUtil; import ai.djl.translate.Batchifier; import ai.djl.translate.Translator; + import java.util.Locale; import java.util.Map; diff --git a/api/src/main/java/ai/djl/modality/nlp/translator/QaServingTranslator.java b/api/src/main/java/ai/djl/modality/nlp/translator/QaServingTranslator.java index c67c9ed7ecec..6f39dc93e4f5 100644 --- a/api/src/main/java/ai/djl/modality/nlp/translator/QaServingTranslator.java +++ b/api/src/main/java/ai/djl/modality/nlp/translator/QaServingTranslator.java @@ -23,6 +23,7 @@ import ai.djl.translate.TranslatorContext; import ai.djl.util.JsonUtils; import ai.djl.util.PairList; + import com.google.gson.JsonParseException; /** diff --git a/api/src/main/java/ai/djl/modality/nlp/translator/SimpleText2TextTranslator.java b/api/src/main/java/ai/djl/modality/nlp/translator/SimpleText2TextTranslator.java index 9194324bdea7..f956a674fb7f 100644 --- a/api/src/main/java/ai/djl/modality/nlp/translator/SimpleText2TextTranslator.java +++ b/api/src/main/java/ai/djl/modality/nlp/translator/SimpleText2TextTranslator.java @@ -33,6 +33,7 @@ import ai.djl.translate.PaddingStackBatchifier; import ai.djl.translate.Translator; import ai.djl.translate.TranslatorContext; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/api/src/main/java/ai/djl/modality/rl/ActionSpace.java b/api/src/main/java/ai/djl/modality/rl/ActionSpace.java index ea8c70946dd7..f183fec5fe3c 100644 --- a/api/src/main/java/ai/djl/modality/rl/ActionSpace.java +++ b/api/src/main/java/ai/djl/modality/rl/ActionSpace.java @@ -14,6 +14,7 @@ import ai.djl.ndarray.NDList; import ai.djl.util.RandomUtils; + import java.util.ArrayList; /** Contains the available actions that can be taken in an {@link ai.djl.modality.rl.env.RlEnv}. */ diff --git a/api/src/main/java/ai/djl/modality/rl/agent/QAgent.java b/api/src/main/java/ai/djl/modality/rl/agent/QAgent.java index eae9f4b9f003..65bb73e7f7aa 100644 --- a/api/src/main/java/ai/djl/modality/rl/agent/QAgent.java +++ b/api/src/main/java/ai/djl/modality/rl/agent/QAgent.java @@ -21,6 +21,7 @@ import ai.djl.training.Trainer; import ai.djl.training.listener.TrainingListener.BatchData; import ai.djl.translate.Batchifier; + import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/api/src/main/java/ai/djl/ndarray/BaseNDManager.java b/api/src/main/java/ai/djl/ndarray/BaseNDManager.java index 3fcae1f367e8..dd7bcaa46cb9 100644 --- a/api/src/main/java/ai/djl/ndarray/BaseNDManager.java +++ b/api/src/main/java/ai/djl/ndarray/BaseNDManager.java @@ -19,6 +19,10 @@ import ai.djl.util.Float16Utils; import ai.djl.util.PairList; import ai.djl.util.RandomUtils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.DoubleBuffer; @@ -31,8 +35,6 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** {@code BaseNDManager} is the default implementation of {@link NDManager}. */ public abstract class BaseNDManager implements NDManager { @@ -411,7 +413,8 @@ public static void validateBufferSize(Buffer buffer, DataType dataType, int expe } if (remaining > expectedSize) { logger.warn( - "Input buffer size is greater than the NDArray size, please set limit explicitly."); + "Input buffer size is greater than the NDArray size, please set limit" + + " explicitly."); buffer.limit(expectedSize); } } diff --git a/api/src/main/java/ai/djl/ndarray/BytesSupplierImpl.java b/api/src/main/java/ai/djl/ndarray/BytesSupplierImpl.java index 13406f220193..894c54762670 100644 --- a/api/src/main/java/ai/djl/ndarray/BytesSupplierImpl.java +++ b/api/src/main/java/ai/djl/ndarray/BytesSupplierImpl.java @@ -13,6 +13,7 @@ package ai.djl.ndarray; import ai.djl.util.JsonUtils; + import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/api/src/main/java/ai/djl/ndarray/NDArray.java b/api/src/main/java/ai/djl/ndarray/NDArray.java index 5c1ed1311954..da5439be7e1d 100644 --- a/api/src/main/java/ai/djl/ndarray/NDArray.java +++ b/api/src/main/java/ai/djl/ndarray/NDArray.java @@ -20,6 +20,7 @@ import ai.djl.ndarray.types.Shape; import ai.djl.ndarray.types.SparseFormat; import ai.djl.util.Float16Utils; + import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.DoubleBuffer; diff --git a/api/src/main/java/ai/djl/ndarray/NDArrayAdapter.java b/api/src/main/java/ai/djl/ndarray/NDArrayAdapter.java index 607fd85b7f05..0770bbeb5891 100644 --- a/api/src/main/java/ai/djl/ndarray/NDArrayAdapter.java +++ b/api/src/main/java/ai/djl/ndarray/NDArrayAdapter.java @@ -18,6 +18,7 @@ import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; import ai.djl.ndarray.types.SparseFormat; + import java.nio.Buffer; import java.nio.charset.Charset; import java.util.Arrays; diff --git a/api/src/main/java/ai/djl/ndarray/NDArrays.java b/api/src/main/java/ai/djl/ndarray/NDArrays.java index 1414e1977063..b73c20278dc1 100644 --- a/api/src/main/java/ai/djl/ndarray/NDArrays.java +++ b/api/src/main/java/ai/djl/ndarray/NDArrays.java @@ -14,6 +14,7 @@ import ai.djl.ndarray.types.Shape; import ai.djl.util.Preconditions; + import java.util.Arrays; /** This class contains various methods for manipulating NDArrays. */ diff --git a/api/src/main/java/ai/djl/ndarray/NDList.java b/api/src/main/java/ai/djl/ndarray/NDList.java index 0a580300fcae..c88c93337e53 100644 --- a/api/src/main/java/ai/djl/ndarray/NDList.java +++ b/api/src/main/java/ai/djl/ndarray/NDList.java @@ -14,6 +14,7 @@ import ai.djl.Device; import ai.djl.ndarray.types.Shape; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; diff --git a/api/src/main/java/ai/djl/ndarray/NDManager.java b/api/src/main/java/ai/djl/ndarray/NDManager.java index 7dd8a19f666a..cdf76a6595ef 100644 --- a/api/src/main/java/ai/djl/ndarray/NDManager.java +++ b/api/src/main/java/ai/djl/ndarray/NDManager.java @@ -20,6 +20,7 @@ import ai.djl.translate.Translator; import ai.djl.translate.TranslatorContext; import ai.djl.util.PairList; + import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; diff --git a/api/src/main/java/ai/djl/ndarray/NDSerializer.java b/api/src/main/java/ai/djl/ndarray/NDSerializer.java index fb17d232a3a0..ebdd1d24c114 100644 --- a/api/src/main/java/ai/djl/ndarray/NDSerializer.java +++ b/api/src/main/java/ai/djl/ndarray/NDSerializer.java @@ -15,6 +15,7 @@ import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; + import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/api/src/main/java/ai/djl/ndarray/NDUtils.java b/api/src/main/java/ai/djl/ndarray/NDUtils.java index ed393b39c541..c844895542f6 100644 --- a/api/src/main/java/ai/djl/ndarray/NDUtils.java +++ b/api/src/main/java/ai/djl/ndarray/NDUtils.java @@ -13,6 +13,7 @@ package ai.djl.ndarray; import ai.djl.ndarray.types.Shape; + import java.util.stream.IntStream; import java.util.stream.Stream; @@ -57,7 +58,8 @@ public static void checkConcatInput(NDList list) { for (int i = 1; i < arrays.length; i++) { if (arrays[i].getShape().dimension() != dimension) { throw new IllegalArgumentException( - "all the input arrays must have same number of dimensions, but the array at index 0 has " + "all the input arrays must have same number of dimensions, but the array at" + + " index 0 has " + dimension + " dimension(s) and the array at index " + i diff --git a/api/src/main/java/ai/djl/ndarray/index/NDArrayIndexer.java b/api/src/main/java/ai/djl/ndarray/index/NDArrayIndexer.java index fd29e8f8bf93..47994b22cda3 100644 --- a/api/src/main/java/ai/djl/ndarray/index/NDArrayIndexer.java +++ b/api/src/main/java/ai/djl/ndarray/index/NDArrayIndexer.java @@ -18,6 +18,7 @@ import ai.djl.ndarray.index.dim.NDIndexElement; import ai.djl.ndarray.index.full.NDIndexFullPick; import ai.djl.ndarray.index.full.NDIndexFullSlice; + import java.util.List; import java.util.Optional; diff --git a/api/src/main/java/ai/djl/ndarray/index/NDIndex.java b/api/src/main/java/ai/djl/ndarray/index/NDIndex.java index c271747bc996..5eef36e456a7 100644 --- a/api/src/main/java/ai/djl/ndarray/index/NDIndex.java +++ b/api/src/main/java/ai/djl/ndarray/index/NDIndex.java @@ -20,6 +20,7 @@ import ai.djl.ndarray.index.dim.NDIndexPick; import ai.djl.ndarray.index.dim.NDIndexSlice; import ai.djl.ndarray.types.DataType; + import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; diff --git a/api/src/main/java/ai/djl/ndarray/index/full/NDIndexFullPick.java b/api/src/main/java/ai/djl/ndarray/index/full/NDIndexFullPick.java index a229ecd19d29..0136e895de58 100644 --- a/api/src/main/java/ai/djl/ndarray/index/full/NDIndexFullPick.java +++ b/api/src/main/java/ai/djl/ndarray/index/full/NDIndexFullPick.java @@ -18,6 +18,7 @@ import ai.djl.ndarray.index.dim.NDIndexElement; import ai.djl.ndarray.index.dim.NDIndexPick; import ai.djl.ndarray.types.Shape; + import java.util.Optional; /** A simplified representation of a pick-based {@link NDIndex}. */ diff --git a/api/src/main/java/ai/djl/ndarray/index/full/NDIndexFullSlice.java b/api/src/main/java/ai/djl/ndarray/index/full/NDIndexFullSlice.java index 1494d0b30981..a09dcd45a334 100644 --- a/api/src/main/java/ai/djl/ndarray/index/full/NDIndexFullSlice.java +++ b/api/src/main/java/ai/djl/ndarray/index/full/NDIndexFullSlice.java @@ -18,6 +18,7 @@ import ai.djl.ndarray.index.dim.NDIndexFixed; import ai.djl.ndarray.index.dim.NDIndexSlice; import ai.djl.ndarray.types.Shape; + import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/api/src/main/java/ai/djl/ndarray/internal/NDArrayEx.java b/api/src/main/java/ai/djl/ndarray/internal/NDArrayEx.java index 7aa69fd420f7..8368a471601d 100644 --- a/api/src/main/java/ai/djl/ndarray/internal/NDArrayEx.java +++ b/api/src/main/java/ai/djl/ndarray/internal/NDArrayEx.java @@ -21,6 +21,7 @@ import ai.djl.ndarray.types.SparseFormat; import ai.djl.nn.Activation; import ai.djl.nn.recurrent.RNN; + import java.util.List; /** An internal interface that encapsulates engine specific operations. */ diff --git a/api/src/main/java/ai/djl/ndarray/internal/NDFormat.java b/api/src/main/java/ai/djl/ndarray/internal/NDFormat.java index ea39200877ea..40a2ad621815 100644 --- a/api/src/main/java/ai/djl/ndarray/internal/NDFormat.java +++ b/api/src/main/java/ai/djl/ndarray/internal/NDFormat.java @@ -16,6 +16,7 @@ import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; import ai.djl.util.Utils; + import java.lang.management.ManagementFactory; import java.util.Arrays; import java.util.Locale; @@ -29,9 +30,7 @@ public abstract class NDFormat { private static final String LF = System.getProperty("line.separator"); private static final Pattern PATTERN = Pattern.compile("\\s*\\d\\.(\\d*?)0*e[+-](\\d+)"); private static final boolean DEBUG = - ManagementFactory.getRuntimeMXBean() - .getInputArguments() - .stream() + ManagementFactory.getRuntimeMXBean().getInputArguments().stream() .anyMatch(arg -> arg.startsWith("-agentlib:jdwp")); /** diff --git a/api/src/main/java/ai/djl/ndarray/types/DataType.java b/api/src/main/java/ai/djl/ndarray/types/DataType.java index 148efdda9858..4101054fcccc 100644 --- a/api/src/main/java/ai/djl/ndarray/types/DataType.java +++ b/api/src/main/java/ai/djl/ndarray/types/DataType.java @@ -13,6 +13,7 @@ package ai.djl.ndarray.types; import ai.djl.ndarray.NDArray; + import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/api/src/main/java/ai/djl/ndarray/types/Shape.java b/api/src/main/java/ai/djl/ndarray/types/Shape.java index 502517f1384d..d368a0414fe7 100644 --- a/api/src/main/java/ai/djl/ndarray/types/Shape.java +++ b/api/src/main/java/ai/djl/ndarray/types/Shape.java @@ -15,6 +15,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.util.Pair; import ai.djl.util.PairList; + import java.io.DataInputStream; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/api/src/main/java/ai/djl/nn/AbstractBaseBlock.java b/api/src/main/java/ai/djl/nn/AbstractBaseBlock.java index 5c6a55030912..1606ede29ab2 100644 --- a/api/src/main/java/ai/djl/nn/AbstractBaseBlock.java +++ b/api/src/main/java/ai/djl/nn/AbstractBaseBlock.java @@ -21,6 +21,7 @@ import ai.djl.training.initializer.Initializer; import ai.djl.util.Pair; import ai.djl.util.PairList; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; @@ -147,9 +148,7 @@ public void setInitializer(Initializer initializer, Parameter.Type params) { @Override public void setInitializer(Initializer initializer, String paramName) { Parameter parameter = - getDirectParameters() - .values() - .stream() + getDirectParameters().values().stream() .filter(p -> p.getName().equals(paramName)) .findFirst() .orElseThrow( diff --git a/api/src/main/java/ai/djl/nn/AbstractBlock.java b/api/src/main/java/ai/djl/nn/AbstractBlock.java index e3cc6cd6adcc..c0d23c016e0a 100644 --- a/api/src/main/java/ai/djl/nn/AbstractBlock.java +++ b/api/src/main/java/ai/djl/nn/AbstractBlock.java @@ -19,6 +19,7 @@ import ai.djl.training.ParameterStore; import ai.djl.util.Pair; import ai.djl.util.PairList; + import java.io.DataOutputStream; import java.util.LinkedHashMap; import java.util.Locale; diff --git a/api/src/main/java/ai/djl/nn/Block.java b/api/src/main/java/ai/djl/nn/Block.java index 5c64f2356312..399f64a6b006 100644 --- a/api/src/main/java/ai/djl/nn/Block.java +++ b/api/src/main/java/ai/djl/nn/Block.java @@ -22,6 +22,7 @@ import ai.djl.training.ParameterStore; import ai.djl.training.initializer.Initializer; import ai.djl.util.PairList; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/api/src/main/java/ai/djl/nn/BlockFactory.java b/api/src/main/java/ai/djl/nn/BlockFactory.java index 1e315c5ecca6..84adea82d9c9 100644 --- a/api/src/main/java/ai/djl/nn/BlockFactory.java +++ b/api/src/main/java/ai/djl/nn/BlockFactory.java @@ -14,6 +14,7 @@ import ai.djl.Model; import ai.djl.repository.zoo.ModelZoo; + import java.io.IOException; import java.io.Serializable; import java.nio.file.Path; diff --git a/api/src/main/java/ai/djl/nn/BlockList.java b/api/src/main/java/ai/djl/nn/BlockList.java index 7f531f6df13d..4cf53e3533c7 100644 --- a/api/src/main/java/ai/djl/nn/BlockList.java +++ b/api/src/main/java/ai/djl/nn/BlockList.java @@ -14,6 +14,7 @@ import ai.djl.util.Pair; import ai.djl.util.PairList; + import java.util.List; import java.util.Map; diff --git a/api/src/main/java/ai/djl/nn/LambdaBlock.java b/api/src/main/java/ai/djl/nn/LambdaBlock.java index 1b6fc0d3bc56..a0469a4180a4 100644 --- a/api/src/main/java/ai/djl/nn/LambdaBlock.java +++ b/api/src/main/java/ai/djl/nn/LambdaBlock.java @@ -19,6 +19,7 @@ import ai.djl.ndarray.types.Shape; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.io.DataInputStream; import java.io.IOException; import java.util.function.Function; diff --git a/api/src/main/java/ai/djl/nn/ParallelBlock.java b/api/src/main/java/ai/djl/nn/ParallelBlock.java index c2108ec3d44c..bdc08e02b084 100644 --- a/api/src/main/java/ai/djl/nn/ParallelBlock.java +++ b/api/src/main/java/ai/djl/nn/ParallelBlock.java @@ -20,6 +20,7 @@ import ai.djl.training.ParameterStore; import ai.djl.util.PairList; import ai.djl.util.Preconditions; + import java.io.DataInputStream; import java.io.IOException; import java.util.ArrayList; @@ -119,8 +120,7 @@ protected NDList forwardInternal( boolean training, PairList params) { return function.apply( - children.values() - .stream() + children.values().stream() .map(block -> block.forward(parameterStore, inputs, training, params)) .collect(Collectors.toList())); } @@ -133,8 +133,7 @@ protected NDList forwardInternal( NDList labels, PairList params) { return function.apply( - children.values() - .stream() + children.values().stream() .map(block -> block.forward(parameterStore, data, labels, params)) .collect(Collectors.toList())); } diff --git a/api/src/main/java/ai/djl/nn/Parameter.java b/api/src/main/java/ai/djl/nn/Parameter.java index bd56de26c91f..62b62137f03c 100644 --- a/api/src/main/java/ai/djl/nn/Parameter.java +++ b/api/src/main/java/ai/djl/nn/Parameter.java @@ -19,6 +19,7 @@ import ai.djl.ndarray.types.Shape; import ai.djl.training.initializer.Initializer; import ai.djl.training.initializer.XavierInitializer; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/api/src/main/java/ai/djl/nn/ParameterList.java b/api/src/main/java/ai/djl/nn/ParameterList.java index dc4d456fa59f..1cdaed26eec0 100644 --- a/api/src/main/java/ai/djl/nn/ParameterList.java +++ b/api/src/main/java/ai/djl/nn/ParameterList.java @@ -14,6 +14,7 @@ import ai.djl.util.Pair; import ai.djl.util.PairList; + import java.util.List; import java.util.Map; diff --git a/api/src/main/java/ai/djl/nn/SequentialBlock.java b/api/src/main/java/ai/djl/nn/SequentialBlock.java index 9c81dc113cb3..e686de7a8047 100644 --- a/api/src/main/java/ai/djl/nn/SequentialBlock.java +++ b/api/src/main/java/ai/djl/nn/SequentialBlock.java @@ -20,6 +20,7 @@ import ai.djl.ndarray.types.Shape; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.io.DataInputStream; import java.io.IOException; import java.util.Arrays; diff --git a/api/src/main/java/ai/djl/nn/convolutional/Convolution.java b/api/src/main/java/ai/djl/nn/convolutional/Convolution.java index 601f5a9fb00c..32ca368621b7 100644 --- a/api/src/main/java/ai/djl/nn/convolutional/Convolution.java +++ b/api/src/main/java/ai/djl/nn/convolutional/Convolution.java @@ -23,6 +23,7 @@ import ai.djl.nn.Parameter; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.io.DataInputStream; import java.io.IOException; diff --git a/api/src/main/java/ai/djl/nn/convolutional/Deconvolution.java b/api/src/main/java/ai/djl/nn/convolutional/Deconvolution.java index ba6ffa1cf023..667de724e2a1 100644 --- a/api/src/main/java/ai/djl/nn/convolutional/Deconvolution.java +++ b/api/src/main/java/ai/djl/nn/convolutional/Deconvolution.java @@ -23,6 +23,7 @@ import ai.djl.nn.Parameter; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.io.DataInputStream; import java.io.IOException; diff --git a/api/src/main/java/ai/djl/nn/core/ConstantEmbedding.java b/api/src/main/java/ai/djl/nn/core/ConstantEmbedding.java index 69b562400393..957276571c74 100644 --- a/api/src/main/java/ai/djl/nn/core/ConstantEmbedding.java +++ b/api/src/main/java/ai/djl/nn/core/ConstantEmbedding.java @@ -19,6 +19,7 @@ import ai.djl.nn.AbstractBlock; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.util.Optional; diff --git a/api/src/main/java/ai/djl/nn/core/Embedding.java b/api/src/main/java/ai/djl/nn/core/Embedding.java index d0f8c293c657..7c336ce8e820 100644 --- a/api/src/main/java/ai/djl/nn/core/Embedding.java +++ b/api/src/main/java/ai/djl/nn/core/Embedding.java @@ -25,6 +25,7 @@ import ai.djl.nn.Parameter; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/api/src/main/java/ai/djl/nn/core/Linear.java b/api/src/main/java/ai/djl/nn/core/Linear.java index e368d44cd697..22003b52518a 100644 --- a/api/src/main/java/ai/djl/nn/core/Linear.java +++ b/api/src/main/java/ai/djl/nn/core/Linear.java @@ -23,6 +23,7 @@ import ai.djl.training.ParameterStore; import ai.djl.util.PairList; import ai.djl.util.Preconditions; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/api/src/main/java/ai/djl/nn/core/LinearCollection.java b/api/src/main/java/ai/djl/nn/core/LinearCollection.java index 5d69fe1c4e86..003ffc11f08d 100644 --- a/api/src/main/java/ai/djl/nn/core/LinearCollection.java +++ b/api/src/main/java/ai/djl/nn/core/LinearCollection.java @@ -23,6 +23,7 @@ import ai.djl.training.ParameterStore; import ai.djl.util.PairList; import ai.djl.util.Preconditions; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/api/src/main/java/ai/djl/nn/core/Prelu.java b/api/src/main/java/ai/djl/nn/core/Prelu.java index d7edefca8fcc..8fcb99713303 100644 --- a/api/src/main/java/ai/djl/nn/core/Prelu.java +++ b/api/src/main/java/ai/djl/nn/core/Prelu.java @@ -21,6 +21,7 @@ import ai.djl.nn.Parameter; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.io.DataInputStream; import java.io.IOException; diff --git a/api/src/main/java/ai/djl/nn/norm/BatchNorm.java b/api/src/main/java/ai/djl/nn/norm/BatchNorm.java index 0774e0e63044..6795b9da04db 100644 --- a/api/src/main/java/ai/djl/nn/norm/BatchNorm.java +++ b/api/src/main/java/ai/djl/nn/norm/BatchNorm.java @@ -23,6 +23,7 @@ import ai.djl.nn.Parameter; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/api/src/main/java/ai/djl/nn/norm/Dropout.java b/api/src/main/java/ai/djl/nn/norm/Dropout.java index 55f0ed2aeb50..688fd598cff4 100644 --- a/api/src/main/java/ai/djl/nn/norm/Dropout.java +++ b/api/src/main/java/ai/djl/nn/norm/Dropout.java @@ -20,6 +20,7 @@ import ai.djl.nn.AbstractBlock; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.io.DataInputStream; import java.io.IOException; diff --git a/api/src/main/java/ai/djl/nn/norm/LayerNorm.java b/api/src/main/java/ai/djl/nn/norm/LayerNorm.java index 88e0afa1e5fb..7e7da567090c 100644 --- a/api/src/main/java/ai/djl/nn/norm/LayerNorm.java +++ b/api/src/main/java/ai/djl/nn/norm/LayerNorm.java @@ -22,6 +22,7 @@ import ai.djl.nn.Parameter; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/api/src/main/java/ai/djl/nn/pooling/Pool.java b/api/src/main/java/ai/djl/nn/pooling/Pool.java index c97ef015d1bf..2b3b2702f7cd 100644 --- a/api/src/main/java/ai/djl/nn/pooling/Pool.java +++ b/api/src/main/java/ai/djl/nn/pooling/Pool.java @@ -17,6 +17,7 @@ import ai.djl.nn.Block; import ai.djl.nn.LambdaBlock; import ai.djl.util.Preconditions; + import java.util.Objects; /** diff --git a/api/src/main/java/ai/djl/nn/recurrent/RecurrentBlock.java b/api/src/main/java/ai/djl/nn/recurrent/RecurrentBlock.java index aacf31478a9b..51ee27ad0198 100644 --- a/api/src/main/java/ai/djl/nn/recurrent/RecurrentBlock.java +++ b/api/src/main/java/ai/djl/nn/recurrent/RecurrentBlock.java @@ -20,6 +20,7 @@ import ai.djl.nn.Parameter; import ai.djl.nn.ParameterList; import ai.djl.util.Pair; + import java.io.DataInputStream; import java.io.IOException; diff --git a/api/src/main/java/ai/djl/nn/transformer/BertBlock.java b/api/src/main/java/ai/djl/nn/transformer/BertBlock.java index 13bcbed708d4..af2c5c175b58 100644 --- a/api/src/main/java/ai/djl/nn/transformer/BertBlock.java +++ b/api/src/main/java/ai/djl/nn/transformer/BertBlock.java @@ -27,6 +27,7 @@ import ai.djl.nn.norm.Dropout; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/api/src/main/java/ai/djl/nn/transformer/BertMaskedLanguageModelBlock.java b/api/src/main/java/ai/djl/nn/transformer/BertMaskedLanguageModelBlock.java index e1d467e97582..d8002d6e5694 100644 --- a/api/src/main/java/ai/djl/nn/transformer/BertMaskedLanguageModelBlock.java +++ b/api/src/main/java/ai/djl/nn/transformer/BertMaskedLanguageModelBlock.java @@ -23,6 +23,7 @@ import ai.djl.nn.norm.BatchNorm; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.util.Arrays; import java.util.function.Function; diff --git a/api/src/main/java/ai/djl/nn/transformer/BertNextSentenceBlock.java b/api/src/main/java/ai/djl/nn/transformer/BertNextSentenceBlock.java index cab3044d4569..549d05b629ec 100644 --- a/api/src/main/java/ai/djl/nn/transformer/BertNextSentenceBlock.java +++ b/api/src/main/java/ai/djl/nn/transformer/BertNextSentenceBlock.java @@ -20,6 +20,7 @@ import ai.djl.nn.core.Linear; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.util.Collections; /** Block to perform the Bert next-sentence-prediction task. */ diff --git a/api/src/main/java/ai/djl/nn/transformer/BertPretrainingBlock.java b/api/src/main/java/ai/djl/nn/transformer/BertPretrainingBlock.java index 0a49e4be1f30..d196ace27826 100644 --- a/api/src/main/java/ai/djl/nn/transformer/BertPretrainingBlock.java +++ b/api/src/main/java/ai/djl/nn/transformer/BertPretrainingBlock.java @@ -21,6 +21,7 @@ import ai.djl.nn.Activation; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.util.Arrays; /** Creates a block that performs all bert pretraining tasks (next sentence and masked language). */ diff --git a/api/src/main/java/ai/djl/nn/transformer/BertPretrainingLoss.java b/api/src/main/java/ai/djl/nn/transformer/BertPretrainingLoss.java index 146d1df6f309..435ddcefa222 100644 --- a/api/src/main/java/ai/djl/nn/transformer/BertPretrainingLoss.java +++ b/api/src/main/java/ai/djl/nn/transformer/BertPretrainingLoss.java @@ -15,6 +15,7 @@ import ai.djl.ndarray.NDList; import ai.djl.training.loss.AbstractCompositeLoss; import ai.djl.util.Pair; + import java.util.Arrays; /** Loss that combines the next sentence and masked language losses of bert pretraining. */ diff --git a/api/src/main/java/ai/djl/nn/transformer/IdEmbedding.java b/api/src/main/java/ai/djl/nn/transformer/IdEmbedding.java index 40570aa91157..cfb1e08ae281 100644 --- a/api/src/main/java/ai/djl/nn/transformer/IdEmbedding.java +++ b/api/src/main/java/ai/djl/nn/transformer/IdEmbedding.java @@ -23,6 +23,7 @@ import ai.djl.nn.Parameter; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.util.Collections; /** diff --git a/api/src/main/java/ai/djl/nn/transformer/PointwiseFeedForwardBlock.java b/api/src/main/java/ai/djl/nn/transformer/PointwiseFeedForwardBlock.java index c343ac83d9b5..3b530808bdfb 100644 --- a/api/src/main/java/ai/djl/nn/transformer/PointwiseFeedForwardBlock.java +++ b/api/src/main/java/ai/djl/nn/transformer/PointwiseFeedForwardBlock.java @@ -16,6 +16,7 @@ import ai.djl.nn.LambdaBlock; import ai.djl.nn.SequentialBlock; import ai.djl.nn.core.Linear; + import java.util.List; import java.util.function.Function; diff --git a/api/src/main/java/ai/djl/nn/transformer/TransformerEncoderBlock.java b/api/src/main/java/ai/djl/nn/transformer/TransformerEncoderBlock.java index 738da65d4747..bc251d42e869 100644 --- a/api/src/main/java/ai/djl/nn/transformer/TransformerEncoderBlock.java +++ b/api/src/main/java/ai/djl/nn/transformer/TransformerEncoderBlock.java @@ -22,6 +22,7 @@ import ai.djl.nn.norm.Dropout; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.util.Collections; import java.util.function.Function; diff --git a/api/src/main/java/ai/djl/repository/AbstractRepository.java b/api/src/main/java/ai/djl/repository/AbstractRepository.java index 8279eb9eee27..c20dfb8589c8 100644 --- a/api/src/main/java/ai/djl/repository/AbstractRepository.java +++ b/api/src/main/java/ai/djl/repository/AbstractRepository.java @@ -16,6 +16,14 @@ import ai.djl.util.Progress; import ai.djl.util.Utils; import ai.djl.util.ZipUtils; + +import org.apache.commons.compress.archivers.tar.TarArchiveEntry; +import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; +import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; +import org.apache.commons.compress.utils.CloseShieldFilterInputStream; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; @@ -34,12 +42,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.zip.GZIPInputStream; import java.util.zip.ZipInputStream; -import org.apache.commons.compress.archivers.tar.TarArchiveEntry; -import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; -import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; -import org.apache.commons.compress.utils.CloseShieldFilterInputStream; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * The {@code AbstractRepository} is the shared base for implementers of the {@link Repository} diff --git a/api/src/main/java/ai/djl/repository/Artifact.java b/api/src/main/java/ai/djl/repository/Artifact.java index 87b26b1e283c..4908871497b1 100644 --- a/api/src/main/java/ai/djl/repository/Artifact.java +++ b/api/src/main/java/ai/djl/repository/Artifact.java @@ -14,6 +14,7 @@ import ai.djl.Application; import ai.djl.util.JsonUtils; + import java.io.Serializable; import java.net.URI; import java.util.Collections; diff --git a/api/src/main/java/ai/djl/repository/JarRepository.java b/api/src/main/java/ai/djl/repository/JarRepository.java index 2469e43e8bc1..e518a2b8156c 100644 --- a/api/src/main/java/ai/djl/repository/JarRepository.java +++ b/api/src/main/java/ai/djl/repository/JarRepository.java @@ -15,6 +15,10 @@ import ai.djl.Application; import ai.djl.repository.zoo.DefaultModelZoo; import ai.djl.util.Progress; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; @@ -24,8 +28,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * A {@code JarRepository} is a {@link Repository} contains an archive file from classpath. diff --git a/api/src/main/java/ai/djl/repository/LocalRepository.java b/api/src/main/java/ai/djl/repository/LocalRepository.java index 3c1720808ff8..d7d292936a60 100644 --- a/api/src/main/java/ai/djl/repository/LocalRepository.java +++ b/api/src/main/java/ai/djl/repository/LocalRepository.java @@ -14,6 +14,10 @@ import ai.djl.Application; import ai.djl.util.JsonUtils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.io.Reader; import java.net.URI; @@ -23,8 +27,6 @@ import java.util.Comparator; import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * A {@code LocalRepository} is a {@link Repository} located in a filesystem directory. diff --git a/api/src/main/java/ai/djl/repository/MRL.java b/api/src/main/java/ai/djl/repository/MRL.java index 3057b0a7ed76..ad5ac005cc75 100644 --- a/api/src/main/java/ai/djl/repository/MRL.java +++ b/api/src/main/java/ai/djl/repository/MRL.java @@ -14,12 +14,14 @@ import ai.djl.Application; import ai.djl.util.Progress; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.net.URI; import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * The {@code MRL} (Machine learning Resource Locator) is a pointer to a {@link Metadata} "resource" diff --git a/api/src/main/java/ai/djl/repository/Metadata.java b/api/src/main/java/ai/djl/repository/Metadata.java index 57eacfee852d..570a5c32d0e9 100644 --- a/api/src/main/java/ai/djl/repository/Metadata.java +++ b/api/src/main/java/ai/djl/repository/Metadata.java @@ -14,6 +14,7 @@ import ai.djl.Application; import ai.djl.repository.zoo.DefaultModelZoo; + import java.net.URI; import java.util.ArrayList; import java.util.Collections; diff --git a/api/src/main/java/ai/djl/repository/RemoteRepository.java b/api/src/main/java/ai/djl/repository/RemoteRepository.java index 1ea390a095b4..6b01ce14ef84 100644 --- a/api/src/main/java/ai/djl/repository/RemoteRepository.java +++ b/api/src/main/java/ai/djl/repository/RemoteRepository.java @@ -14,6 +14,7 @@ import ai.djl.util.JsonUtils; import ai.djl.util.Utils; + import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/api/src/main/java/ai/djl/repository/Repository.java b/api/src/main/java/ai/djl/repository/Repository.java index c3b1d6248816..8022753c8228 100644 --- a/api/src/main/java/ai/djl/repository/Repository.java +++ b/api/src/main/java/ai/djl/repository/Repository.java @@ -14,6 +14,7 @@ import ai.djl.Application; import ai.djl.util.Progress; + import java.io.IOException; import java.io.InputStream; import java.net.URI; diff --git a/api/src/main/java/ai/djl/repository/RepositoryFactoryImpl.java b/api/src/main/java/ai/djl/repository/RepositoryFactoryImpl.java index ca9c50996245..dc4346eacabf 100644 --- a/api/src/main/java/ai/djl/repository/RepositoryFactoryImpl.java +++ b/api/src/main/java/ai/djl/repository/RepositoryFactoryImpl.java @@ -15,6 +15,10 @@ import ai.djl.repository.zoo.ModelLoader; import ai.djl.repository.zoo.ModelZoo; import ai.djl.util.ClassLoaderUtils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.net.MalformedURLException; import java.net.URI; @@ -29,8 +33,6 @@ import java.util.ServiceLoader; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; class RepositoryFactoryImpl implements RepositoryFactory { diff --git a/api/src/main/java/ai/djl/repository/SimpleRepository.java b/api/src/main/java/ai/djl/repository/SimpleRepository.java index c51118585be6..3c39bf84692c 100644 --- a/api/src/main/java/ai/djl/repository/SimpleRepository.java +++ b/api/src/main/java/ai/djl/repository/SimpleRepository.java @@ -16,6 +16,10 @@ import ai.djl.repository.Artifact.Item; import ai.djl.repository.zoo.DefaultModelZoo; import ai.djl.util.Progress; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.BufferedInputStream; import java.io.File; import java.io.IOException; @@ -27,8 +31,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * A {@code SimpleRepository} is a {@link Repository} containing only a single artifact without diff --git a/api/src/main/java/ai/djl/repository/SimpleUrlRepository.java b/api/src/main/java/ai/djl/repository/SimpleUrlRepository.java index 17a256866a70..7bcb2c2b8c59 100644 --- a/api/src/main/java/ai/djl/repository/SimpleUrlRepository.java +++ b/api/src/main/java/ai/djl/repository/SimpleUrlRepository.java @@ -15,6 +15,10 @@ import ai.djl.Application; import ai.djl.repository.zoo.DefaultModelZoo; import ai.djl.util.Progress; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; @@ -25,8 +29,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * A {@code SimpleUrlRepository} is a {@link Repository} contains an archive file from a HTTP URL. diff --git a/api/src/main/java/ai/djl/repository/zoo/BaseModelLoader.java b/api/src/main/java/ai/djl/repository/zoo/BaseModelLoader.java index 413e73e167d8..fa00b9e6f43f 100644 --- a/api/src/main/java/ai/djl/repository/zoo/BaseModelLoader.java +++ b/api/src/main/java/ai/djl/repository/zoo/BaseModelLoader.java @@ -28,6 +28,7 @@ import ai.djl.util.ClassLoaderUtils; import ai.djl.util.Pair; import ai.djl.util.Progress; + import java.io.IOException; import java.io.Reader; import java.lang.reflect.Type; diff --git a/api/src/main/java/ai/djl/repository/zoo/Criteria.java b/api/src/main/java/ai/djl/repository/zoo/Criteria.java index ccf7d2770df3..c90c0aa929c8 100644 --- a/api/src/main/java/ai/djl/repository/zoo/Criteria.java +++ b/api/src/main/java/ai/djl/repository/zoo/Criteria.java @@ -21,6 +21,10 @@ import ai.djl.translate.TranslatorFactory; import ai.djl.util.JsonUtils; import ai.djl.util.Progress; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.net.MalformedURLException; import java.nio.file.Path; @@ -29,8 +33,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * The {@code Criteria} class contains search criteria to look up a {@link ZooModel}. diff --git a/api/src/main/java/ai/djl/repository/zoo/DefaultModelZoo.java b/api/src/main/java/ai/djl/repository/zoo/DefaultModelZoo.java index c489a41debe5..17c259dd280d 100644 --- a/api/src/main/java/ai/djl/repository/zoo/DefaultModelZoo.java +++ b/api/src/main/java/ai/djl/repository/zoo/DefaultModelZoo.java @@ -15,12 +15,14 @@ import ai.djl.engine.Engine; import ai.djl.repository.MRL; import ai.djl.repository.Repository; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** A {@link ModelZoo} that contains models in specified locations. */ public class DefaultModelZoo extends ModelZoo { diff --git a/api/src/main/java/ai/djl/repository/zoo/ModelLoader.java b/api/src/main/java/ai/djl/repository/zoo/ModelLoader.java index 187af4229810..7625d46d75ef 100644 --- a/api/src/main/java/ai/djl/repository/zoo/ModelLoader.java +++ b/api/src/main/java/ai/djl/repository/zoo/ModelLoader.java @@ -15,6 +15,7 @@ import ai.djl.Application; import ai.djl.MalformedModelException; import ai.djl.repository.Artifact; + import java.io.IOException; import java.util.List; diff --git a/api/src/main/java/ai/djl/repository/zoo/ModelZoo.java b/api/src/main/java/ai/djl/repository/zoo/ModelZoo.java index c01257e12083..0674c9d00767 100644 --- a/api/src/main/java/ai/djl/repository/zoo/ModelZoo.java +++ b/api/src/main/java/ai/djl/repository/zoo/ModelZoo.java @@ -15,6 +15,7 @@ import ai.djl.Application; import ai.djl.MalformedModelException; import ai.djl.repository.Artifact; + import java.io.IOException; import java.util.ArrayList; import java.util.Collection; diff --git a/api/src/main/java/ai/djl/repository/zoo/ZooModel.java b/api/src/main/java/ai/djl/repository/zoo/ZooModel.java index 3f0b95c49a56..8d76e130e4c3 100644 --- a/api/src/main/java/ai/djl/repository/zoo/ZooModel.java +++ b/api/src/main/java/ai/djl/repository/zoo/ZooModel.java @@ -23,6 +23,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/training/DefaultTrainingConfig.java b/api/src/main/java/ai/djl/training/DefaultTrainingConfig.java index 57faa054e61b..6e8c7a0f7a3f 100644 --- a/api/src/main/java/ai/djl/training/DefaultTrainingConfig.java +++ b/api/src/main/java/ai/djl/training/DefaultTrainingConfig.java @@ -22,6 +22,7 @@ import ai.djl.training.optimizer.Adam; import ai.djl.training.optimizer.Optimizer; import ai.djl.util.PairList; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/api/src/main/java/ai/djl/training/EasyTrain.java b/api/src/main/java/ai/djl/training/EasyTrain.java index 1d696fa64995..0af691b87554 100644 --- a/api/src/main/java/ai/djl/training/EasyTrain.java +++ b/api/src/main/java/ai/djl/training/EasyTrain.java @@ -19,6 +19,7 @@ import ai.djl.training.listener.TrainingListener.BatchData; import ai.djl.translate.TranslateException; import ai.djl.util.Preconditions; + import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -84,7 +85,8 @@ public static void fit( public static void trainBatch(Trainer trainer, Batch batch) { if (trainer.getManager().getEngine() != batch.getManager().getEngine()) { throw new IllegalArgumentException( - "The data must be on the same engine as the trainer. You may need to change one of your NDManagers."); + "The data must be on the same engine as the trainer. You may need to change one" + + " of your NDManagers."); } Batch[] splits = batch.split(trainer.getDevices(), false); BatchData batchData = @@ -142,7 +144,8 @@ private static boolean trainSplit( public static void validateBatch(Trainer trainer, Batch batch) { Preconditions.checkArgument( trainer.getManager().getEngine() == batch.getManager().getEngine(), - "The data must be on the same engine as the trainer. You may need to change one of your NDManagers."); + "The data must be on the same engine as the trainer. You may need to change one of" + + " your NDManagers."); Batch[] splits = batch.split(trainer.getDevices(), false); BatchData batchData = new BatchData(batch, new ConcurrentHashMap<>(), new ConcurrentHashMap<>()); diff --git a/api/src/main/java/ai/djl/training/ParameterServer.java b/api/src/main/java/ai/djl/training/ParameterServer.java index d090b994744f..54261931efb7 100644 --- a/api/src/main/java/ai/djl/training/ParameterServer.java +++ b/api/src/main/java/ai/djl/training/ParameterServer.java @@ -14,6 +14,7 @@ package ai.djl.training; import ai.djl.ndarray.NDArray; + import java.util.Arrays; /** An interface for a key-value store to store parameters, and their corresponding gradients. */ diff --git a/api/src/main/java/ai/djl/training/ParameterStore.java b/api/src/main/java/ai/djl/training/ParameterStore.java index 527d9aa25c16..7029282c46ea 100644 --- a/api/src/main/java/ai/djl/training/ParameterStore.java +++ b/api/src/main/java/ai/djl/training/ParameterStore.java @@ -17,6 +17,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDManager; import ai.djl.nn.Parameter; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/api/src/main/java/ai/djl/training/Trainer.java b/api/src/main/java/ai/djl/training/Trainer.java index ee2e288afab6..393bca171ea0 100644 --- a/api/src/main/java/ai/djl/training/Trainer.java +++ b/api/src/main/java/ai/djl/training/Trainer.java @@ -29,6 +29,10 @@ import ai.djl.training.listener.TrainingListener; import ai.djl.training.loss.Loss; import ai.djl.translate.TranslateException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -36,8 +40,6 @@ import java.util.Optional; import java.util.concurrent.ExecutorService; import java.util.function.Consumer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * The {@code Trainer} interface provides a session for model training. @@ -324,10 +326,7 @@ public void close() { */ private void checkGradients() { List grads = new ArrayList<>(); - model.getBlock() - .getParameters() - .values() - .stream() + model.getBlock().getParameters().values().stream() .filter(Parameter::requiresGradient) .forEach( param -> diff --git a/api/src/main/java/ai/djl/training/TrainingConfig.java b/api/src/main/java/ai/djl/training/TrainingConfig.java index 6e82c1e75e45..a5984bf5950d 100644 --- a/api/src/main/java/ai/djl/training/TrainingConfig.java +++ b/api/src/main/java/ai/djl/training/TrainingConfig.java @@ -20,6 +20,7 @@ import ai.djl.training.loss.Loss; import ai.djl.training.optimizer.Optimizer; import ai.djl.util.PairList; + import java.util.List; import java.util.concurrent.ExecutorService; import java.util.function.Predicate; diff --git a/api/src/main/java/ai/djl/training/TrainingResult.java b/api/src/main/java/ai/djl/training/TrainingResult.java index 414b14419c9d..a5afc2aa2ee0 100644 --- a/api/src/main/java/ai/djl/training/TrainingResult.java +++ b/api/src/main/java/ai/djl/training/TrainingResult.java @@ -13,6 +13,7 @@ package ai.djl.training; import ai.djl.util.JsonUtils; + import java.util.Collections; import java.util.Map; diff --git a/api/src/main/java/ai/djl/training/dataset/ArrayDataset.java b/api/src/main/java/ai/djl/training/dataset/ArrayDataset.java index 57f0653c30d0..3dee4e607111 100644 --- a/api/src/main/java/ai/djl/training/dataset/ArrayDataset.java +++ b/api/src/main/java/ai/djl/training/dataset/ArrayDataset.java @@ -16,6 +16,7 @@ import ai.djl.ndarray.NDList; import ai.djl.ndarray.NDManager; import ai.djl.util.Progress; + import java.io.IOException; import java.util.stream.Stream; diff --git a/api/src/main/java/ai/djl/training/dataset/DataIterable.java b/api/src/main/java/ai/djl/training/dataset/DataIterable.java index 2f664f229178..ec728f01ed7e 100644 --- a/api/src/main/java/ai/djl/training/dataset/DataIterable.java +++ b/api/src/main/java/ai/djl/training/dataset/DataIterable.java @@ -17,6 +17,10 @@ import ai.djl.ndarray.NDManager; import ai.djl.translate.Batchifier; import ai.djl.translate.Pipeline; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.util.Arrays; import java.util.Iterator; @@ -28,8 +32,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * DataIterable is a data loader that combines {@link Dataset}, {@link Batchifier}, {@link diff --git a/api/src/main/java/ai/djl/training/dataset/Dataset.java b/api/src/main/java/ai/djl/training/dataset/Dataset.java index 9dacf1694378..ba98da5ffb30 100644 --- a/api/src/main/java/ai/djl/training/dataset/Dataset.java +++ b/api/src/main/java/ai/djl/training/dataset/Dataset.java @@ -15,6 +15,7 @@ import ai.djl.ndarray.NDManager; import ai.djl.translate.TranslateException; import ai.djl.util.Progress; + import java.io.IOException; import java.util.concurrent.ExecutorService; diff --git a/api/src/main/java/ai/djl/training/dataset/RandomAccessDataset.java b/api/src/main/java/ai/djl/training/dataset/RandomAccessDataset.java index 0d5e20623e61..0ee0cc72796d 100644 --- a/api/src/main/java/ai/djl/training/dataset/RandomAccessDataset.java +++ b/api/src/main/java/ai/djl/training/dataset/RandomAccessDataset.java @@ -24,6 +24,7 @@ import ai.djl.util.Pair; import ai.djl.util.Progress; import ai.djl.util.RandomUtils; + import java.io.IOException; import java.util.Arrays; import java.util.Objects; diff --git a/api/src/main/java/ai/djl/training/dataset/RandomSampler.java b/api/src/main/java/ai/djl/training/dataset/RandomSampler.java index cfb19fc9ea54..4e704737a6bb 100644 --- a/api/src/main/java/ai/djl/training/dataset/RandomSampler.java +++ b/api/src/main/java/ai/djl/training/dataset/RandomSampler.java @@ -13,6 +13,7 @@ package ai.djl.training.dataset; import ai.djl.util.RandomUtils; + import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Random; diff --git a/api/src/main/java/ai/djl/training/evaluator/AbstractAccuracy.java b/api/src/main/java/ai/djl/training/evaluator/AbstractAccuracy.java index b58dcb9c204d..c9a5fdf70364 100644 --- a/api/src/main/java/ai/djl/training/evaluator/AbstractAccuracy.java +++ b/api/src/main/java/ai/djl/training/evaluator/AbstractAccuracy.java @@ -16,6 +16,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDList; import ai.djl.util.Pair; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/api/src/main/java/ai/djl/training/evaluator/BoundingBoxError.java b/api/src/main/java/ai/djl/training/evaluator/BoundingBoxError.java index f8e808c93d45..4af9e5de3d11 100644 --- a/api/src/main/java/ai/djl/training/evaluator/BoundingBoxError.java +++ b/api/src/main/java/ai/djl/training/evaluator/BoundingBoxError.java @@ -15,6 +15,7 @@ import ai.djl.modality.cv.MultiBoxTarget; import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDList; + import java.util.Map; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; diff --git a/api/src/main/java/ai/djl/training/evaluator/Evaluator.java b/api/src/main/java/ai/djl/training/evaluator/Evaluator.java index fdb48ea3d574..6d2c59956019 100644 --- a/api/src/main/java/ai/djl/training/evaluator/Evaluator.java +++ b/api/src/main/java/ai/djl/training/evaluator/Evaluator.java @@ -14,6 +14,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDList; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/api/src/main/java/ai/djl/training/evaluator/TopKAccuracy.java b/api/src/main/java/ai/djl/training/evaluator/TopKAccuracy.java index 4a4fa02107ba..6f121f9ac259 100644 --- a/api/src/main/java/ai/djl/training/evaluator/TopKAccuracy.java +++ b/api/src/main/java/ai/djl/training/evaluator/TopKAccuracy.java @@ -17,6 +17,7 @@ import ai.djl.ndarray.NDList; import ai.djl.ndarray.types.DataType; import ai.djl.util.Pair; + import java.util.stream.IntStream; /** diff --git a/api/src/main/java/ai/djl/training/hyperparameter/EasyHpo.java b/api/src/main/java/ai/djl/training/hyperparameter/EasyHpo.java index cd97cfac5ab2..32294a48be87 100644 --- a/api/src/main/java/ai/djl/training/hyperparameter/EasyHpo.java +++ b/api/src/main/java/ai/djl/training/hyperparameter/EasyHpo.java @@ -26,10 +26,12 @@ import ai.djl.training.hyperparameter.param.HpSet; import ai.djl.translate.TranslateException; import ai.djl.util.Pair; -import java.io.IOException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + /** Helper for easy training with hyperparameters. */ public abstract class EasyHpo { diff --git a/api/src/main/java/ai/djl/training/hyperparameter/optimizer/BaseHpOptimizer.java b/api/src/main/java/ai/djl/training/hyperparameter/optimizer/BaseHpOptimizer.java index 75e879b131b4..0ce2f986dfcd 100644 --- a/api/src/main/java/ai/djl/training/hyperparameter/optimizer/BaseHpOptimizer.java +++ b/api/src/main/java/ai/djl/training/hyperparameter/optimizer/BaseHpOptimizer.java @@ -14,6 +14,7 @@ import ai.djl.training.hyperparameter.param.HpSet; import ai.djl.util.Pair; + import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; diff --git a/api/src/main/java/ai/djl/training/hyperparameter/param/HpCategorical.java b/api/src/main/java/ai/djl/training/hyperparameter/param/HpCategorical.java index 8b24e721ac88..e6893ed6bb4e 100644 --- a/api/src/main/java/ai/djl/training/hyperparameter/param/HpCategorical.java +++ b/api/src/main/java/ai/djl/training/hyperparameter/param/HpCategorical.java @@ -13,6 +13,7 @@ package ai.djl.training.hyperparameter.param; import ai.djl.util.RandomUtils; + import java.util.List; /** diff --git a/api/src/main/java/ai/djl/training/listener/DivergenceCheckTrainingListener.java b/api/src/main/java/ai/djl/training/listener/DivergenceCheckTrainingListener.java index c3fd11d17fea..34acedfd8aad 100644 --- a/api/src/main/java/ai/djl/training/listener/DivergenceCheckTrainingListener.java +++ b/api/src/main/java/ai/djl/training/listener/DivergenceCheckTrainingListener.java @@ -25,8 +25,8 @@ public void onTrainingBatch(Trainer trainer, BatchData batchData) { Loss trainingLoss = trainer.getLoss(); if (Float.isNaN(trainingLoss.getAccumulator(EvaluatorTrainingListener.TRAIN_ALL))) { throw new TrainingDivergedException( - "The Loss became NaN, try reduce learning rate," - + "add clipGradient option to your optimizer, check input data and loss calculation."); + "The Loss became NaN, try reduce learning rate,add clipGradient option to your" + + " optimizer, check input data and loss calculation."); } } } diff --git a/api/src/main/java/ai/djl/training/listener/EvaluatorTrainingListener.java b/api/src/main/java/ai/djl/training/listener/EvaluatorTrainingListener.java index b896b2fcfee3..1dbfe4117cd9 100644 --- a/api/src/main/java/ai/djl/training/listener/EvaluatorTrainingListener.java +++ b/api/src/main/java/ai/djl/training/listener/EvaluatorTrainingListener.java @@ -17,6 +17,7 @@ import ai.djl.ndarray.NDList; import ai.djl.training.Trainer; import ai.djl.training.evaluator.Evaluator; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/api/src/main/java/ai/djl/training/listener/LoggingTrainingListener.java b/api/src/main/java/ai/djl/training/listener/LoggingTrainingListener.java index d728b7d31742..01b54ef9b54a 100644 --- a/api/src/main/java/ai/djl/training/listener/LoggingTrainingListener.java +++ b/api/src/main/java/ai/djl/training/listener/LoggingTrainingListener.java @@ -19,11 +19,13 @@ import ai.djl.training.evaluator.Evaluator; import ai.djl.training.loss.Loss; import ai.djl.training.util.ProgressBar; -import java.util.ArrayList; -import java.util.List; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.List; + /** * {@link TrainingListener} that outputs the progress of training each batch and epoch into logs. * diff --git a/api/src/main/java/ai/djl/training/listener/MemoryTrainingListener.java b/api/src/main/java/ai/djl/training/listener/MemoryTrainingListener.java index fa4b98096169..b906c3980d33 100644 --- a/api/src/main/java/ai/djl/training/listener/MemoryTrainingListener.java +++ b/api/src/main/java/ai/djl/training/listener/MemoryTrainingListener.java @@ -18,6 +18,10 @@ import ai.djl.metric.Unit; import ai.djl.training.Trainer; import ai.djl.util.cuda.CudaUtils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -33,8 +37,6 @@ import java.nio.file.StandardOpenOption; import java.util.ArrayList; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * {@link TrainingListener} that collects the memory usage information. diff --git a/api/src/main/java/ai/djl/training/listener/SaveModelTrainingListener.java b/api/src/main/java/ai/djl/training/listener/SaveModelTrainingListener.java index 0f128031e8dc..549814fbe675 100644 --- a/api/src/main/java/ai/djl/training/listener/SaveModelTrainingListener.java +++ b/api/src/main/java/ai/djl/training/listener/SaveModelTrainingListener.java @@ -14,11 +14,13 @@ import ai.djl.Model; import ai.djl.training.Trainer; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.file.Paths; import java.util.function.Consumer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** A {@link TrainingListener} that saves a model and can save checkpoints. */ public class SaveModelTrainingListener extends TrainingListenerAdapter { diff --git a/api/src/main/java/ai/djl/training/listener/TimeMeasureTrainingListener.java b/api/src/main/java/ai/djl/training/listener/TimeMeasureTrainingListener.java index 2f5555f0a3c0..e39d7b30c6c6 100644 --- a/api/src/main/java/ai/djl/training/listener/TimeMeasureTrainingListener.java +++ b/api/src/main/java/ai/djl/training/listener/TimeMeasureTrainingListener.java @@ -15,6 +15,10 @@ import ai.djl.metric.Metric; import ai.djl.metric.Metrics; import ai.djl.training.Trainer; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.BufferedWriter; import java.io.IOException; import java.nio.file.Files; @@ -22,8 +26,6 @@ import java.nio.file.Paths; import java.nio.file.StandardOpenOption; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * {@link TrainingListener} that outputs the training time metrics after training is done. diff --git a/api/src/main/java/ai/djl/training/listener/TrainingListener.java b/api/src/main/java/ai/djl/training/listener/TrainingListener.java index 5719f6c955cc..993273bd2cf1 100644 --- a/api/src/main/java/ai/djl/training/listener/TrainingListener.java +++ b/api/src/main/java/ai/djl/training/listener/TrainingListener.java @@ -16,6 +16,7 @@ import ai.djl.ndarray.NDList; import ai.djl.training.Trainer; import ai.djl.training.dataset.Batch; + import java.util.Map; /** diff --git a/api/src/main/java/ai/djl/training/loss/AbstractCompositeLoss.java b/api/src/main/java/ai/djl/training/loss/AbstractCompositeLoss.java index a1d1bfc3e7f5..2a46416190ad 100644 --- a/api/src/main/java/ai/djl/training/loss/AbstractCompositeLoss.java +++ b/api/src/main/java/ai/djl/training/loss/AbstractCompositeLoss.java @@ -16,6 +16,7 @@ import ai.djl.ndarray.NDArrays; import ai.djl.ndarray.NDList; import ai.djl.util.Pair; + import java.util.List; /** diff --git a/api/src/main/java/ai/djl/training/loss/Loss.java b/api/src/main/java/ai/djl/training/loss/Loss.java index e0079f0a5d2b..014f47fef4bb 100644 --- a/api/src/main/java/ai/djl/training/loss/Loss.java +++ b/api/src/main/java/ai/djl/training/loss/Loss.java @@ -14,6 +14,7 @@ import ai.djl.ndarray.NDList; import ai.djl.training.evaluator.Evaluator; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/api/src/main/java/ai/djl/training/loss/SimpleCompositeLoss.java b/api/src/main/java/ai/djl/training/loss/SimpleCompositeLoss.java index 2dc0519aa267..a0acc3b11f9e 100644 --- a/api/src/main/java/ai/djl/training/loss/SimpleCompositeLoss.java +++ b/api/src/main/java/ai/djl/training/loss/SimpleCompositeLoss.java @@ -14,6 +14,7 @@ import ai.djl.ndarray.NDList; import ai.djl.util.Pair; + import java.util.ArrayList; /** diff --git a/api/src/main/java/ai/djl/training/loss/SingleShotDetectionLoss.java b/api/src/main/java/ai/djl/training/loss/SingleShotDetectionLoss.java index f6774eab5b32..adb407a20cdc 100644 --- a/api/src/main/java/ai/djl/training/loss/SingleShotDetectionLoss.java +++ b/api/src/main/java/ai/djl/training/loss/SingleShotDetectionLoss.java @@ -16,6 +16,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDList; import ai.djl.util.Pair; + import java.util.Arrays; /** diff --git a/api/src/main/java/ai/djl/training/optimizer/Adadelta.java b/api/src/main/java/ai/djl/training/optimizer/Adadelta.java index c2636739e7fc..1045afd2e50c 100644 --- a/api/src/main/java/ai/djl/training/optimizer/Adadelta.java +++ b/api/src/main/java/ai/djl/training/optimizer/Adadelta.java @@ -16,6 +16,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDList; import ai.djl.ndarray.internal.NDArrayEx; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/api/src/main/java/ai/djl/training/optimizer/Adagrad.java b/api/src/main/java/ai/djl/training/optimizer/Adagrad.java index 85f220f48fc9..7b125a385f47 100644 --- a/api/src/main/java/ai/djl/training/optimizer/Adagrad.java +++ b/api/src/main/java/ai/djl/training/optimizer/Adagrad.java @@ -18,6 +18,7 @@ import ai.djl.ndarray.internal.NDArrayEx; import ai.djl.ndarray.types.SparseFormat; import ai.djl.training.tracker.Tracker; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/api/src/main/java/ai/djl/training/optimizer/Adam.java b/api/src/main/java/ai/djl/training/optimizer/Adam.java index 5a1faa1b20de..e4544f84adfa 100644 --- a/api/src/main/java/ai/djl/training/optimizer/Adam.java +++ b/api/src/main/java/ai/djl/training/optimizer/Adam.java @@ -18,6 +18,7 @@ import ai.djl.ndarray.internal.NDArrayEx; import ai.djl.training.tracker.Tracker; import ai.djl.util.Preconditions; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/api/src/main/java/ai/djl/training/optimizer/Nag.java b/api/src/main/java/ai/djl/training/optimizer/Nag.java index f8cfad57f7b1..b542b3fc1c1a 100644 --- a/api/src/main/java/ai/djl/training/optimizer/Nag.java +++ b/api/src/main/java/ai/djl/training/optimizer/Nag.java @@ -19,6 +19,7 @@ import ai.djl.ndarray.internal.NDArrayEx; import ai.djl.training.tracker.Tracker; import ai.djl.util.Preconditions; + import java.util.Map; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; diff --git a/api/src/main/java/ai/djl/training/optimizer/Optimizer.java b/api/src/main/java/ai/djl/training/optimizer/Optimizer.java index f791f9f61f9b..ce3853da0a19 100644 --- a/api/src/main/java/ai/djl/training/optimizer/Optimizer.java +++ b/api/src/main/java/ai/djl/training/optimizer/Optimizer.java @@ -14,6 +14,7 @@ import ai.djl.Device; import ai.djl.ndarray.NDArray; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; diff --git a/api/src/main/java/ai/djl/training/optimizer/RmsProp.java b/api/src/main/java/ai/djl/training/optimizer/RmsProp.java index fd4a7f74e1ce..9aade4129961 100644 --- a/api/src/main/java/ai/djl/training/optimizer/RmsProp.java +++ b/api/src/main/java/ai/djl/training/optimizer/RmsProp.java @@ -17,6 +17,7 @@ import ai.djl.ndarray.NDList; import ai.djl.ndarray.internal.NDArrayEx; import ai.djl.training.tracker.Tracker; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/api/src/main/java/ai/djl/training/optimizer/Sgd.java b/api/src/main/java/ai/djl/training/optimizer/Sgd.java index c20cfde22ee6..d7ed0eacdd99 100644 --- a/api/src/main/java/ai/djl/training/optimizer/Sgd.java +++ b/api/src/main/java/ai/djl/training/optimizer/Sgd.java @@ -17,6 +17,7 @@ import ai.djl.ndarray.NDList; import ai.djl.ndarray.internal.NDArrayEx; import ai.djl.training.tracker.Tracker; + import java.util.Map; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; diff --git a/api/src/main/java/ai/djl/training/tracker/MultiFactorTracker.java b/api/src/main/java/ai/djl/training/tracker/MultiFactorTracker.java index 0733a4299a51..e92b74b2aa4f 100644 --- a/api/src/main/java/ai/djl/training/tracker/MultiFactorTracker.java +++ b/api/src/main/java/ai/djl/training/tracker/MultiFactorTracker.java @@ -101,9 +101,9 @@ public Builder setBaseValue(float baseValue) { public Builder setSteps(int[] steps) { if (steps.length <= 1) { throw new IllegalArgumentException( - "Steps should be an array of integers indicating when the " - + "value should be changed, usually in an uneven interval of steps" - + "use FactorTracker if you want the value to be changed at a constant interval of steps"); + "Steps should be an array of integers indicating when the value should be" + + " changed, usually in an uneven interval of stepsuse FactorTracker if" + + " you want the value to be changed at a constant interval of steps"); } for (int i = 0; i < steps.length; i++) { if (i > 0 && steps[i] <= steps[i - 1]) { diff --git a/api/src/main/java/ai/djl/training/util/DownloadUtils.java b/api/src/main/java/ai/djl/training/util/DownloadUtils.java index c6c2cb7e9202..0e660bdc0ecc 100644 --- a/api/src/main/java/ai/djl/training/util/DownloadUtils.java +++ b/api/src/main/java/ai/djl/training/util/DownloadUtils.java @@ -13,6 +13,7 @@ package ai.djl.training.util; import ai.djl.util.Progress; + import java.io.IOException; import java.io.InputStream; import java.net.URL; diff --git a/api/src/main/java/ai/djl/translate/Batchifier.java b/api/src/main/java/ai/djl/translate/Batchifier.java index 40210a9972e6..7f21a696fa7c 100644 --- a/api/src/main/java/ai/djl/translate/Batchifier.java +++ b/api/src/main/java/ai/djl/translate/Batchifier.java @@ -13,6 +13,7 @@ package ai.djl.translate; import ai.djl.ndarray.NDList; + import java.util.Arrays; import java.util.stream.IntStream; diff --git a/api/src/main/java/ai/djl/translate/DefaultTranslatorFactory.java b/api/src/main/java/ai/djl/translate/DefaultTranslatorFactory.java index b068edb776f3..80c103b1589b 100644 --- a/api/src/main/java/ai/djl/translate/DefaultTranslatorFactory.java +++ b/api/src/main/java/ai/djl/translate/DefaultTranslatorFactory.java @@ -16,6 +16,7 @@ import ai.djl.modality.cv.translator.ImageClassificationTranslatorFactory; import ai.djl.ndarray.NDList; 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/translate/PaddingStackBatchifier.java b/api/src/main/java/ai/djl/translate/PaddingStackBatchifier.java index 5da554063bc2..080cd00630f7 100644 --- a/api/src/main/java/ai/djl/translate/PaddingStackBatchifier.java +++ b/api/src/main/java/ai/djl/translate/PaddingStackBatchifier.java @@ -17,6 +17,7 @@ import ai.djl.ndarray.NDManager; import ai.djl.ndarray.index.NDIndex; import ai.djl.ndarray.types.Shape; + import java.util.ArrayList; import java.util.List; diff --git a/api/src/main/java/ai/djl/translate/Pipeline.java b/api/src/main/java/ai/djl/translate/Pipeline.java index 9be0c7eba3d7..d31fcf315797 100644 --- a/api/src/main/java/ai/djl/translate/Pipeline.java +++ b/api/src/main/java/ai/djl/translate/Pipeline.java @@ -16,6 +16,7 @@ import ai.djl.ndarray.NDList; import ai.djl.util.Pair; import ai.djl.util.PairList; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/api/src/main/java/ai/djl/translate/ServingTranslator.java b/api/src/main/java/ai/djl/translate/ServingTranslator.java index f525c9d54ef2..49d0bd247f06 100644 --- a/api/src/main/java/ai/djl/translate/ServingTranslator.java +++ b/api/src/main/java/ai/djl/translate/ServingTranslator.java @@ -14,6 +14,7 @@ import ai.djl.modality.Input; import ai.djl.modality.Output; + import java.util.Map; /** A {@link Translator} that can handle generic {@link Input} and {@link Output}. */ diff --git a/api/src/main/java/ai/djl/translate/ServingTranslatorFactory.java b/api/src/main/java/ai/djl/translate/ServingTranslatorFactory.java index 4eb3914c8a3b..44d11809280c 100644 --- a/api/src/main/java/ai/djl/translate/ServingTranslatorFactory.java +++ b/api/src/main/java/ai/djl/translate/ServingTranslatorFactory.java @@ -22,6 +22,10 @@ import ai.djl.ndarray.NDManager; import ai.djl.util.ClassLoaderUtils; import ai.djl.util.Pair; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.File; import java.io.IOException; import java.lang.reflect.Constructor; @@ -41,10 +45,9 @@ import java.util.jar.JarFile; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.tools.JavaCompiler; import javax.tools.ToolProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** A {@link TranslatorFactory} that creates an generic {@link Translator}. */ public class ServingTranslatorFactory implements TranslatorFactory { diff --git a/api/src/main/java/ai/djl/translate/StackBatchifier.java b/api/src/main/java/ai/djl/translate/StackBatchifier.java index 4fc774371d82..8143d184d655 100644 --- a/api/src/main/java/ai/djl/translate/StackBatchifier.java +++ b/api/src/main/java/ai/djl/translate/StackBatchifier.java @@ -18,6 +18,7 @@ import ai.djl.ndarray.NDList; import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; + import java.util.Arrays; import java.util.stream.LongStream; diff --git a/api/src/main/java/ai/djl/translate/TranslatorFactory.java b/api/src/main/java/ai/djl/translate/TranslatorFactory.java index f4c900939fdb..fc86106a625f 100644 --- a/api/src/main/java/ai/djl/translate/TranslatorFactory.java +++ b/api/src/main/java/ai/djl/translate/TranslatorFactory.java @@ -14,6 +14,7 @@ import ai.djl.Model; import ai.djl.util.Pair; + import java.lang.reflect.Type; import java.util.Map; import java.util.Set; diff --git a/api/src/main/java/ai/djl/util/ClassLoaderUtils.java b/api/src/main/java/ai/djl/util/ClassLoaderUtils.java index d9da664c159d..4482be842da9 100644 --- a/api/src/main/java/ai/djl/util/ClassLoaderUtils.java +++ b/api/src/main/java/ai/djl/util/ClassLoaderUtils.java @@ -12,6 +12,9 @@ */ package ai.djl.util; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -29,8 +32,6 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.stream.Collectors; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** A utility class that load classes from specific URLs. */ public final class ClassLoaderUtils { diff --git a/api/src/main/java/ai/djl/util/Float16Utils.java b/api/src/main/java/ai/djl/util/Float16Utils.java index 3f820c4ae656..38de37469737 100644 --- a/api/src/main/java/ai/djl/util/Float16Utils.java +++ b/api/src/main/java/ai/djl/util/Float16Utils.java @@ -13,6 +13,7 @@ package ai.djl.util; import ai.djl.ndarray.NDManager; + import java.nio.ByteBuffer; import java.nio.ShortBuffer; diff --git a/api/src/main/java/ai/djl/util/JsonSerializable.java b/api/src/main/java/ai/djl/util/JsonSerializable.java index d3bd28f6801c..26a0c038e5ec 100644 --- a/api/src/main/java/ai/djl/util/JsonSerializable.java +++ b/api/src/main/java/ai/djl/util/JsonSerializable.java @@ -13,6 +13,7 @@ package ai.djl.util; import ai.djl.ndarray.BytesSupplier; + import java.io.Serializable; /** diff --git a/api/src/main/java/ai/djl/util/NativeResource.java b/api/src/main/java/ai/djl/util/NativeResource.java index df89d516fad4..65aa8f0085a1 100644 --- a/api/src/main/java/ai/djl/util/NativeResource.java +++ b/api/src/main/java/ai/djl/util/NativeResource.java @@ -13,6 +13,7 @@ package ai.djl.util; import com.sun.jna.Pointer; + import java.util.concurrent.atomic.AtomicReference; /** diff --git a/api/src/main/java/ai/djl/util/Platform.java b/api/src/main/java/ai/djl/util/Platform.java index 8855f945c7c7..6f048fa9aab2 100644 --- a/api/src/main/java/ai/djl/util/Platform.java +++ b/api/src/main/java/ai/djl/util/Platform.java @@ -13,6 +13,7 @@ package ai.djl.util; import ai.djl.util.cuda.CudaUtils; + import java.io.IOException; import java.io.InputStream; import java.net.URL; diff --git a/api/src/main/java/ai/djl/util/Utils.java b/api/src/main/java/ai/djl/util/Utils.java index 2fc5d7eef816..f7765e32197b 100644 --- a/api/src/main/java/ai/djl/util/Utils.java +++ b/api/src/main/java/ai/djl/util/Utils.java @@ -14,6 +14,9 @@ import ai.djl.ndarray.NDArray; import ai.djl.nn.Parameter; + +import org.slf4j.Logger; + import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -33,7 +36,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import org.slf4j.Logger; /** A class containing utility methods. */ public final class Utils { diff --git a/api/src/main/java/ai/djl/util/cuda/CudaUtils.java b/api/src/main/java/ai/djl/util/cuda/CudaUtils.java index 1736742a3e96..fac429c39d3c 100644 --- a/api/src/main/java/ai/djl/util/cuda/CudaUtils.java +++ b/api/src/main/java/ai/djl/util/cuda/CudaUtils.java @@ -14,12 +14,15 @@ import ai.djl.Device; import ai.djl.engine.EngineException; + import com.sun.jna.Native; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.File; import java.lang.management.MemoryUsage; import java.util.regex.Pattern; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** A class containing CUDA utility methods. */ public final class CudaUtils { diff --git a/api/src/main/java/ai/djl/util/passthrough/PassthroughNDArray.java b/api/src/main/java/ai/djl/util/passthrough/PassthroughNDArray.java index eb7d3e699e04..f11a3f7eb5d3 100644 --- a/api/src/main/java/ai/djl/util/passthrough/PassthroughNDArray.java +++ b/api/src/main/java/ai/djl/util/passthrough/PassthroughNDArray.java @@ -14,6 +14,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDArrayAdapter; + import java.nio.ByteBuffer; /** diff --git a/api/src/main/java/ai/djl/util/passthrough/PassthroughNDManager.java b/api/src/main/java/ai/djl/util/passthrough/PassthroughNDManager.java index d2c531b6b627..75542eebd1b3 100644 --- a/api/src/main/java/ai/djl/util/passthrough/PassthroughNDManager.java +++ b/api/src/main/java/ai/djl/util/passthrough/PassthroughNDManager.java @@ -21,6 +21,7 @@ import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; import ai.djl.util.PairList; + import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.charset.Charset; diff --git a/api/src/test/java/ai/djl/DeviceTest.java b/api/src/test/java/ai/djl/DeviceTest.java index 5a7359aee622..4d61a8bb322c 100644 --- a/api/src/test/java/ai/djl/DeviceTest.java +++ b/api/src/test/java/ai/djl/DeviceTest.java @@ -14,6 +14,7 @@ package ai.djl; import ai.djl.engine.Engine; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/api/src/test/java/ai/djl/metric/MetricsTest.java b/api/src/test/java/ai/djl/metric/MetricsTest.java index 8c2e9e03eaa1..8525d2e751ee 100644 --- a/api/src/test/java/ai/djl/metric/MetricsTest.java +++ b/api/src/test/java/ai/djl/metric/MetricsTest.java @@ -12,11 +12,12 @@ */ package ai.djl.metric; -import java.util.List; -import java.util.Set; import org.testng.Assert; import org.testng.annotations.Test; +import java.util.List; +import java.util.Set; + public class MetricsTest { @Test diff --git a/api/src/test/java/ai/djl/modality/InputOutputTest.java b/api/src/test/java/ai/djl/modality/InputOutputTest.java index da5c17ee1cb1..c85081f0f332 100644 --- a/api/src/test/java/ai/djl/modality/InputOutputTest.java +++ b/api/src/test/java/ai/djl/modality/InputOutputTest.java @@ -17,10 +17,12 @@ import ai.djl.ndarray.NDList; import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.Shape; -import java.nio.charset.StandardCharsets; + import org.testng.Assert; import org.testng.annotations.Test; +import java.nio.charset.StandardCharsets; + public class InputOutputTest { @Test diff --git a/api/src/test/java/ai/djl/modality/nlp/embedding/TrainableWordEmbeddingTest.java b/api/src/test/java/ai/djl/modality/nlp/embedding/TrainableWordEmbeddingTest.java index 347a006a39d5..cb3af0c7d7d3 100644 --- a/api/src/test/java/ai/djl/modality/nlp/embedding/TrainableWordEmbeddingTest.java +++ b/api/src/test/java/ai/djl/modality/nlp/embedding/TrainableWordEmbeddingTest.java @@ -15,13 +15,17 @@ import ai.djl.modality.nlp.DefaultVocabulary; import ai.djl.modality.nlp.preprocess.SimpleTokenizer; import ai.djl.ndarray.NDManager; + import org.testng.Assert; import org.testng.annotations.Test; public class TrainableWordEmbeddingTest { private static final String TEST_STRING = - "Deep Java Library (DJL) is an open-source, high-level, engine-agnostic Java framework for deep learning. DJL is designed to be easy to get started with and simple to\n" - + "use for Java developers. DJL provides a native Java development experience and functions like any other regular Java library.\n"; + "Deep Java Library (DJL) is an open-source, high-level, engine-agnostic Java framework" + + " for deep learning. DJL is designed to be easy to get started with and simple" + + " to\n" + + "use for Java developers. DJL provides a native Java development experience and" + + " functions like any other regular Java library.\n"; private static final String UNKNOWN_TOKEN = "UNKNOWN_TOKEN"; @Test diff --git a/api/src/test/java/ai/djl/modality/nlp/preprocess/HyphenNormalizerTest.java b/api/src/test/java/ai/djl/modality/nlp/preprocess/HyphenNormalizerTest.java index 9a45754a8ae6..3f04a2e060dc 100644 --- a/api/src/test/java/ai/djl/modality/nlp/preprocess/HyphenNormalizerTest.java +++ b/api/src/test/java/ai/djl/modality/nlp/preprocess/HyphenNormalizerTest.java @@ -12,10 +12,11 @@ */ package ai.djl.modality.nlp.preprocess; -import java.util.List; import org.testng.Assert; import org.testng.annotations.Test; +import java.util.List; + // We need to test specific unicode char changes - however some editors tend // to perform unicode normalization while saving, copy-pasting etc. // Hence this test would be broken accidentally if we were not using escaped unicode chars. diff --git a/api/src/test/java/ai/djl/modality/nlp/preprocess/LowerCaseConverterTest.java b/api/src/test/java/ai/djl/modality/nlp/preprocess/LowerCaseConverterTest.java index 6ef0c0328c79..05ff40ebe7c8 100644 --- a/api/src/test/java/ai/djl/modality/nlp/preprocess/LowerCaseConverterTest.java +++ b/api/src/test/java/ai/djl/modality/nlp/preprocess/LowerCaseConverterTest.java @@ -12,10 +12,11 @@ */ package ai.djl.modality.nlp.preprocess; -import java.util.List; import org.testng.Assert; import org.testng.annotations.Test; +import java.util.List; + public class LowerCaseConverterTest { @Test public void testPreprocess() { diff --git a/api/src/test/java/ai/djl/modality/nlp/preprocess/PunctuationSeparatorTest.java b/api/src/test/java/ai/djl/modality/nlp/preprocess/PunctuationSeparatorTest.java index eceb60739d5a..12f137555e52 100644 --- a/api/src/test/java/ai/djl/modality/nlp/preprocess/PunctuationSeparatorTest.java +++ b/api/src/test/java/ai/djl/modality/nlp/preprocess/PunctuationSeparatorTest.java @@ -12,11 +12,12 @@ */ package ai.djl.modality.nlp.preprocess; -import java.util.Collections; -import java.util.List; import org.testng.Assert; import org.testng.annotations.Test; +import java.util.Collections; +import java.util.List; + public class PunctuationSeparatorTest { @Test diff --git a/api/src/test/java/ai/djl/modality/nlp/preprocess/SimpleTokenizerTest.java b/api/src/test/java/ai/djl/modality/nlp/preprocess/SimpleTokenizerTest.java index bb88b421c49f..92303d942196 100644 --- a/api/src/test/java/ai/djl/modality/nlp/preprocess/SimpleTokenizerTest.java +++ b/api/src/test/java/ai/djl/modality/nlp/preprocess/SimpleTokenizerTest.java @@ -12,10 +12,11 @@ */ package ai.djl.modality.nlp.preprocess; -import java.util.List; import org.testng.Assert; import org.testng.annotations.Test; +import java.util.List; + public class SimpleTokenizerTest { @Test public void testTokenize() { diff --git a/api/src/test/java/ai/djl/modality/nlp/preprocess/TextEndpointTokenTest.java b/api/src/test/java/ai/djl/modality/nlp/preprocess/TextEndpointTokenTest.java index c601a94d8eae..87a21e32a111 100644 --- a/api/src/test/java/ai/djl/modality/nlp/preprocess/TextEndpointTokenTest.java +++ b/api/src/test/java/ai/djl/modality/nlp/preprocess/TextEndpointTokenTest.java @@ -12,11 +12,12 @@ */ package ai.djl.modality.nlp.preprocess; -import java.util.Arrays; -import java.util.List; import org.testng.Assert; import org.testng.annotations.Test; +import java.util.Arrays; +import java.util.List; + public class TextEndpointTokenTest { @Test diff --git a/api/src/test/java/ai/djl/modality/nlp/preprocess/TextTruncatorTest.java b/api/src/test/java/ai/djl/modality/nlp/preprocess/TextTruncatorTest.java index b506e9baa46e..2dbdd25a7116 100644 --- a/api/src/test/java/ai/djl/modality/nlp/preprocess/TextTruncatorTest.java +++ b/api/src/test/java/ai/djl/modality/nlp/preprocess/TextTruncatorTest.java @@ -12,10 +12,11 @@ */ package ai.djl.modality.nlp.preprocess; -import java.util.List; import org.testng.Assert; import org.testng.annotations.Test; +import java.util.List; + public class TextTruncatorTest { @Test diff --git a/api/src/test/java/ai/djl/modality/nlp/preprocess/UnicodeNormalizerTest.java b/api/src/test/java/ai/djl/modality/nlp/preprocess/UnicodeNormalizerTest.java index b64c3b04d4d9..243aaf403c35 100644 --- a/api/src/test/java/ai/djl/modality/nlp/preprocess/UnicodeNormalizerTest.java +++ b/api/src/test/java/ai/djl/modality/nlp/preprocess/UnicodeNormalizerTest.java @@ -12,10 +12,11 @@ */ package ai.djl.modality.nlp.preprocess; -import java.util.List; import org.testng.Assert; import org.testng.annotations.Test; +import java.util.List; + // We need to test specific unicode char changes - however some editors tend // to perform unicode normalization while saving, copy-pasting etc. // Hence this test would be broken accidentally if we were not using escaped unicode chars. diff --git a/api/src/test/java/ai/djl/ndarray/NDListTest.java b/api/src/test/java/ai/djl/ndarray/NDListTest.java index c569b2d2b3f7..8ff0c044edc2 100644 --- a/api/src/test/java/ai/djl/ndarray/NDListTest.java +++ b/api/src/test/java/ai/djl/ndarray/NDListTest.java @@ -13,11 +13,13 @@ package ai.djl.ndarray; import ai.djl.Device; -import java.io.ByteArrayOutputStream; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.ByteArrayOutputStream; +import java.io.IOException; + public class NDListTest { @Test diff --git a/api/src/test/java/ai/djl/ndarray/NDSerializerTest.java b/api/src/test/java/ai/djl/ndarray/NDSerializerTest.java index 852568c14845..0e38c2d8be68 100644 --- a/api/src/test/java/ai/djl/ndarray/NDSerializerTest.java +++ b/api/src/test/java/ai/djl/ndarray/NDSerializerTest.java @@ -15,13 +15,15 @@ import ai.djl.Device; import ai.djl.ndarray.types.DataType; import ai.djl.util.Float16Utils; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import org.testng.Assert; -import org.testng.annotations.Test; public class NDSerializerTest { diff --git a/api/src/test/java/ai/djl/ndarray/internal/NDFormatTest.java b/api/src/test/java/ai/djl/ndarray/internal/NDFormatTest.java index 4f06724482c6..f629f51b4d56 100644 --- a/api/src/test/java/ai/djl/ndarray/internal/NDFormatTest.java +++ b/api/src/test/java/ai/djl/ndarray/internal/NDFormatTest.java @@ -17,6 +17,7 @@ import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/api/src/test/java/ai/djl/nn/convolutional/Conv1dTest.java b/api/src/test/java/ai/djl/nn/convolutional/Conv1dTest.java index 8d0076387297..ce93af73607e 100644 --- a/api/src/test/java/ai/djl/nn/convolutional/Conv1dTest.java +++ b/api/src/test/java/ai/djl/nn/convolutional/Conv1dTest.java @@ -15,10 +15,12 @@ import ai.djl.ndarray.types.Shape; import ai.djl.util.Pair; -import java.util.stream.IntStream; + import org.testng.Assert; import org.testng.annotations.Test; +import java.util.stream.IntStream; + public class Conv1dTest extends OutputShapeTest { @Test diff --git a/api/src/test/java/ai/djl/nn/convolutional/Conv1dTransposeTest.java b/api/src/test/java/ai/djl/nn/convolutional/Conv1dTransposeTest.java index 45b0e1954f31..59e081cff9ee 100644 --- a/api/src/test/java/ai/djl/nn/convolutional/Conv1dTransposeTest.java +++ b/api/src/test/java/ai/djl/nn/convolutional/Conv1dTransposeTest.java @@ -15,10 +15,12 @@ import ai.djl.ndarray.types.Shape; import ai.djl.util.Pair; -import java.util.stream.IntStream; + import org.testng.Assert; import org.testng.annotations.Test; +import java.util.stream.IntStream; + public class Conv1dTransposeTest extends OutputShapeTest { @Test diff --git a/api/src/test/java/ai/djl/nn/convolutional/Conv2dTest.java b/api/src/test/java/ai/djl/nn/convolutional/Conv2dTest.java index 04cb4ce11594..d49e4ee83169 100644 --- a/api/src/test/java/ai/djl/nn/convolutional/Conv2dTest.java +++ b/api/src/test/java/ai/djl/nn/convolutional/Conv2dTest.java @@ -15,10 +15,12 @@ import ai.djl.ndarray.types.Shape; import ai.djl.util.Pair; -import java.util.stream.IntStream; + import org.testng.Assert; import org.testng.annotations.Test; +import java.util.stream.IntStream; + public class Conv2dTest extends OutputShapeTest { @Test diff --git a/api/src/test/java/ai/djl/nn/convolutional/Conv2dTransposeTest.java b/api/src/test/java/ai/djl/nn/convolutional/Conv2dTransposeTest.java index 5e5bcefa516d..f216086b94b7 100644 --- a/api/src/test/java/ai/djl/nn/convolutional/Conv2dTransposeTest.java +++ b/api/src/test/java/ai/djl/nn/convolutional/Conv2dTransposeTest.java @@ -15,10 +15,12 @@ import ai.djl.ndarray.types.Shape; import ai.djl.util.Pair; -import java.util.stream.IntStream; + import org.testng.Assert; import org.testng.annotations.Test; +import java.util.stream.IntStream; + public class Conv2dTransposeTest extends OutputShapeTest { @Test diff --git a/api/src/test/java/ai/djl/nn/convolutional/Conv3dTest.java b/api/src/test/java/ai/djl/nn/convolutional/Conv3dTest.java index 747c516ded7f..eb69129dccea 100644 --- a/api/src/test/java/ai/djl/nn/convolutional/Conv3dTest.java +++ b/api/src/test/java/ai/djl/nn/convolutional/Conv3dTest.java @@ -15,10 +15,12 @@ import ai.djl.ndarray.types.Shape; import ai.djl.util.Pair; -import java.util.stream.IntStream; + import org.testng.Assert; import org.testng.annotations.Test; +import java.util.stream.IntStream; + public class Conv3dTest extends OutputShapeTest { @Test diff --git a/api/src/test/java/ai/djl/nn/convolutional/OutputShapeTest.java b/api/src/test/java/ai/djl/nn/convolutional/OutputShapeTest.java index f28fe066d5e6..1d1100b0d604 100644 --- a/api/src/test/java/ai/djl/nn/convolutional/OutputShapeTest.java +++ b/api/src/test/java/ai/djl/nn/convolutional/OutputShapeTest.java @@ -14,6 +14,7 @@ package ai.djl.nn.convolutional; import ai.djl.ndarray.NDManager; + import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/api/src/test/java/ai/djl/nn/norm/GhostBatchNormTest.java b/api/src/test/java/ai/djl/nn/norm/GhostBatchNormTest.java index 3f33a1242613..77443b5d8228 100644 --- a/api/src/test/java/ai/djl/nn/norm/GhostBatchNormTest.java +++ b/api/src/test/java/ai/djl/nn/norm/GhostBatchNormTest.java @@ -16,6 +16,7 @@ import ai.djl.ndarray.NDList; import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.Shape; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/api/src/test/java/ai/djl/repository/DjlRepositoryTest.java b/api/src/test/java/ai/djl/repository/DjlRepositoryTest.java index 0f39630a7f0f..24a0b1c6cc56 100644 --- a/api/src/test/java/ai/djl/repository/DjlRepositoryTest.java +++ b/api/src/test/java/ai/djl/repository/DjlRepositoryTest.java @@ -18,10 +18,12 @@ import ai.djl.repository.zoo.Criteria; import ai.djl.repository.zoo.ModelNotFoundException; import ai.djl.repository.zoo.ZooModel; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class DjlRepositoryTest { @Test diff --git a/api/src/test/java/ai/djl/repository/JarRepositoryTest.java b/api/src/test/java/ai/djl/repository/JarRepositoryTest.java index 920f5b35711a..1f012d9b3e59 100644 --- a/api/src/test/java/ai/djl/repository/JarRepositoryTest.java +++ b/api/src/test/java/ai/djl/repository/JarRepositoryTest.java @@ -14,6 +14,10 @@ import ai.djl.util.Utils; import ai.djl.util.ZipUtils; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.net.URL; import java.net.URLClassLoader; @@ -21,8 +25,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; -import org.testng.Assert; -import org.testng.annotations.Test; public class JarRepositoryTest { diff --git a/api/src/test/java/ai/djl/training/LearningRateTest.java b/api/src/test/java/ai/djl/training/LearningRateTest.java index 791b33c1c735..dc0cd099cb24 100644 --- a/api/src/test/java/ai/djl/training/LearningRateTest.java +++ b/api/src/test/java/ai/djl/training/LearningRateTest.java @@ -18,6 +18,7 @@ import ai.djl.training.tracker.FactorTracker; import ai.djl.training.tracker.MultiFactorTracker; import ai.djl.training.tracker.Tracker; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/api/src/test/java/ai/djl/training/util/MinMaxScalerTest.java b/api/src/test/java/ai/djl/training/util/MinMaxScalerTest.java index 302d19eed868..5f97c1fb6013 100644 --- a/api/src/test/java/ai/djl/training/util/MinMaxScalerTest.java +++ b/api/src/test/java/ai/djl/training/util/MinMaxScalerTest.java @@ -14,6 +14,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDManager; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/api/src/test/java/ai/djl/translate/ServingTranslatorTest.java b/api/src/test/java/ai/djl/translate/ServingTranslatorTest.java index 6ac8da183f15..7fed3025de5f 100644 --- a/api/src/test/java/ai/djl/translate/ServingTranslatorTest.java +++ b/api/src/test/java/ai/djl/translate/ServingTranslatorTest.java @@ -26,13 +26,15 @@ import ai.djl.repository.zoo.Criteria; import ai.djl.repository.zoo.ZooModel; import ai.djl.util.Utils; + +import org.testng.Assert; +import org.testng.annotations.AfterClass; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.testng.Assert; -import org.testng.annotations.AfterClass; -import org.testng.annotations.Test; public class ServingTranslatorTest { diff --git a/api/src/test/java/ai/djl/util/PairListTest.java b/api/src/test/java/ai/djl/util/PairListTest.java index b25a7cb06f34..03cda5854bba 100644 --- a/api/src/test/java/ai/djl/util/PairListTest.java +++ b/api/src/test/java/ai/djl/util/PairListTest.java @@ -13,14 +13,15 @@ package ai.djl.util; +import org.testng.Assert; +import org.testng.annotations.Test; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.NoSuchElementException; -import org.testng.Assert; -import org.testng.annotations.Test; public class PairListTest { diff --git a/api/src/test/java/ai/djl/util/PlatformTest.java b/api/src/test/java/ai/djl/util/PlatformTest.java index b3d0b27cc2cb..e22623d286a4 100644 --- a/api/src/test/java/ai/djl/util/PlatformTest.java +++ b/api/src/test/java/ai/djl/util/PlatformTest.java @@ -12,15 +12,16 @@ */ package ai.djl.util; +import org.testng.Assert; +import org.testng.annotations.AfterClass; +import org.testng.annotations.Test; + import java.io.BufferedWriter; import java.io.IOException; import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.testng.Assert; -import org.testng.annotations.AfterClass; -import org.testng.annotations.Test; public class PlatformTest { diff --git a/api/src/test/java/ai/djl/util/UtilsTest.java b/api/src/test/java/ai/djl/util/UtilsTest.java index 567873915caf..bcc84ecb0d8a 100644 --- a/api/src/test/java/ai/djl/util/UtilsTest.java +++ b/api/src/test/java/ai/djl/util/UtilsTest.java @@ -13,6 +13,11 @@ package ai.djl.util; +import org.testng.Assert; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + import java.io.BufferedWriter; import java.io.IOException; import java.nio.file.Files; @@ -20,10 +25,6 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; -import org.testng.Assert; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; public class UtilsTest { diff --git a/api/src/test/java/ai/djl/util/cuda/CudaUtilsTest.java b/api/src/test/java/ai/djl/util/cuda/CudaUtilsTest.java index a6bf0bbe98ba..de1c5cb4a20d 100644 --- a/api/src/test/java/ai/djl/util/cuda/CudaUtilsTest.java +++ b/api/src/test/java/ai/djl/util/cuda/CudaUtilsTest.java @@ -13,14 +13,16 @@ package ai.djl.util.cuda; import ai.djl.Device; -import java.lang.management.MemoryUsage; -import java.util.Arrays; -import java.util.List; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; +import java.lang.management.MemoryUsage; +import java.util.Arrays; +import java.util.List; + public class CudaUtilsTest { private static final Logger logger = LoggerFactory.getLogger(CudaUtilsTest.class); diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/RawDataset.java b/basicdataset/src/main/java/ai/djl/basicdataset/RawDataset.java index 825f545f5cd4..fb6b59d5f0e1 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/RawDataset.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/RawDataset.java @@ -13,6 +13,7 @@ package ai.djl.basicdataset; import ai.djl.training.dataset.Dataset; + import java.io.IOException; /** diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/cv/BananaDetection.java b/basicdataset/src/main/java/ai/djl/basicdataset/cv/BananaDetection.java index 1cdded36db22..a9555d353b77 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/cv/BananaDetection.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/cv/BananaDetection.java @@ -28,7 +28,9 @@ import ai.djl.util.JsonUtils; import ai.djl.util.PairList; import ai.djl.util.Progress; + import com.google.gson.reflect.TypeToken; + import java.io.IOException; import java.io.Reader; import java.lang.reflect.Type; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/cv/CocoDetection.java b/basicdataset/src/main/java/ai/djl/basicdataset/cv/CocoDetection.java index b36f2843db9a..e45abd33e2de 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/cv/CocoDetection.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/cv/CocoDetection.java @@ -25,6 +25,7 @@ import ai.djl.translate.Pipeline; import ai.djl.util.PairList; import ai.djl.util.Progress; + import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/cv/CocoMetadata.java b/basicdataset/src/main/java/ai/djl/basicdataset/cv/CocoMetadata.java index 1f9f01534119..f4c0df0bd63d 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/cv/CocoMetadata.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/cv/CocoMetadata.java @@ -13,6 +13,7 @@ package ai.djl.basicdataset.cv; import com.google.gson.annotations.SerializedName; + import java.util.List; /** A metadata class to represent the structure of annotations in Coco. */ diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/cv/CocoUtils.java b/basicdataset/src/main/java/ai/djl/basicdataset/cv/CocoUtils.java index 55d5fd4355da..5dafc5429b0b 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/cv/CocoUtils.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/cv/CocoUtils.java @@ -13,6 +13,7 @@ package ai.djl.basicdataset.cv; import ai.djl.util.JsonUtils; + import java.io.IOException; import java.io.Reader; import java.nio.file.Files; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/cv/ImageDataset.java b/basicdataset/src/main/java/ai/djl/basicdataset/cv/ImageDataset.java index 97f25fb5d01c..683d40391ea8 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/cv/ImageDataset.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/cv/ImageDataset.java @@ -18,6 +18,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDManager; import ai.djl.training.dataset.RandomAccessDataset; + import java.io.IOException; import java.util.Optional; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/cv/ObjectDetectionDataset.java b/basicdataset/src/main/java/ai/djl/basicdataset/cv/ObjectDetectionDataset.java index 6bb8a9674dbf..c48dd669ff33 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/cv/ObjectDetectionDataset.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/cv/ObjectDetectionDataset.java @@ -18,6 +18,7 @@ import ai.djl.training.dataset.Record; import ai.djl.util.Pair; import ai.djl.util.PairList; + import java.io.IOException; /** diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/cv/PikachuDetection.java b/basicdataset/src/main/java/ai/djl/basicdataset/cv/PikachuDetection.java index f1ad1f3870a9..770858c75921 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/cv/PikachuDetection.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/cv/PikachuDetection.java @@ -26,7 +26,9 @@ import ai.djl.util.JsonUtils; import ai.djl.util.PairList; import ai.djl.util.Progress; + import com.google.gson.reflect.TypeToken; + import java.io.IOException; import java.io.Reader; import java.lang.reflect.Type; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/AbstractImageFolder.java b/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/AbstractImageFolder.java index b370ad5d6fd5..3c175f856141 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/AbstractImageFolder.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/AbstractImageFolder.java @@ -20,6 +20,10 @@ import ai.djl.translate.TranslateException; import ai.djl.util.Pair; import ai.djl.util.PairList; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -31,8 +35,6 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Stream; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * A dataset for loading image files stored in a folder structure. diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/CaptchaDataset.java b/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/CaptchaDataset.java index a6782324844b..efd53bbf91bc 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/CaptchaDataset.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/CaptchaDataset.java @@ -28,6 +28,7 @@ import ai.djl.training.dataset.Record; import ai.djl.translate.Pipeline; import ai.djl.util.Progress; + import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/Cifar10.java b/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/Cifar10.java index 5e94027281e0..5cac9d285e83 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/Cifar10.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/Cifar10.java @@ -27,6 +27,7 @@ import ai.djl.translate.Pipeline; import ai.djl.util.Progress; import ai.djl.util.Utils; + import java.io.IOException; import java.io.InputStream; import java.util.Map; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/FashionMnist.java b/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/FashionMnist.java index 90f1c0e44f8a..a92a9b6a3d45 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/FashionMnist.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/FashionMnist.java @@ -27,6 +27,7 @@ import ai.djl.translate.Pipeline; import ai.djl.util.Progress; import ai.djl.util.Utils; + import java.io.IOException; import java.io.InputStream; import java.util.Map; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/ImageClassificationDataset.java b/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/ImageClassificationDataset.java index 08fca8b3d031..33c7c763c47b 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/ImageClassificationDataset.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/ImageClassificationDataset.java @@ -24,6 +24,7 @@ import ai.djl.training.dataset.Record; import ai.djl.translate.Pipeline; import ai.djl.translate.Translator; + import java.io.IOException; import java.util.List; import java.util.Optional; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/ImageFolder.java b/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/ImageFolder.java index b9da9ee02119..df5e887a43d8 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/ImageFolder.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/ImageFolder.java @@ -15,6 +15,7 @@ import ai.djl.modality.cv.transform.ToTensor; import ai.djl.translate.Pipeline; import ai.djl.util.Progress; + import java.io.File; import java.io.IOException; import java.nio.file.Path; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/ImageNet.java b/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/ImageNet.java index 2179fee06507..b3d4eec76b56 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/ImageNet.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/ImageNet.java @@ -18,6 +18,7 @@ import ai.djl.util.ClassLoaderUtils; import ai.djl.util.JsonUtils; import ai.djl.util.Progress; + import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/Mnist.java b/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/Mnist.java index 1cb87668d831..164ba9876cbc 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/Mnist.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/cv/classification/Mnist.java @@ -27,6 +27,7 @@ import ai.djl.translate.Pipeline; import ai.djl.util.Progress; import ai.djl.util.Utils; + import java.io.IOException; import java.io.InputStream; import java.util.Map; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/AmazonReview.java b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/AmazonReview.java index 6eecaa5b2a52..dc7f0767633f 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/AmazonReview.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/AmazonReview.java @@ -19,12 +19,14 @@ import ai.djl.repository.MRL; import ai.djl.repository.Repository; import ai.djl.util.Progress; + +import org.apache.commons.csv.CSVFormat; + import java.io.IOException; import java.nio.file.Path; import java.util.Map; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.csv.CSVFormat; /** * The {@link AmazonReview} dataset contains a {@link ai.djl.Application.NLP#SENTIMENT_ANALYSIS} set diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/CookingStackExchange.java b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/CookingStackExchange.java index ef394706bde5..fb28b37870cc 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/CookingStackExchange.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/CookingStackExchange.java @@ -22,6 +22,7 @@ import ai.djl.training.dataset.Batch; import ai.djl.training.dataset.Dataset; import ai.djl.util.Progress; + import java.io.IOException; import java.nio.file.Path; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/GoEmotions.java b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/GoEmotions.java index 312e649291f3..a8aa41c70a1b 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/GoEmotions.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/GoEmotions.java @@ -21,6 +21,11 @@ import ai.djl.repository.MRL; import ai.djl.training.dataset.Record; import ai.djl.util.Progress; + +import org.apache.commons.csv.CSVFormat; +import org.apache.commons.csv.CSVParser; +import org.apache.commons.csv.CSVRecord; + import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStreamReader; @@ -30,9 +35,6 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; -import org.apache.commons.csv.CSVFormat; -import org.apache.commons.csv.CSVParser; -import org.apache.commons.csv.CSVRecord; /** * GoEmotions is a corpus of 58k carefully curated comments extracted from Reddit, with human diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/PennTreebankText.java b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/PennTreebankText.java index 1ef29f29873c..895e84661275 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/PennTreebankText.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/PennTreebankText.java @@ -22,6 +22,7 @@ import ai.djl.training.dataset.Dataset; import ai.djl.training.dataset.Record; import ai.djl.util.Progress; + import java.io.BufferedReader; import java.io.IOException; import java.nio.file.Files; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/StanfordMovieReview.java b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/StanfordMovieReview.java index 273d76b45343..2098010e7a70 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/StanfordMovieReview.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/StanfordMovieReview.java @@ -21,6 +21,7 @@ import ai.djl.repository.MRL; import ai.djl.training.dataset.Record; import ai.djl.util.Progress; + import java.io.File; import java.io.IOException; import java.net.URI; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/StanfordQuestionAnsweringDataset.java b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/StanfordQuestionAnsweringDataset.java index aa3d0280db0d..cd42f96712b7 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/StanfordQuestionAnsweringDataset.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/StanfordQuestionAnsweringDataset.java @@ -24,7 +24,9 @@ import ai.djl.training.dataset.Record; import ai.djl.util.JsonUtils; import ai.djl.util.Progress; + import com.google.gson.reflect.TypeToken; + import java.io.BufferedReader; import java.io.IOException; import java.nio.file.Files; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/TatoebaEnglishFrenchDataset.java b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/TatoebaEnglishFrenchDataset.java index e59f4bbf177b..82d6a1c05d00 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/TatoebaEnglishFrenchDataset.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/TatoebaEnglishFrenchDataset.java @@ -20,6 +20,7 @@ import ai.djl.repository.MRL; import ai.djl.training.dataset.Record; import ai.djl.util.Progress; + import java.io.BufferedReader; import java.io.IOException; import java.nio.file.Files; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/TextDataset.java b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/TextDataset.java index 8a43183246d3..50ac4e80ec90 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/TextDataset.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/TextDataset.java @@ -25,6 +25,7 @@ import ai.djl.repository.MRL; import ai.djl.repository.Repository; import ai.djl.training.dataset.RandomAccessDataset; + import java.util.ArrayList; import java.util.Comparator; import java.util.List; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/UniversalDependenciesEnglishEWT.java b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/UniversalDependenciesEnglishEWT.java index 62a5627f56ac..11f171353cff 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/UniversalDependenciesEnglishEWT.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/UniversalDependenciesEnglishEWT.java @@ -23,6 +23,7 @@ import ai.djl.repository.MRL; import ai.djl.training.dataset.Record; import ai.djl.util.Progress; + import java.io.BufferedReader; import java.io.IOException; import java.nio.file.Files; @@ -144,9 +145,7 @@ public Record get(NDManager manager, long index) { NDList labels = new NDList( manager.create( - universalPosTags - .get(Math.toIntExact(index)) - .stream() + universalPosTags.get(Math.toIntExact(index)).stream() .mapToInt(Integer::intValue) .toArray()) .toType(DataType.INT32, false)); diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/WikiText2.java b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/WikiText2.java index 6a42db626de5..c3c2ea5798b6 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/nlp/WikiText2.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/nlp/WikiText2.java @@ -23,6 +23,7 @@ import ai.djl.training.dataset.Dataset; import ai.djl.translate.TranslateException; import ai.djl.util.Progress; + import java.io.IOException; import java.nio.file.Path; diff --git a/basicdataset/src/main/java/ai/djl/basicdataset/tabular/AirfoilRandomAccess.java b/basicdataset/src/main/java/ai/djl/basicdataset/tabular/AirfoilRandomAccess.java index 4b68eb5a388c..cd9519c41ef3 100644 --- a/basicdataset/src/main/java/ai/djl/basicdataset/tabular/AirfoilRandomAccess.java +++ b/basicdataset/src/main/java/ai/djl/basicdataset/tabular/AirfoilRandomAccess.java @@ -19,11 +19,13 @@ import ai.djl.repository.MRL; import ai.djl.repository.Repository; import ai.djl.util.Progress; + +import org.apache.commons.csv.CSVFormat; + import java.io.IOException; import java.nio.file.Path; import java.util.Arrays; import java.util.List; -import org.apache.commons.csv.CSVFormat; /** * Airfoil Self-Noise Data Set from train(NDManager manager, Trainer trainer, Block b gradCol.backward(loss); } List grads = - block.getParameters() - .stream() + block.getParameters().stream() .map( stringParameterPair -> stringParameterPair.getValue().getArray().getGradient()) diff --git a/engines/mxnet/mxnet-model-zoo/src/test/java/ai/djl/mxnet/integration/modality/nlp/WordEmbeddingTest.java b/engines/mxnet/mxnet-model-zoo/src/test/java/ai/djl/mxnet/integration/modality/nlp/WordEmbeddingTest.java index 15c6d5dfbadb..72637442333e 100644 --- a/engines/mxnet/mxnet-model-zoo/src/test/java/ai/djl/mxnet/integration/modality/nlp/WordEmbeddingTest.java +++ b/engines/mxnet/mxnet-model-zoo/src/test/java/ai/djl/mxnet/integration/modality/nlp/WordEmbeddingTest.java @@ -20,11 +20,13 @@ import ai.djl.repository.zoo.Criteria; import ai.djl.repository.zoo.ZooModel; import ai.djl.testing.TestRequirements; -import java.io.IOException; -import java.util.Collections; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; +import java.util.Collections; + public class WordEmbeddingTest { @Test diff --git a/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtModel.java b/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtModel.java index 7ac6e0ce85b6..84c1f38f26de 100644 --- a/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtModel.java +++ b/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtModel.java @@ -25,6 +25,7 @@ import ai.onnxruntime.OrtSession.SessionOptions; import ai.onnxruntime.OrtSession.SessionOptions.ExecutionMode; import ai.onnxruntime.OrtSession.SessionOptions.OptLevel; + import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; diff --git a/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtNDArray.java b/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtNDArray.java index 7a83b9f36e28..0a1f3758eb6b 100644 --- a/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtNDArray.java +++ b/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtNDArray.java @@ -20,6 +20,7 @@ import ai.djl.ndarray.types.Shape; import ai.onnxruntime.OnnxTensor; import ai.onnxruntime.OrtException; + import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.charset.Charset; diff --git a/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtNDManager.java b/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtNDManager.java index 00def7a4a9ee..f524acac28e0 100644 --- a/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtNDManager.java +++ b/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtNDManager.java @@ -23,6 +23,7 @@ import ai.onnxruntime.OnnxTensor; import ai.onnxruntime.OrtEnvironment; import ai.onnxruntime.OrtException; + import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtSymbolBlock.java b/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtSymbolBlock.java index 9c5aa7b3c079..e05f95568faa 100644 --- a/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtSymbolBlock.java +++ b/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtSymbolBlock.java @@ -31,6 +31,7 @@ import ai.onnxruntime.OrtException; import ai.onnxruntime.OrtSession; import ai.onnxruntime.SequenceInfo; + import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; diff --git a/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtUtils.java b/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtUtils.java index e50c32368cee..cf91cb7193a6 100644 --- a/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtUtils.java +++ b/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtUtils.java @@ -19,6 +19,7 @@ import ai.onnxruntime.OnnxTensor; import ai.onnxruntime.OrtEnvironment; import ai.onnxruntime.OrtException; + import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.DoubleBuffer; @@ -55,7 +56,8 @@ public static OnnxTensor toTensor( return OnnxTensor.createTensor(env, (ByteBuffer) data, sh, OnnxJavaType.UINT8); case STRING: throw new UnsupportedOperationException( - "Use toTensor(OrtEnvironment env, String[] inputs, Shape shape) instead."); + "Use toTensor(OrtEnvironment env, String[] inputs, Shape shape)" + + " instead."); case BOOLEAN: case FLOAT16: default: diff --git a/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/zoo/OrtModelZoo.java b/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/zoo/OrtModelZoo.java index 6f8cb264025d..0421a5f96d39 100644 --- a/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/zoo/OrtModelZoo.java +++ b/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/zoo/OrtModelZoo.java @@ -20,6 +20,7 @@ import ai.djl.repository.zoo.BaseModelLoader; import ai.djl.repository.zoo.ModelLoader; import ai.djl.repository.zoo.ModelZoo; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/zoo/tabular/softmax_regression/IrisClassificationTranslatorFactory.java b/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/zoo/tabular/softmax_regression/IrisClassificationTranslatorFactory.java index 10cf2a92e9d1..6cfa713a91e8 100644 --- a/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/zoo/tabular/softmax_regression/IrisClassificationTranslatorFactory.java +++ b/engines/onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/zoo/tabular/softmax_regression/IrisClassificationTranslatorFactory.java @@ -22,6 +22,7 @@ import ai.djl.translate.TranslatorContext; import ai.djl.translate.TranslatorFactory; import ai.djl.util.Pair; + import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Arrays; diff --git a/engines/onnxruntime/onnxruntime-engine/src/test/java/ai/djl/onnxruntime/engine/OrtTest.java b/engines/onnxruntime/onnxruntime-engine/src/test/java/ai/djl/onnxruntime/engine/OrtTest.java index 6fe36e8d212e..c5cba2a568a2 100644 --- a/engines/onnxruntime/onnxruntime-engine/src/test/java/ai/djl/onnxruntime/engine/OrtTest.java +++ b/engines/onnxruntime/onnxruntime-engine/src/test/java/ai/djl/onnxruntime/engine/OrtTest.java @@ -25,13 +25,15 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; + +import org.testng.Assert; +import org.testng.SkipException; +import org.testng.annotations.Test; + import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; -import org.testng.Assert; -import org.testng.SkipException; -import org.testng.annotations.Test; public class OrtTest { diff --git a/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpDataType.java b/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpDataType.java index c4365e6bd8b2..4663cb434ffa 100644 --- a/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpDataType.java +++ b/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpDataType.java @@ -13,6 +13,7 @@ package ai.djl.paddlepaddle.engine; import ai.djl.ndarray.types.DataType; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpEngine.java b/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpEngine.java index 2bae30c4d0bc..a73a4941ea3d 100644 --- a/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpEngine.java +++ b/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpEngine.java @@ -19,6 +19,7 @@ import ai.djl.nn.SymbolBlock; import ai.djl.paddlepaddle.jni.LibUtils; import ai.djl.training.GradientCollector; + import java.io.IOException; import java.io.InputStream; import java.util.Properties; diff --git a/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpModel.java b/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpModel.java index 82f3293bc070..18616e39eeda 100644 --- a/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpModel.java +++ b/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpModel.java @@ -20,6 +20,7 @@ import ai.djl.ndarray.types.DataType; import ai.djl.paddlepaddle.jni.JniUtils; import ai.djl.translate.Translator; + import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; diff --git a/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpNDArray.java b/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpNDArray.java index 7e51bef29510..f3fdc7f3f24f 100644 --- a/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpNDArray.java +++ b/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpNDArray.java @@ -18,7 +18,9 @@ import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; import ai.djl.paddlepaddle.jni.JniUtils; + import com.sun.jna.Pointer; + import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicReference; diff --git a/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpNDManager.java b/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpNDManager.java index 7e81ba0f6989..8f6d5e5d6a60 100644 --- a/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpNDManager.java +++ b/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpNDManager.java @@ -20,6 +20,7 @@ import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; import ai.djl.paddlepaddle.jni.JniUtils; + import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpSymbolBlock.java b/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpSymbolBlock.java index cb75ce6d7cf6..0e42da5f8371 100644 --- a/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpSymbolBlock.java +++ b/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/engine/PpSymbolBlock.java @@ -22,6 +22,7 @@ import ai.djl.paddlepaddle.jni.JniUtils; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.util.Arrays; /** {@code PpSymbolBlock} is the PaddlePaddle implementation of {@link SymbolBlock}. */ diff --git a/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/jni/JniUtils.java b/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/jni/JniUtils.java index b19d3ea1c1f3..c3651a347fd0 100644 --- a/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/jni/JniUtils.java +++ b/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/jni/JniUtils.java @@ -20,6 +20,7 @@ import ai.djl.paddlepaddle.engine.PpDataType; import ai.djl.paddlepaddle.engine.PpNDArray; import ai.djl.paddlepaddle.engine.PpNDManager; + import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Arrays; diff --git a/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/jni/LibUtils.java b/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/jni/LibUtils.java index 6f1130b2718f..412e3ab71e3f 100644 --- a/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/jni/LibUtils.java +++ b/engines/paddlepaddle/paddlepaddle-engine/src/main/java/ai/djl/paddlepaddle/jni/LibUtils.java @@ -15,6 +15,10 @@ import ai.djl.util.ClassLoaderUtils; import ai.djl.util.Platform; import ai.djl.util.Utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -29,8 +33,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Utilities for finding the Paddle Engine binary on the System. diff --git a/engines/paddlepaddle/paddlepaddle-engine/src/test/java/ai/djl/paddlepaddle/jni/JniUtilsTest.java b/engines/paddlepaddle/paddlepaddle-engine/src/test/java/ai/djl/paddlepaddle/jni/JniUtilsTest.java index 2a9680af4f21..6ec829739161 100644 --- a/engines/paddlepaddle/paddlepaddle-engine/src/test/java/ai/djl/paddlepaddle/jni/JniUtilsTest.java +++ b/engines/paddlepaddle/paddlepaddle-engine/src/test/java/ai/djl/paddlepaddle/jni/JniUtilsTest.java @@ -17,6 +17,7 @@ import ai.djl.ndarray.types.Shape; import ai.djl.paddlepaddle.engine.PpNDArray; import ai.djl.testing.TestRequirements; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/engines/paddlepaddle/paddlepaddle-engine/src/test/java/ai/djl/paddlepaddle/jni/PpEngineTest.java b/engines/paddlepaddle/paddlepaddle-engine/src/test/java/ai/djl/paddlepaddle/jni/PpEngineTest.java index 6bcea6687796..e581cc3c5360 100644 --- a/engines/paddlepaddle/paddlepaddle-engine/src/test/java/ai/djl/paddlepaddle/jni/PpEngineTest.java +++ b/engines/paddlepaddle/paddlepaddle-engine/src/test/java/ai/djl/paddlepaddle/jni/PpEngineTest.java @@ -13,6 +13,7 @@ package ai.djl.paddlepaddle.jni; import ai.djl.paddlepaddle.engine.PpEngine; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/PpModelZoo.java b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/PpModelZoo.java index 4431fc3a6dd9..22af1f07048c 100644 --- a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/PpModelZoo.java +++ b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/PpModelZoo.java @@ -19,6 +19,7 @@ import ai.djl.repository.zoo.BaseModelLoader; import ai.djl.repository.zoo.ModelLoader; import ai.djl.repository.zoo.ModelZoo; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/imageclassification/PpImageClassificationTranslatorFactory.java b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/imageclassification/PpImageClassificationTranslatorFactory.java index 577812eb9cee..c37cf8964bbb 100644 --- a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/imageclassification/PpImageClassificationTranslatorFactory.java +++ b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/imageclassification/PpImageClassificationTranslatorFactory.java @@ -28,6 +28,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/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/imageclassification/PpWordRotateTranslator.java b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/imageclassification/PpWordRotateTranslator.java index e40b09665a26..1074b868f131 100644 --- a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/imageclassification/PpWordRotateTranslator.java +++ b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/imageclassification/PpWordRotateTranslator.java @@ -19,6 +19,7 @@ import ai.djl.ndarray.NDList; import ai.djl.translate.NoBatchifyTranslator; import ai.djl.translate.TranslatorContext; + import java.util.Arrays; import java.util.List; diff --git a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/imageclassification/PpWordRotateTranslatorFactory.java b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/imageclassification/PpWordRotateTranslatorFactory.java index 1c70e0285fb9..f242c190488e 100644 --- a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/imageclassification/PpWordRotateTranslatorFactory.java +++ b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/imageclassification/PpWordRotateTranslatorFactory.java @@ -24,6 +24,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/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/BoundFinder.java b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/BoundFinder.java index 045fd30f9a93..289e0d351810 100644 --- a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/BoundFinder.java +++ b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/BoundFinder.java @@ -15,6 +15,7 @@ import ai.djl.modality.cv.output.BoundingBox; import ai.djl.modality.cv.output.Point; import ai.djl.modality.cv.output.Rectangle; + import java.util.ArrayDeque; import java.util.ArrayList; import java.util.List; @@ -65,8 +66,7 @@ public List> getPoints() { * @return the region defined by boxes */ public List getBoxes() { - return pointsCollection - .stream() + return pointsCollection.stream() .parallel() .map( points -> { diff --git a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/PpFaceDetectionTranslator.java b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/PpFaceDetectionTranslator.java index 47b511233bd8..4552a4eeea65 100644 --- a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/PpFaceDetectionTranslator.java +++ b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/PpFaceDetectionTranslator.java @@ -23,6 +23,7 @@ import ai.djl.translate.ArgumentsUtil; import ai.djl.translate.NoBatchifyTranslator; import ai.djl.translate.TranslatorContext; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/PpFaceDetectionTranslatorFactory.java b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/PpFaceDetectionTranslatorFactory.java index d45e42c9b3e2..026d9c93f600 100644 --- a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/PpFaceDetectionTranslatorFactory.java +++ b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/PpFaceDetectionTranslatorFactory.java @@ -24,6 +24,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/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/PpWordDetectionTranslator.java b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/PpWordDetectionTranslator.java index 2312ef7e3495..57540c2faa1f 100644 --- a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/PpWordDetectionTranslator.java +++ b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/PpWordDetectionTranslator.java @@ -27,6 +27,7 @@ import ai.djl.translate.NoBatchifyTranslator; import ai.djl.translate.Translator; import ai.djl.translate.TranslatorContext; + import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.List; @@ -63,8 +64,7 @@ public DetectedObjects processOutput(TranslatorContext ctx, NDList list) result = result.squeeze(0).toType(DataType.UINT8, true); Image image = factory.fromNDArray(result); boxes = - image.findBoundingBoxes() - .parallelStream() + image.findBoundingBoxes().parallelStream() .filter( box -> { Rectangle rect = (Rectangle) box; diff --git a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/PpWordDetectionTranslatorFactory.java b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/PpWordDetectionTranslatorFactory.java index 70a69550bd2d..dfaf52beab49 100644 --- a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/PpWordDetectionTranslatorFactory.java +++ b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/objectdetection/PpWordDetectionTranslatorFactory.java @@ -24,6 +24,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/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/wordrecognition/PpWordRecognitionTranslator.java b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/wordrecognition/PpWordRecognitionTranslator.java index 6afb29e313b5..9792fcd3145f 100644 --- a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/wordrecognition/PpWordRecognitionTranslator.java +++ b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/wordrecognition/PpWordRecognitionTranslator.java @@ -20,6 +20,7 @@ import ai.djl.translate.NoBatchifyTranslator; import ai.djl.translate.TranslatorContext; import ai.djl.util.Utils; + import java.io.IOException; import java.io.InputStream; import java.util.List; diff --git a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/wordrecognition/PpWordRecognitionTranslatorFactory.java b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/wordrecognition/PpWordRecognitionTranslatorFactory.java index 02238a03a048..e26b46344450 100644 --- a/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/wordrecognition/PpWordRecognitionTranslatorFactory.java +++ b/engines/paddlepaddle/paddlepaddle-model-zoo/src/main/java/ai/djl/paddlepaddle/zoo/cv/wordrecognition/PpWordRecognitionTranslatorFactory.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/engines/paddlepaddle/paddlepaddle-model-zoo/src/test/java/ai/djl/paddlepaddle/zoo/MaskDetectionTest.java b/engines/paddlepaddle/paddlepaddle-model-zoo/src/test/java/ai/djl/paddlepaddle/zoo/MaskDetectionTest.java index 4ca17f23e9b0..8545d0df0a2d 100644 --- a/engines/paddlepaddle/paddlepaddle-model-zoo/src/test/java/ai/djl/paddlepaddle/zoo/MaskDetectionTest.java +++ b/engines/paddlepaddle/paddlepaddle-model-zoo/src/test/java/ai/djl/paddlepaddle/zoo/MaskDetectionTest.java @@ -26,14 +26,16 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; -import org.testng.Assert; -import org.testng.annotations.Test; public class MaskDetectionTest { diff --git a/engines/paddlepaddle/paddlepaddle-model-zoo/src/test/java/ai/djl/paddlepaddle/zoo/OCRTest.java b/engines/paddlepaddle/paddlepaddle-model-zoo/src/test/java/ai/djl/paddlepaddle/zoo/OCRTest.java index 6ab724a70be9..84721d125ac6 100644 --- a/engines/paddlepaddle/paddlepaddle-model-zoo/src/test/java/ai/djl/paddlepaddle/zoo/OCRTest.java +++ b/engines/paddlepaddle/paddlepaddle-model-zoo/src/test/java/ai/djl/paddlepaddle/zoo/OCRTest.java @@ -28,9 +28,11 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; + +import org.testng.annotations.Test; + import java.io.IOException; import java.util.List; -import org.testng.annotations.Test; public class OCRTest { diff --git a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtEngine.java b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtEngine.java index 7b45a16d76be..03e5887f964e 100644 --- a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtEngine.java +++ b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtEngine.java @@ -22,12 +22,14 @@ import ai.djl.pytorch.jni.LibUtils; import ai.djl.training.GradientCollector; import ai.djl.util.RandomUtils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.FileNotFoundException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * The {@code PtEngine} is an implementation of the {@link Engine} based on the 2) { throw new UnsupportedOperationException( - "Dimension mismatch or high dimensional dot operation is not supported. Please use .matMul instead."); + "Dimension mismatch or high dimensional dot operation is not supported. Please" + + " use .matMul instead."); } return JniUtils.dot(this, manager.from(other)); } diff --git a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtNDArrayEx.java b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtNDArrayEx.java index 3f4d5ffd0716..c22a5347a590 100644 --- a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtNDArrayEx.java +++ b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtNDArrayEx.java @@ -23,6 +23,7 @@ import ai.djl.ndarray.types.SparseFormat; import ai.djl.nn.recurrent.RNN; import ai.djl.pytorch.jni.JniUtils; + import java.util.List; /** {@code PtNDArrayEx} is the PyTorch implementation of the {@link NDArrayEx}. */ diff --git a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtNDArrayIndexer.java b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtNDArrayIndexer.java index f86575618756..9ffd96c127b6 100644 --- a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtNDArrayIndexer.java +++ b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtNDArrayIndexer.java @@ -19,6 +19,7 @@ import ai.djl.ndarray.index.full.NDIndexFullSlice; import ai.djl.ndarray.types.Shape; import ai.djl.pytorch.jni.JniUtils; + import java.util.Stack; /** The {@link NDArrayIndexer} used by the {@link PtNDArray}. */ diff --git a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtNDManager.java b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtNDManager.java index 3b439b78833a..6a12af2f1dfb 100644 --- a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtNDManager.java +++ b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtNDManager.java @@ -21,6 +21,7 @@ import ai.djl.ndarray.types.Shape; import ai.djl.ndarray.types.SparseFormat; import ai.djl.pytorch.jni.JniUtils; + import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtSymbolBlock.java b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtSymbolBlock.java index 89463bef0eab..8521e74466fb 100644 --- a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtSymbolBlock.java +++ b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/engine/PtSymbolBlock.java @@ -26,14 +26,16 @@ import ai.djl.pytorch.jni.JniUtils; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * {@code PtSymbolBlock} is the PyTorch implementation of {@link SymbolBlock}. diff --git a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/IValue.java b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/IValue.java index 45b5866d950d..1cbd438d1aca 100644 --- a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/IValue.java +++ b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/IValue.java @@ -16,6 +16,7 @@ import ai.djl.pytorch.engine.PtNDArray; import ai.djl.pytorch.engine.PtNDManager; import ai.djl.util.NativeResource; + import java.util.Arrays; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/IValueUtils.java b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/IValueUtils.java index 91f728b9e587..0a1da4b888bb 100644 --- a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/IValueUtils.java +++ b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/IValueUtils.java @@ -20,6 +20,7 @@ import ai.djl.pytorch.engine.PtSymbolBlock; import ai.djl.util.Pair; import ai.djl.util.PairList; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/JniUtils.java b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/JniUtils.java index 5a0cf2a8292a..ebd5a998deca 100644 --- a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/JniUtils.java +++ b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/JniUtils.java @@ -22,6 +22,10 @@ import ai.djl.pytorch.engine.PtNDArray; import ai.djl.pytorch.engine.PtNDManager; import ai.djl.pytorch.engine.PtSymbolBlock; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.DataInputStream; import java.io.IOException; import java.io.InputStream; @@ -32,8 +36,6 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * A class containing utilities to interact with the PyTorch Engine's Java Native Interface (JNI) diff --git a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/LibUtils.java b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/LibUtils.java index 88b99cb6cb00..75fddfdd2a6e 100644 --- a/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/LibUtils.java +++ b/engines/pytorch/pytorch-engine/src/main/java/ai/djl/pytorch/jni/LibUtils.java @@ -16,6 +16,10 @@ import ai.djl.util.Platform; import ai.djl.util.Utils; import ai.djl.util.cuda.CudaUtils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -34,8 +38,6 @@ import java.util.regex.Pattern; import java.util.stream.Stream; import java.util.zip.GZIPInputStream; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Utilities for finding the PyTorch Engine binary on the System. diff --git a/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/IValueTest.java b/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/IValueTest.java index eebf7a1598ad..56393f510bf8 100644 --- a/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/IValueTest.java +++ b/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/IValueTest.java @@ -24,12 +24,14 @@ import ai.djl.repository.zoo.Criteria; import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.util.Arrays; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.testng.Assert; -import org.testng.annotations.Test; public class IValueTest { diff --git a/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/LibUtilsTest.java b/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/LibUtilsTest.java index 52f7aff52524..617d2cfb8098 100644 --- a/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/LibUtilsTest.java +++ b/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/LibUtilsTest.java @@ -13,6 +13,7 @@ package ai.djl.pytorch.integration; import ai.djl.engine.Engine; + import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/MkldnnTest.java b/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/MkldnnTest.java index 8ca92ee264ac..f855efb3e1c8 100644 --- a/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/MkldnnTest.java +++ b/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/MkldnnTest.java @@ -16,10 +16,12 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.Shape; -import java.util.Arrays; + import org.testng.SkipException; import org.testng.annotations.Test; +import java.util.Arrays; + /** The file is for testing PyTorch MKLDNN functionalities. */ public class MkldnnTest { diff --git a/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/ProfilerTest.java b/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/ProfilerTest.java index 03ae1873f4c7..88f1e9cd32f7 100644 --- a/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/ProfilerTest.java +++ b/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/ProfilerTest.java @@ -30,11 +30,13 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import org.testng.Assert; -import org.testng.annotations.Test; /** The file is for testing PyTorch Profiler functionalities. */ public class ProfilerTest { diff --git a/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/PtModelTest.java b/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/PtModelTest.java index 880a6fd81dd8..11531c1d213f 100644 --- a/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/PtModelTest.java +++ b/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/PtModelTest.java @@ -25,11 +25,13 @@ import ai.djl.training.util.ProgressBar; import ai.djl.translate.NoopTranslator; import ai.djl.translate.TranslateException; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import org.testng.Assert; -import org.testng.annotations.Test; public class PtModelTest { diff --git a/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/TorchScriptTest.java b/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/TorchScriptTest.java index eee99ad1ba9c..3b58995173bd 100644 --- a/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/TorchScriptTest.java +++ b/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/integration/TorchScriptTest.java @@ -26,14 +26,16 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; -import org.testng.Assert; -import org.testng.annotations.Test; /** The file is for integration test for special TorchScript input. */ public class TorchScriptTest { diff --git a/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/jni/IValueUtilsTest.java b/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/jni/IValueUtilsTest.java index 85b2bc94aca8..da3bdd15ad35 100644 --- a/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/jni/IValueUtilsTest.java +++ b/engines/pytorch/pytorch-engine/src/test/java/ai/djl/pytorch/jni/IValueUtilsTest.java @@ -17,10 +17,12 @@ import ai.djl.ndarray.types.Shape; import ai.djl.pytorch.engine.PtNDArray; import ai.djl.pytorch.engine.PtNDManager; -import java.util.Arrays; + import org.testng.Assert; import org.testng.annotations.Test; +import java.util.Arrays; + public class IValueUtilsTest { @Test public void getInputsTestTupleSyntax() { diff --git a/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/PtModelZoo.java b/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/PtModelZoo.java index 632d83af594e..2730d2852c29 100644 --- a/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/PtModelZoo.java +++ b/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/PtModelZoo.java @@ -20,6 +20,7 @@ import ai.djl.repository.zoo.BaseModelLoader; import ai.djl.repository.zoo.ModelLoader; import ai.djl.repository.zoo.ModelZoo; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/cv/objectdetection/PtSsdTranslator.java b/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/cv/objectdetection/PtSsdTranslator.java index 9c5f0b4f50cb..0c1e17663b18 100644 --- a/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/cv/objectdetection/PtSsdTranslator.java +++ b/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/cv/objectdetection/PtSsdTranslator.java @@ -23,6 +23,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.Map; diff --git a/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/cv/objectdetection/PtSsdTranslatorFactory.java b/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/cv/objectdetection/PtSsdTranslatorFactory.java index c777c35f38a2..2bdafe197c2d 100644 --- a/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/cv/objectdetection/PtSsdTranslatorFactory.java +++ b/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/cv/objectdetection/PtSsdTranslatorFactory.java @@ -24,6 +24,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/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/nlp/qa/PtBertQATranslator.java b/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/nlp/qa/PtBertQATranslator.java index 6aec3b8a2ba6..cf66d40ad84e 100644 --- a/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/nlp/qa/PtBertQATranslator.java +++ b/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/nlp/qa/PtBertQATranslator.java @@ -23,6 +23,7 @@ import ai.djl.ndarray.NDList; import ai.djl.ndarray.NDManager; import ai.djl.translate.TranslatorContext; + import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/nlp/qa/PtBertQATranslatorFactory.java b/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/nlp/qa/PtBertQATranslatorFactory.java index eaf8fe36eb74..ea46a6432049 100644 --- a/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/nlp/qa/PtBertQATranslatorFactory.java +++ b/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/nlp/qa/PtBertQATranslatorFactory.java @@ -22,6 +22,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/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/nlp/sentimentanalysis/PtDistilBertTranslator.java b/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/nlp/sentimentanalysis/PtDistilBertTranslator.java index 74f3ab7e0968..4dd7e1cefac2 100644 --- a/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/nlp/sentimentanalysis/PtDistilBertTranslator.java +++ b/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/nlp/sentimentanalysis/PtDistilBertTranslator.java @@ -22,6 +22,7 @@ import ai.djl.ndarray.NDManager; import ai.djl.translate.Translator; import ai.djl.translate.TranslatorContext; + import java.io.IOException; import java.net.URL; import java.util.Arrays; diff --git a/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/nlp/sentimentanalysis/PtDistilBertTranslatorFactory.java b/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/nlp/sentimentanalysis/PtDistilBertTranslatorFactory.java index 1a0a469a3705..8e4c4761c840 100644 --- a/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/nlp/sentimentanalysis/PtDistilBertTranslatorFactory.java +++ b/engines/pytorch/pytorch-model-zoo/src/main/java/ai/djl/pytorch/zoo/nlp/sentimentanalysis/PtDistilBertTranslatorFactory.java @@ -21,6 +21,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/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/SavedModelBundle.java b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/SavedModelBundle.java index ff37ff49f281..331e1ff52576 100644 --- a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/SavedModelBundle.java +++ b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/SavedModelBundle.java @@ -13,11 +13,12 @@ package ai.djl.tensorflow.engine; -import java.util.concurrent.atomic.AtomicBoolean; import org.tensorflow.internal.c_api.TF_Graph; import org.tensorflow.internal.c_api.TF_Session; import org.tensorflow.proto.framework.MetaGraphDef; +import java.util.concurrent.atomic.AtomicBoolean; + /** The wrapper class for native resources required for SavedModelBundle. */ public class SavedModelBundle implements AutoCloseable { diff --git a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfDataType.java b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfDataType.java index 063102df1e6f..23b241b58a07 100644 --- a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfDataType.java +++ b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfDataType.java @@ -13,6 +13,7 @@ package ai.djl.tensorflow.engine; import ai.djl.ndarray.types.DataType; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfEngine.java b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfEngine.java index c82dfa226255..d9969b967276 100644 --- a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfEngine.java +++ b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfEngine.java @@ -23,8 +23,7 @@ import ai.djl.tensorflow.engine.javacpp.LibUtils; import ai.djl.training.GradientCollector; import ai.djl.util.RandomUtils; -import java.util.Objects; -import java.util.concurrent.atomic.AtomicReference; + import org.bytedeco.javacpp.PointerScope; import org.tensorflow.TensorFlow; import org.tensorflow.internal.c_api.TFE_Context; @@ -32,6 +31,9 @@ import org.tensorflow.internal.c_api.TF_Status; import org.tensorflow.internal.c_api.global.tensorflow; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicReference; + /** * The {@code TfEngine} is an implementation of the {@link Engine} based on the Tensorflow Deep Learning Framework. @@ -64,8 +66,11 @@ static TfEngine newInstance() { if (t.getMessage().contains("libstdc++")) { // Does not mention .so to work with osx .dylib String msg = - "There was an issue with your libstdc++ file required for the Tensorflow native library.\n" - + "It can be installed or upgraded through gcc by following the instructions on the TensorFlow install page: https://docs.djl.ai/engines/tensorflow/index.html#note"; + "There was an issue with your libstdc++ file required for the Tensorflow" + + " native library.\n" + + "It can be installed or upgraded through gcc by following the" + + " instructions on the TensorFlow install page:" + + " https://docs.djl.ai/engines/tensorflow/index.html#note"; throw new EngineException(msg, t); } diff --git a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfModel.java b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfModel.java index 390df3bf2416..5247241e8dfd 100644 --- a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfModel.java +++ b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfModel.java @@ -19,7 +19,12 @@ import ai.djl.ndarray.NDManager; import ai.djl.nn.Block; import ai.djl.tensorflow.engine.javacpp.JavacppUtils; + import com.google.protobuf.InvalidProtocolBufferException; + +import org.tensorflow.proto.framework.ConfigProto; +import org.tensorflow.proto.framework.RunOptions; + import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; @@ -30,8 +35,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import org.tensorflow.proto.framework.ConfigProto; -import org.tensorflow.proto.framework.RunOptions; /** {@code TfModel} is the TensorFlow implementation of {@link Model}. */ public class TfModel extends BaseModel { diff --git a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfNDArray.java b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfNDArray.java index 563fefd9ff06..e1ff497bcf4d 100644 --- a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfNDArray.java +++ b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfNDArray.java @@ -25,6 +25,10 @@ import ai.djl.tensorflow.engine.javacpp.JavacppUtils; import ai.djl.util.NativeResource; import ai.djl.util.Preconditions; + +import org.tensorflow.internal.c_api.TFE_TensorHandle; +import org.tensorflow.internal.c_api.TF_Tensor; + import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.charset.Charset; @@ -33,8 +37,6 @@ import java.util.List; import java.util.stream.IntStream; import java.util.stream.LongStream; -import org.tensorflow.internal.c_api.TFE_TensorHandle; -import org.tensorflow.internal.c_api.TF_Tensor; /** {@code TfNDArray} is the TensorFlow implementation of {@link NDArray}. */ @SuppressWarnings("PMD.UseTryWithResources") diff --git a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfNDArrayEx.java b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfNDArrayEx.java index 52406eaaec26..8c20911378cb 100644 --- a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfNDArrayEx.java +++ b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfNDArrayEx.java @@ -23,9 +23,11 @@ import ai.djl.ndarray.types.Shape; import ai.djl.ndarray.types.SparseFormat; import ai.djl.nn.recurrent.RNN; -import java.util.List; + import org.tensorflow.internal.c_api.TFE_TensorHandle; +import java.util.List; + public class TfNDArrayEx implements NDArrayEx { private TfNDArray array; diff --git a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfNDManager.java b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfNDManager.java index 24af0248c662..3eded5b6fdcc 100644 --- a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfNDManager.java +++ b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfNDManager.java @@ -21,13 +21,15 @@ import ai.djl.ndarray.types.Shape; import ai.djl.tensorflow.engine.javacpp.JavacppUtils; import ai.djl.util.Pair; + +import org.tensorflow.internal.c_api.TFE_Context; +import org.tensorflow.internal.c_api.TFE_TensorHandle; +import org.tensorflow.internal.c_api.TF_Tensor; + import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.charset.Charset; -import org.tensorflow.internal.c_api.TFE_Context; -import org.tensorflow.internal.c_api.TFE_TensorHandle; -import org.tensorflow.internal.c_api.TF_Tensor; @SuppressWarnings("PMD.UseTryWithResources") public class TfNDManager extends BaseNDManager { diff --git a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfOpExecutor.java b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfOpExecutor.java index 91a1e826db4c..b73d84c104c7 100644 --- a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfOpExecutor.java +++ b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfOpExecutor.java @@ -18,9 +18,7 @@ import ai.djl.ndarray.types.DataType; import ai.djl.tensorflow.engine.javacpp.JavacppUtils; import ai.djl.util.Preconditions; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.concurrent.atomic.AtomicBoolean; + import org.bytedeco.javacpp.BytePointer; import org.bytedeco.javacpp.IntPointer; import org.bytedeco.javacpp.Pointer; @@ -32,6 +30,10 @@ import org.tensorflow.internal.c_api.TF_Status; import org.tensorflow.internal.c_api.global.tensorflow; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.concurrent.atomic.AtomicBoolean; + /** An {@code TfOpExecutor} for executing TensorFlow operation eagerly. */ final class TfOpExecutor implements AutoCloseable { diff --git a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfSymbolBlock.java b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfSymbolBlock.java index f0819808a9cb..b6a853bdc99b 100644 --- a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfSymbolBlock.java +++ b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfSymbolBlock.java @@ -25,12 +25,7 @@ import ai.djl.training.ParameterStore; import ai.djl.util.Pair; import ai.djl.util.PairList; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; + import org.bytedeco.javacpp.Pointer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,6 +38,13 @@ import org.tensorflow.proto.framework.TensorInfo; import org.tensorflow.proto.framework.TensorShapeProto; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** {@code TfSymbolBlock} is the TensorFlow implementation of {@link SymbolBlock}. */ public class TfSymbolBlock extends AbstractSymbolBlock implements AutoCloseable { @@ -77,10 +79,12 @@ public TfSymbolBlock(SavedModelBundle bundle, String signatureDefKey) { + "not found in Saved Model Bundle." + "Available keys: " + String.join(" ", keys) - + "Please use .optOption(\"SignatureDefKey\", \"value\") with Criteria.builder to load the model." - + "Normally the value is \"default\" for TF1.x models and \"serving_default\" for TF2.x models. " - + "Refer to: https://www.tensorflow.org/guide/saved_model" - + "Loading the model using next available key."); + + "Please use .optOption(\"SignatureDefKey\", \"value\") with" + + " Criteria.builder to load the model.Normally the value is" + + " \"default\" for TF1.x models and \"serving_default\" for TF2.x" + + " models. Refer to:" + + " https://www.tensorflow.org/guide/saved_modelLoading the model using" + + " next available key."); servingDefault = signatureDefMap.get(keys.iterator().next()); } describeInput(); @@ -179,9 +183,7 @@ public final PairList describeInput() { inputDescriptions.add( keys.get(i), new Shape( - shapeProto - .getDimList() - .stream() + shapeProto.getDimList().stream() .mapToLong(TensorShapeProto.Dim::getSize) .toArray())); Pair pair = @@ -220,9 +222,7 @@ public final PairList describeOutput() { outputDescriptions.add( key, new Shape( - shapeProto - .getDimList() - .stream() + shapeProto.getDimList().stream() .mapToLong(TensorShapeProto.Dim::getSize) .toArray())); Pair pair = diff --git a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/javacpp/JavacppUtils.java b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/javacpp/JavacppUtils.java index 18bd6153b70c..3dc894220773 100644 --- a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/javacpp/JavacppUtils.java +++ b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/javacpp/JavacppUtils.java @@ -21,13 +21,9 @@ import ai.djl.tensorflow.engine.TfDataType; import ai.djl.util.Pair; import ai.djl.util.cuda.CudaUtils; + import com.google.protobuf.InvalidProtocolBufferException; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.util.regex.Matcher; -import java.util.regex.Pattern; + import org.bytedeco.javacpp.BytePointer; import org.bytedeco.javacpp.Loader; import org.bytedeco.javacpp.Pointer; @@ -56,6 +52,13 @@ import org.tensorflow.proto.framework.MetaGraphDef; import org.tensorflow.proto.framework.RunOptions; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** A class containing utilities to interact with the TensorFlow Engine's Javacpp layer. */ public final class JavacppUtils { diff --git a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/javacpp/LibUtils.java b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/javacpp/LibUtils.java index bf818cad980e..01ec79b5661c 100644 --- a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/javacpp/LibUtils.java +++ b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/javacpp/LibUtils.java @@ -16,6 +16,10 @@ import ai.djl.util.ClassLoaderUtils; import ai.djl.util.Platform; import ai.djl.util.Utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -27,8 +31,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("MissingJavadocMethod") public final class LibUtils { diff --git a/engines/tensorflow/tensorflow-engine/src/test/java/ai/djl/tensorflow/engine/TfNDManagerTest.java b/engines/tensorflow/tensorflow-engine/src/test/java/ai/djl/tensorflow/engine/TfNDManagerTest.java index 13b981f0ad5d..de65e1838a9d 100644 --- a/engines/tensorflow/tensorflow-engine/src/test/java/ai/djl/tensorflow/engine/TfNDManagerTest.java +++ b/engines/tensorflow/tensorflow-engine/src/test/java/ai/djl/tensorflow/engine/TfNDManagerTest.java @@ -17,11 +17,13 @@ import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; import ai.djl.testing.TestRequirements; -import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; + import org.testng.Assert; import org.testng.annotations.Test; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; + public class TfNDManagerTest { @Test diff --git a/engines/tensorflow/tensorflow-engine/src/test/java/ai/djl/tensorflow/integration/TfCoverageTest.java b/engines/tensorflow/tensorflow-engine/src/test/java/ai/djl/tensorflow/integration/TfCoverageTest.java index e6ece4bcc13c..dc72342633d3 100644 --- a/engines/tensorflow/tensorflow-engine/src/test/java/ai/djl/tensorflow/integration/TfCoverageTest.java +++ b/engines/tensorflow/tensorflow-engine/src/test/java/ai/djl/tensorflow/integration/TfCoverageTest.java @@ -16,9 +16,11 @@ import ai.djl.tensorflow.engine.TfEngine; import ai.djl.testing.CoverageUtils; import ai.djl.testing.TestRequirements; + +import org.testng.annotations.Test; + import java.io.IOException; import java.net.URISyntaxException; -import org.testng.annotations.Test; public class TfCoverageTest { diff --git a/engines/tensorflow/tensorflow-model-zoo/src/main/java/ai/djl/tensorflow/zoo/TfModelZoo.java b/engines/tensorflow/tensorflow-model-zoo/src/main/java/ai/djl/tensorflow/zoo/TfModelZoo.java index e96230edae28..ac27a9e3bc46 100644 --- a/engines/tensorflow/tensorflow-model-zoo/src/main/java/ai/djl/tensorflow/zoo/TfModelZoo.java +++ b/engines/tensorflow/tensorflow-model-zoo/src/main/java/ai/djl/tensorflow/zoo/TfModelZoo.java @@ -20,6 +20,7 @@ import ai.djl.repository.zoo.ModelLoader; import ai.djl.repository.zoo.ModelZoo; import ai.djl.tensorflow.engine.TfEngine; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/engines/tensorflow/tensorflow-model-zoo/src/main/java/ai/djl/tensorflow/zoo/cv/objectdetction/TfSsdTranslator.java b/engines/tensorflow/tensorflow-model-zoo/src/main/java/ai/djl/tensorflow/zoo/cv/objectdetction/TfSsdTranslator.java index 6fad59097186..47bdf0c4601c 100644 --- a/engines/tensorflow/tensorflow-model-zoo/src/main/java/ai/djl/tensorflow/zoo/cv/objectdetction/TfSsdTranslator.java +++ b/engines/tensorflow/tensorflow-model-zoo/src/main/java/ai/djl/tensorflow/zoo/cv/objectdetction/TfSsdTranslator.java @@ -21,6 +21,7 @@ import ai.djl.ndarray.NDList; import ai.djl.translate.ArgumentsUtil; import ai.djl.translate.TranslatorContext; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/engines/tensorflow/tensorflow-model-zoo/src/main/java/ai/djl/tensorflow/zoo/cv/objectdetction/TfSsdTranslatorFactory.java b/engines/tensorflow/tensorflow-model-zoo/src/main/java/ai/djl/tensorflow/zoo/cv/objectdetction/TfSsdTranslatorFactory.java index d240949536bc..aa54457d0c29 100644 --- a/engines/tensorflow/tensorflow-model-zoo/src/main/java/ai/djl/tensorflow/zoo/cv/objectdetction/TfSsdTranslatorFactory.java +++ b/engines/tensorflow/tensorflow-model-zoo/src/main/java/ai/djl/tensorflow/zoo/cv/objectdetction/TfSsdTranslatorFactory.java @@ -24,6 +24,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/engines/tensorflow/tensorflow-model-zoo/src/test/java/ai/djl/tensorflow/integration/modality/cv/MobileNetTest.java b/engines/tensorflow/tensorflow-model-zoo/src/test/java/ai/djl/tensorflow/integration/modality/cv/MobileNetTest.java index d3f79abb25c9..e28228c087d7 100644 --- a/engines/tensorflow/tensorflow-model-zoo/src/test/java/ai/djl/tensorflow/integration/modality/cv/MobileNetTest.java +++ b/engines/tensorflow/tensorflow-model-zoo/src/test/java/ai/djl/tensorflow/integration/modality/cv/MobileNetTest.java @@ -23,11 +23,13 @@ import ai.djl.testing.TestRequirements; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; -import org.testng.Assert; -import org.testng.annotations.Test; public class MobileNetTest { diff --git a/engines/tensorflow/tensorflow-model-zoo/src/test/java/ai/djl/tensorflow/integration/modality/cv/ResNetTest.java b/engines/tensorflow/tensorflow-model-zoo/src/test/java/ai/djl/tensorflow/integration/modality/cv/ResNetTest.java index bf1c3f166075..261940548e31 100644 --- a/engines/tensorflow/tensorflow-model-zoo/src/test/java/ai/djl/tensorflow/integration/modality/cv/ResNetTest.java +++ b/engines/tensorflow/tensorflow-model-zoo/src/test/java/ai/djl/tensorflow/integration/modality/cv/ResNetTest.java @@ -23,11 +23,13 @@ import ai.djl.testing.TestRequirements; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; -import org.testng.Assert; -import org.testng.annotations.Test; public class ResNetTest { diff --git a/engines/tensorflow/tensorflow-model-zoo/src/test/java/ai/djl/tensorflow/integration/modality/cv/TfSsdTest.java b/engines/tensorflow/tensorflow-model-zoo/src/test/java/ai/djl/tensorflow/integration/modality/cv/TfSsdTest.java index bc5921194df2..649ca193b5f7 100644 --- a/engines/tensorflow/tensorflow-model-zoo/src/test/java/ai/djl/tensorflow/integration/modality/cv/TfSsdTest.java +++ b/engines/tensorflow/tensorflow-model-zoo/src/test/java/ai/djl/tensorflow/integration/modality/cv/TfSsdTest.java @@ -26,14 +26,16 @@ import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; import ai.djl.util.Pair; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; import java.util.stream.Collectors; -import org.testng.Assert; -import org.testng.annotations.Test; public class TfSsdTest { @@ -70,8 +72,7 @@ public void testTfSSD() throws IOException, ModelException, TranslateException { DetectedObjects result = predictor.predict(img); List classes = - result.items() - .stream() + result.items().stream() .map(Classifications.Classification::getClassName) .collect(Collectors.toList()); Assert.assertTrue(classes.contains("Dog")); diff --git a/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtEngine.java b/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtEngine.java index 343abac7e8c2..afc25f02aa00 100644 --- a/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtEngine.java +++ b/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtEngine.java @@ -22,6 +22,7 @@ import ai.djl.tensorrt.jni.JniUtils; import ai.djl.tensorrt.jni.LibUtils; import ai.djl.training.GradientCollector; + import java.io.FileNotFoundException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtModel.java b/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtModel.java index 401f3be92c7e..e151cda5d3fa 100644 --- a/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtModel.java +++ b/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtModel.java @@ -19,6 +19,7 @@ import ai.djl.ndarray.types.DataType; import ai.djl.tensorrt.jni.JniUtils; import ai.djl.translate.Translator; + import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; diff --git a/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtNDArray.java b/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtNDArray.java index eea5427f9613..7f59bc8a948a 100644 --- a/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtNDArray.java +++ b/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtNDArray.java @@ -18,6 +18,7 @@ import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; + import java.nio.Buffer; import java.nio.ByteBuffer; import java.util.UUID; diff --git a/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtNDManager.java b/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtNDManager.java index 21d5ea13cad7..dbd689856924 100644 --- a/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtNDManager.java +++ b/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtNDManager.java @@ -20,6 +20,7 @@ import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; import ai.djl.util.Float16Utils; + import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtSession.java b/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtSession.java index 3a19c74008ca..7cbae728e4ee 100644 --- a/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtSession.java +++ b/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtSession.java @@ -21,11 +21,13 @@ import ai.djl.tensorrt.jni.JniUtils; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; -import java.nio.ByteBuffer; -import java.util.Arrays; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.nio.ByteBuffer; +import java.util.Arrays; + /** {@code TrtSession} represents the TensorRT's execution context. */ public class TrtSession extends AbstractBlock implements AutoCloseable { diff --git a/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtSymbolBlock.java b/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtSymbolBlock.java index 232a7fb8dbb7..ee4ab8ff90ca 100644 --- a/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtSymbolBlock.java +++ b/engines/tensorrt/src/main/java/ai/djl/tensorrt/engine/TrtSymbolBlock.java @@ -20,6 +20,7 @@ import ai.djl.tensorrt.jni.JniUtils; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.util.concurrent.atomic.AtomicReference; /** diff --git a/engines/tensorrt/src/main/java/ai/djl/tensorrt/jni/JniUtils.java b/engines/tensorrt/src/main/java/ai/djl/tensorrt/jni/JniUtils.java index fad1fb1afe6d..456805ae04a5 100644 --- a/engines/tensorrt/src/main/java/ai/djl/tensorrt/jni/JniUtils.java +++ b/engines/tensorrt/src/main/java/ai/djl/tensorrt/jni/JniUtils.java @@ -14,11 +14,13 @@ import ai.djl.Device; import ai.djl.ndarray.types.DataType; -import java.nio.ByteBuffer; -import java.util.Map; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.nio.ByteBuffer; +import java.util.Map; + /** * A class containing utilities to interact with the PyTorch Engine's Java Native Interface (JNI) * layer. diff --git a/engines/tensorrt/src/main/java/ai/djl/tensorrt/jni/LibUtils.java b/engines/tensorrt/src/main/java/ai/djl/tensorrt/jni/LibUtils.java index 2adb3bb65110..bc2289c87945 100644 --- a/engines/tensorrt/src/main/java/ai/djl/tensorrt/jni/LibUtils.java +++ b/engines/tensorrt/src/main/java/ai/djl/tensorrt/jni/LibUtils.java @@ -15,13 +15,15 @@ import ai.djl.util.ClassLoaderUtils; import ai.djl.util.Platform; import ai.djl.util.Utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Utilities for finding the TensorRT Engine binary on the System. diff --git a/engines/tensorrt/src/test/java/ai/djl/tensorrt/engine/TrtEngineTest.java b/engines/tensorrt/src/test/java/ai/djl/tensorrt/engine/TrtEngineTest.java index 72fe29a78bf4..11edfd9c49df 100644 --- a/engines/tensorrt/src/test/java/ai/djl/tensorrt/engine/TrtEngineTest.java +++ b/engines/tensorrt/src/test/java/ai/djl/tensorrt/engine/TrtEngineTest.java @@ -13,6 +13,7 @@ package ai.djl.tensorrt.engine; import ai.djl.engine.Engine; + import org.testng.Assert; import org.testng.SkipException; import org.testng.annotations.Test; diff --git a/engines/tensorrt/src/test/java/ai/djl/tensorrt/engine/TrtNDManagerTest.java b/engines/tensorrt/src/test/java/ai/djl/tensorrt/engine/TrtNDManagerTest.java index d52b450741d2..24d734af54c8 100644 --- a/engines/tensorrt/src/test/java/ai/djl/tensorrt/engine/TrtNDManagerTest.java +++ b/engines/tensorrt/src/test/java/ai/djl/tensorrt/engine/TrtNDManagerTest.java @@ -16,6 +16,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.Shape; + import org.testng.Assert; import org.testng.SkipException; import org.testng.annotations.Test; diff --git a/engines/tensorrt/src/test/java/ai/djl/tensorrt/integration/TrtTest.java b/engines/tensorrt/src/test/java/ai/djl/tensorrt/integration/TrtTest.java index a71aaaeb6642..105e057ba0aa 100644 --- a/engines/tensorrt/src/test/java/ai/djl/tensorrt/integration/TrtTest.java +++ b/engines/tensorrt/src/test/java/ai/djl/tensorrt/integration/TrtTest.java @@ -29,6 +29,11 @@ import ai.djl.translate.TranslateException; import ai.djl.translate.TranslatorContext; import ai.djl.util.cuda.CudaUtils; + +import org.testng.Assert; +import org.testng.SkipException; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.FloatBuffer; import java.nio.file.Path; @@ -36,9 +41,6 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.testng.Assert; -import org.testng.SkipException; -import org.testng.annotations.Test; public class TrtTest { diff --git a/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/LibUtils.java b/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/LibUtils.java index e17e0f6b17f3..03d6946c8f9d 100644 --- a/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/LibUtils.java +++ b/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/LibUtils.java @@ -15,6 +15,10 @@ import ai.djl.util.ClassLoaderUtils; import ai.djl.util.Platform; import ai.djl.util.Utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -25,8 +29,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Utilities for finding the TFLite Engine binary on the System. diff --git a/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteDataType.java b/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteDataType.java index 07ff4aa60a00..fdf4e4d99c03 100644 --- a/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteDataType.java +++ b/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteDataType.java @@ -13,6 +13,7 @@ package ai.djl.tflite.engine; import ai.djl.ndarray.types.DataType; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteModel.java b/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteModel.java index 5e0cdc57055c..5eddb64eed3d 100644 --- a/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteModel.java +++ b/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteModel.java @@ -18,6 +18,9 @@ import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.DataType; import ai.djl.util.Utils; + +import org.tensorflow.lite.Interpreter; + import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; @@ -25,7 +28,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Map; -import org.tensorflow.lite.Interpreter; /** * {@code TfLiteModel} is the TFLite implementation of {@link Model}. diff --git a/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteNDArray.java b/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteNDArray.java index 645f777a58f4..d692e7e83547 100644 --- a/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteNDArray.java +++ b/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteNDArray.java @@ -17,10 +17,12 @@ import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; + +import org.tensorflow.lite.Tensor; + import java.nio.ByteBuffer; import java.util.Arrays; import java.util.UUID; -import org.tensorflow.lite.Tensor; /** {@code TfLiteNDArray} is the TFLite implementation of {@link NDArray}. */ public class TfLiteNDArray extends NDArrayAdapter { diff --git a/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteNDManager.java b/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteNDManager.java index 4b2274ad7b8b..778b0eeed576 100644 --- a/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteNDManager.java +++ b/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteNDManager.java @@ -19,10 +19,12 @@ import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; + +import org.tensorflow.lite.Tensor; + import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.tensorflow.lite.Tensor; /** {@code TfLiteNDManager} is the TFLite implementation of {@link NDManager}. */ public class TfLiteNDManager extends BaseNDManager { diff --git a/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteSymbolBlock.java b/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteSymbolBlock.java index 360801d72f87..61bdb672bba4 100644 --- a/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteSymbolBlock.java +++ b/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/engine/TfLiteSymbolBlock.java @@ -20,9 +20,11 @@ import ai.djl.nn.SymbolBlock; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + +import org.tensorflow.lite.Interpreter; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.tensorflow.lite.Interpreter; /** * {@code TfLiteSymbolBlock} is the TFLite implementation of {@link SymbolBlock}. diff --git a/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/zoo/TfLiteModelZoo.java b/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/zoo/TfLiteModelZoo.java index ab19a6c099a6..6c1ec7875347 100644 --- a/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/zoo/TfLiteModelZoo.java +++ b/engines/tflite/tflite-engine/src/main/java/ai/djl/tflite/zoo/TfLiteModelZoo.java @@ -19,6 +19,7 @@ import ai.djl.repository.zoo.ModelLoader; import ai.djl.repository.zoo.ModelZoo; import ai.djl.tflite.engine.TfLiteEngine; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/engines/tflite/tflite-engine/src/main/java/org/tensorflow/lite/Interpreter.java b/engines/tflite/tflite-engine/src/main/java/org/tensorflow/lite/Interpreter.java index 2bfda7561352..a1529da9ca01 100644 --- a/engines/tflite/tflite-engine/src/main/java/org/tensorflow/lite/Interpreter.java +++ b/engines/tflite/tflite-engine/src/main/java/org/tensorflow/lite/Interpreter.java @@ -119,8 +119,8 @@ public void runSignature( } if (methodName == null) { throw new IllegalArgumentException( - "Input error: SignatureDef methodName should not be null. null is only allowed if the" - + " model has a single Signature. Available Signatures: " + "Input error: SignatureDef methodName should not be null. null is only allowed" + + " if the model has a single Signature. Available Signatures: " + Arrays.toString(signatureNameList)); } wrapper.runSignature(inputs, outputs, methodName); @@ -174,8 +174,8 @@ public Tensor getInputTensorFromSignature(String inputName, String methodName) { } if (methodName == null) { throw new IllegalArgumentException( - "Input error: SignatureDef methodName should not be null. null is only allowed if the" - + " model has a single Signature. Available Signatures: " + "Input error: SignatureDef methodName should not be null. null is only allowed" + + " if the model has a single Signature. Available Signatures: " + Arrays.toString(signatureNameList)); } return wrapper.getInputTensor(inputName, methodName); @@ -221,8 +221,8 @@ public Tensor getOutputTensorFromSignature(String outputName, String methodName) } if (methodName == null) { throw new IllegalArgumentException( - "Input error: SignatureDef methodName should not be null. null is only allowed if the" - + " model has a single Signature. Available Signatures: " + "Input error: SignatureDef methodName should not be null. null is only allowed" + + " if the model has a single Signature. Available Signatures: " + Arrays.toString(signatureNameList)); } return wrapper.getOutputTensor(outputName, methodName); diff --git a/engines/tflite/tflite-engine/src/main/java/org/tensorflow/lite/NativeInterpreterWrapper.java b/engines/tflite/tflite-engine/src/main/java/org/tensorflow/lite/NativeInterpreterWrapper.java index d54a6b00bf48..490bf3566f5f 100644 --- a/engines/tflite/tflite-engine/src/main/java/org/tensorflow/lite/NativeInterpreterWrapper.java +++ b/engines/tflite/tflite-engine/src/main/java/org/tensorflow/lite/NativeInterpreterWrapper.java @@ -15,6 +15,8 @@ package org.tensorflow.lite; +import org.tensorflow.lite.nnapi.NnApiDelegate; + import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.MappedByteBuffer; @@ -23,7 +25,6 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import org.tensorflow.lite.nnapi.NnApiDelegate; final class NativeInterpreterWrapper implements AutoCloseable { @@ -48,8 +49,9 @@ final class NativeInterpreterWrapper implements AutoCloseable { || (!(buffer instanceof MappedByteBuffer) && (!buffer.isDirect() || buffer.order() != ByteOrder.nativeOrder()))) { throw new IllegalArgumentException( - "Model ByteBuffer should be either a MappedByteBuffer of the model file, or a direct " - + "ByteBuffer using ByteOrder.nativeOrder() which contains bytes of model content."); + "Model ByteBuffer should be either a MappedByteBuffer of the model file, or a" + + " direct ByteBuffer using ByteOrder.nativeOrder() which contains bytes of" + + " model content."); } this.modelByteBuffer = buffer; long errorHandle = createErrorReporter(ERROR_BUFFER_SIZE); @@ -272,8 +274,8 @@ int getInputIndex(String name) { } else { throw new IllegalArgumentException( String.format( - "Input error: '%s' is not a valid name for any input. Names of inputs and their " - + "indexes are %s", + "Input error: '%s' is not a valid name for any input. Names of inputs" + + " and their indexes are %s", name, inputsIndexes)); } } @@ -311,8 +313,8 @@ int getOutputIndex(String name) { } else { throw new IllegalArgumentException( String.format( - "Input error: '%s' is not a valid name for any output. Names of outputs and their " - + "indexes are %s", + "Input error: '%s' is not a valid name for any output. Names of outputs" + + " and their indexes are %s", name, outputsIndexes)); } } @@ -416,7 +418,8 @@ int getExecutionPlanLength() { void setCancelled(boolean value) { if (cancellationFlagHandle == 0) { throw new IllegalStateException( - "Cannot cancel the inference. Have you called Interpreter.Options.setCancellable?"); + "Cannot cancel the inference. Have you called" + + " Interpreter.Options.setCancellable?"); } setCancelled(interpreterHandle, cancellationFlagHandle, value); } diff --git a/engines/tflite/tflite-engine/src/main/java/org/tensorflow/lite/Tensor.java b/engines/tflite/tflite-engine/src/main/java/org/tensorflow/lite/Tensor.java index a1f256f5f0a0..495885c25fac 100644 --- a/engines/tflite/tflite-engine/src/main/java/org/tensorflow/lite/Tensor.java +++ b/engines/tflite/tflite-engine/src/main/java/org/tensorflow/lite/Tensor.java @@ -351,8 +351,9 @@ private void throwIfTypeIsIncompatible(Object o) { throw new IllegalArgumentException( String.format( - "Cannot convert between a TensorFlowLite tensor with type %s and a Java " - + "object of type %s (which is compatible with the TensorFlowLite type %s).", + "Cannot convert between a TensorFlowLite tensor with type %s and a Java" + + " object of type %s (which is compatible with the TensorFlowLite" + + " type %s).", dtype, o.getClass().getName(), oType)); } } @@ -381,8 +382,8 @@ private void throwIfSrcShapeIsIncompatible(Object src) { if (!Arrays.equals(srcShape, shapeCopy)) { throw new IllegalArgumentException( String.format( - "Cannot copy to a TensorFlowLite tensor (%s) with shape %s from a Java object " - + "with shape %s.", + "Cannot copy to a TensorFlowLite tensor (%s) with shape %s from a Java" + + " object with shape %s.", name(), Arrays.toString(shapeCopy), Arrays.toString(srcShape))); } } @@ -411,8 +412,8 @@ private void throwIfDstShapeIsIncompatible(Object dst) { if (!Arrays.equals(dstShape, shapeCopy)) { throw new IllegalArgumentException( String.format( - "Cannot copy from a TensorFlowLite tensor (%s) with shape %s to a Java object " - + "with shape %s.", + "Cannot copy from a TensorFlowLite tensor (%s) with shape %s to a Java" + + " object with shape %s.", name(), Arrays.toString(shapeCopy), Arrays.toString(dstShape))); } } diff --git a/engines/tflite/tflite-engine/src/test/java/ai/djl/tflite/engine/TfLiteNDManagerTest.java b/engines/tflite/tflite-engine/src/test/java/ai/djl/tflite/engine/TfLiteNDManagerTest.java index bea89e80fe73..ec3e6e589a28 100644 --- a/engines/tflite/tflite-engine/src/test/java/ai/djl/tflite/engine/TfLiteNDManagerTest.java +++ b/engines/tflite/tflite-engine/src/test/java/ai/djl/tflite/engine/TfLiteNDManagerTest.java @@ -16,6 +16,7 @@ import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.Shape; import ai.djl.testing.TestRequirements; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/engines/tflite/tflite-engine/src/test/java/ai/djl/tflite/engine/TfLiteTest.java b/engines/tflite/tflite-engine/src/test/java/ai/djl/tflite/engine/TfLiteTest.java index 6188246afd2c..afa27ddfb5e5 100644 --- a/engines/tflite/tflite-engine/src/test/java/ai/djl/tflite/engine/TfLiteTest.java +++ b/engines/tflite/tflite-engine/src/test/java/ai/djl/tflite/engine/TfLiteTest.java @@ -22,12 +22,14 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; -import org.testng.Assert; -import org.testng.annotations.Test; public class TfLiteTest { diff --git a/examples/src/main/java/ai/djl/examples/inference/ActionRecognition.java b/examples/src/main/java/ai/djl/examples/inference/ActionRecognition.java index 0eea3cbf941a..c088c5df97fa 100644 --- a/examples/src/main/java/ai/djl/examples/inference/ActionRecognition.java +++ b/examples/src/main/java/ai/djl/examples/inference/ActionRecognition.java @@ -22,11 +22,13 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * An example of inference using an action recognition model. diff --git a/examples/src/main/java/ai/djl/examples/inference/BertClassification.java b/examples/src/main/java/ai/djl/examples/inference/BertClassification.java index 812796ac9035..11e8b4f7a4d8 100644 --- a/examples/src/main/java/ai/djl/examples/inference/BertClassification.java +++ b/examples/src/main/java/ai/djl/examples/inference/BertClassification.java @@ -29,6 +29,10 @@ import ai.djl.translate.NoBatchifyTranslator; import ai.djl.translate.TranslateException; import ai.djl.translate.TranslatorContext; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.file.Paths; import java.util.ArrayList; @@ -36,8 +40,6 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * The example is targeted to specific use case for BERT classification. TODO make it generic enough @@ -129,8 +131,7 @@ public NDList processInput(TranslatorContext ctx, String[] inputs) { private NDArray stackInputs(List tokenizedInputs, int index, String inputName) { NDArray stacked = NDArrays.stack( - tokenizedInputs - .stream() + tokenizedInputs.stream() .map(list -> list.get(index).expandDims(0)) .collect(Collectors.toCollection(NDList::new))); stacked.setName(inputName); diff --git a/examples/src/main/java/ai/djl/examples/inference/BertQaInference.java b/examples/src/main/java/ai/djl/examples/inference/BertQaInference.java index 3230ba0f42fb..010490698b1c 100644 --- a/examples/src/main/java/ai/djl/examples/inference/BertQaInference.java +++ b/examples/src/main/java/ai/djl/examples/inference/BertQaInference.java @@ -22,10 +22,12 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + /** * An example of inference using BertQA. * diff --git a/examples/src/main/java/ai/djl/examples/inference/BigGAN.java b/examples/src/main/java/ai/djl/examples/inference/BigGAN.java index f84e693f78ab..3d215aadbe45 100644 --- a/examples/src/main/java/ai/djl/examples/inference/BigGAN.java +++ b/examples/src/main/java/ai/djl/examples/inference/BigGAN.java @@ -20,12 +20,14 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** An example of generation using BigGAN. */ public final class BigGAN { diff --git a/examples/src/main/java/ai/djl/examples/inference/ImageClassification.java b/examples/src/main/java/ai/djl/examples/inference/ImageClassification.java index 69ae0f4422cf..386ea066cd18 100644 --- a/examples/src/main/java/ai/djl/examples/inference/ImageClassification.java +++ b/examples/src/main/java/ai/djl/examples/inference/ImageClassification.java @@ -23,14 +23,16 @@ import ai.djl.modality.cv.translator.ImageClassificationTranslator; import ai.djl.translate.TranslateException; import ai.djl.translate.Translator; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * An example of inference using an image classification model. diff --git a/examples/src/main/java/ai/djl/examples/inference/InstanceSegmentation.java b/examples/src/main/java/ai/djl/examples/inference/InstanceSegmentation.java index cd85b059f34a..45890cf2b33f 100644 --- a/examples/src/main/java/ai/djl/examples/inference/InstanceSegmentation.java +++ b/examples/src/main/java/ai/djl/examples/inference/InstanceSegmentation.java @@ -22,12 +22,14 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * An example of inference using an instance segmentation model. diff --git a/examples/src/main/java/ai/djl/examples/inference/ListModels.java b/examples/src/main/java/ai/djl/examples/inference/ListModels.java index 1d5eeab15c7f..9e5f8cb7bd08 100644 --- a/examples/src/main/java/ai/djl/examples/inference/ListModels.java +++ b/examples/src/main/java/ai/djl/examples/inference/ListModels.java @@ -16,11 +16,13 @@ import ai.djl.repository.Artifact; import ai.djl.repository.zoo.ModelNotFoundException; import ai.djl.repository.zoo.ModelZoo; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public final class ListModels { diff --git a/examples/src/main/java/ai/djl/examples/inference/ObjectDetection.java b/examples/src/main/java/ai/djl/examples/inference/ObjectDetection.java index e0d63afc7d28..08643cb3b969 100644 --- a/examples/src/main/java/ai/djl/examples/inference/ObjectDetection.java +++ b/examples/src/main/java/ai/djl/examples/inference/ObjectDetection.java @@ -23,12 +23,14 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * An example of inference using an object detection model. diff --git a/examples/src/main/java/ai/djl/examples/inference/ObjectDetectionWithTensorflowSavedModel.java b/examples/src/main/java/ai/djl/examples/inference/ObjectDetectionWithTensorflowSavedModel.java index 73578b7746b9..c3eb831486b2 100644 --- a/examples/src/main/java/ai/djl/examples/inference/ObjectDetectionWithTensorflowSavedModel.java +++ b/examples/src/main/java/ai/djl/examples/inference/ObjectDetectionWithTensorflowSavedModel.java @@ -31,7 +31,12 @@ import ai.djl.translate.TranslateException; import ai.djl.translate.TranslatorContext; import ai.djl.util.JsonUtils; + import com.google.gson.annotations.SerializedName; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; @@ -46,8 +51,6 @@ import java.util.Objects; import java.util.Scanner; import java.util.concurrent.ConcurrentHashMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * An example of inference of object detection using saved model from TensorFlow 2 Detection Model diff --git a/examples/src/main/java/ai/djl/examples/inference/PoseEstimation.java b/examples/src/main/java/ai/djl/examples/inference/PoseEstimation.java index b5b8e0c4221f..080ede4af4db 100644 --- a/examples/src/main/java/ai/djl/examples/inference/PoseEstimation.java +++ b/examples/src/main/java/ai/djl/examples/inference/PoseEstimation.java @@ -26,14 +26,16 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collections; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * An example of inference using a pose estimation model. diff --git a/examples/src/main/java/ai/djl/examples/inference/SentimentAnalysis.java b/examples/src/main/java/ai/djl/examples/inference/SentimentAnalysis.java index 78f21bba4e9e..e83e27fcc87c 100644 --- a/examples/src/main/java/ai/djl/examples/inference/SentimentAnalysis.java +++ b/examples/src/main/java/ai/djl/examples/inference/SentimentAnalysis.java @@ -24,10 +24,12 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + /** * An example of inference using DistilBERT for Sentiment Analysis. * diff --git a/examples/src/main/java/ai/djl/examples/inference/StyleTransfer.java b/examples/src/main/java/ai/djl/examples/inference/StyleTransfer.java index cbaed9525cc9..0b3b53192e78 100644 --- a/examples/src/main/java/ai/djl/examples/inference/StyleTransfer.java +++ b/examples/src/main/java/ai/djl/examples/inference/StyleTransfer.java @@ -24,12 +24,14 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public final class StyleTransfer { diff --git a/examples/src/main/java/ai/djl/examples/inference/UniversalSentenceEncoder.java b/examples/src/main/java/ai/djl/examples/inference/UniversalSentenceEncoder.java index 7202f93d480f..0069a48b0133 100644 --- a/examples/src/main/java/ai/djl/examples/inference/UniversalSentenceEncoder.java +++ b/examples/src/main/java/ai/djl/examples/inference/UniversalSentenceEncoder.java @@ -27,13 +27,15 @@ import ai.djl.translate.NoBatchifyTranslator; import ai.djl.translate.TranslateException; import ai.djl.translate.TranslatorContext; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * An example of inference using an universal sentence encoder model from TensorFlow Hub. diff --git a/examples/src/main/java/ai/djl/examples/inference/face/FaceDetectionTranslator.java b/examples/src/main/java/ai/djl/examples/inference/face/FaceDetectionTranslator.java index dae65394617c..c5a04065d5f5 100644 --- a/examples/src/main/java/ai/djl/examples/inference/face/FaceDetectionTranslator.java +++ b/examples/src/main/java/ai/djl/examples/inference/face/FaceDetectionTranslator.java @@ -26,6 +26,7 @@ import ai.djl.ndarray.types.Shape; import ai.djl.translate.Translator; import ai.djl.translate.TranslatorContext; + import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/examples/src/main/java/ai/djl/examples/inference/face/FeatureComparison.java b/examples/src/main/java/ai/djl/examples/inference/face/FeatureComparison.java index c8afa2fe69ec..6dd68da7966a 100644 --- a/examples/src/main/java/ai/djl/examples/inference/face/FeatureComparison.java +++ b/examples/src/main/java/ai/djl/examples/inference/face/FeatureComparison.java @@ -16,11 +16,13 @@ import ai.djl.modality.cv.Image; import ai.djl.modality.cv.ImageFactory; import ai.djl.translate.TranslateException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public final class FeatureComparison { diff --git a/examples/src/main/java/ai/djl/examples/inference/face/FeatureExtraction.java b/examples/src/main/java/ai/djl/examples/inference/face/FeatureExtraction.java index 97c36af08dbe..550cecdc3074 100644 --- a/examples/src/main/java/ai/djl/examples/inference/face/FeatureExtraction.java +++ b/examples/src/main/java/ai/djl/examples/inference/face/FeatureExtraction.java @@ -27,12 +27,14 @@ 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.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public final class FeatureExtraction { diff --git a/examples/src/main/java/ai/djl/examples/inference/face/LightFaceDetection.java b/examples/src/main/java/ai/djl/examples/inference/face/LightFaceDetection.java index 2a89d96a52b8..1e55c6edd6a2 100644 --- a/examples/src/main/java/ai/djl/examples/inference/face/LightFaceDetection.java +++ b/examples/src/main/java/ai/djl/examples/inference/face/LightFaceDetection.java @@ -21,12 +21,14 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * An example of inference using a face detection model. diff --git a/examples/src/main/java/ai/djl/examples/inference/face/RetinaFaceDetection.java b/examples/src/main/java/ai/djl/examples/inference/face/RetinaFaceDetection.java index 871d539487d9..4109649b0c93 100644 --- a/examples/src/main/java/ai/djl/examples/inference/face/RetinaFaceDetection.java +++ b/examples/src/main/java/ai/djl/examples/inference/face/RetinaFaceDetection.java @@ -21,12 +21,14 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * An example of inference using a face detection model. diff --git a/examples/src/main/java/ai/djl/examples/inference/sr/SuperResolution.java b/examples/src/main/java/ai/djl/examples/inference/sr/SuperResolution.java index 4830c9cbbb61..81e75b8ce45f 100644 --- a/examples/src/main/java/ai/djl/examples/inference/sr/SuperResolution.java +++ b/examples/src/main/java/ai/djl/examples/inference/sr/SuperResolution.java @@ -28,6 +28,10 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -35,8 +39,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public final class SuperResolution { diff --git a/examples/src/main/java/ai/djl/examples/training/TicTacToe.java b/examples/src/main/java/ai/djl/examples/training/TicTacToe.java index 893144505196..3b31881a5b77 100644 --- a/examples/src/main/java/ai/djl/examples/training/TicTacToe.java +++ b/examples/src/main/java/ai/djl/examples/training/TicTacToe.java @@ -19,6 +19,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDList; import ai.djl.ndarray.NDManager; + import java.util.Arrays; /** A simple {@link RlEnv} for playing TicTacToe. */ diff --git a/examples/src/main/java/ai/djl/examples/training/TrainBertOnCode.java b/examples/src/main/java/ai/djl/examples/training/TrainBertOnCode.java index 5adb69229f93..aa2b12af4205 100644 --- a/examples/src/main/java/ai/djl/examples/training/TrainBertOnCode.java +++ b/examples/src/main/java/ai/djl/examples/training/TrainBertOnCode.java @@ -36,6 +36,7 @@ import ai.djl.training.tracker.WarmUpTracker; import ai.djl.training.tracker.WarmUpTracker.Mode; import ai.djl.translate.TranslateException; + import java.io.IOException; /** Simple example that performs Bert pretraining on the java source files in this repo. */ diff --git a/examples/src/main/java/ai/djl/examples/training/TrainCaptcha.java b/examples/src/main/java/ai/djl/examples/training/TrainCaptcha.java index 184ff3908ad8..570dd7e6b655 100644 --- a/examples/src/main/java/ai/djl/examples/training/TrainCaptcha.java +++ b/examples/src/main/java/ai/djl/examples/training/TrainCaptcha.java @@ -39,6 +39,7 @@ import ai.djl.training.loss.SoftmaxCrossEntropyLoss; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + import java.io.IOException; /** diff --git a/examples/src/main/java/ai/djl/examples/training/TrainMnist.java b/examples/src/main/java/ai/djl/examples/training/TrainMnist.java index 19a8d529191a..786a71bfbed5 100644 --- a/examples/src/main/java/ai/djl/examples/training/TrainMnist.java +++ b/examples/src/main/java/ai/djl/examples/training/TrainMnist.java @@ -32,6 +32,7 @@ import ai.djl.training.loss.Loss; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + import java.io.IOException; /** diff --git a/examples/src/main/java/ai/djl/examples/training/TrainMnistWithLSTM.java b/examples/src/main/java/ai/djl/examples/training/TrainMnistWithLSTM.java index 0b4bdd34ebea..fa6e7641ba49 100644 --- a/examples/src/main/java/ai/djl/examples/training/TrainMnistWithLSTM.java +++ b/examples/src/main/java/ai/djl/examples/training/TrainMnistWithLSTM.java @@ -36,6 +36,7 @@ import ai.djl.training.loss.Loss; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + import java.io.IOException; public final class TrainMnistWithLSTM { diff --git a/examples/src/main/java/ai/djl/examples/training/TrainPikachu.java b/examples/src/main/java/ai/djl/examples/training/TrainPikachu.java index 9c87eedfac12..1c11df399fbd 100644 --- a/examples/src/main/java/ai/djl/examples/training/TrainPikachu.java +++ b/examples/src/main/java/ai/djl/examples/training/TrainPikachu.java @@ -46,6 +46,7 @@ import ai.djl.training.util.ProgressBar; import ai.djl.translate.Pipeline; import ai.djl.translate.TranslateException; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/examples/src/main/java/ai/djl/examples/training/TrainSentimentAnalysis.java b/examples/src/main/java/ai/djl/examples/training/TrainSentimentAnalysis.java index a56bf30b0432..4ea222aeb204 100644 --- a/examples/src/main/java/ai/djl/examples/training/TrainSentimentAnalysis.java +++ b/examples/src/main/java/ai/djl/examples/training/TrainSentimentAnalysis.java @@ -56,6 +56,7 @@ import ai.djl.translate.TranslateException; import ai.djl.translate.Translator; import ai.djl.translate.TranslatorContext; + import java.io.IOException; import java.util.Arrays; import java.util.Collections; diff --git a/examples/src/main/java/ai/djl/examples/training/TrainSeq2Seq.java b/examples/src/main/java/ai/djl/examples/training/TrainSeq2Seq.java index 2e0804dcc34f..bf77b321a766 100644 --- a/examples/src/main/java/ai/djl/examples/training/TrainSeq2Seq.java +++ b/examples/src/main/java/ai/djl/examples/training/TrainSeq2Seq.java @@ -44,6 +44,7 @@ import ai.djl.training.util.ProgressBar; import ai.djl.translate.PaddingStackBatchifier; import ai.djl.translate.TranslateException; + import java.io.IOException; import java.util.Arrays; import java.util.Locale; diff --git a/examples/src/main/java/ai/djl/examples/training/TrainTicTacToe.java b/examples/src/main/java/ai/djl/examples/training/TrainTicTacToe.java index 063e2c0f54b5..7fdb94d94935 100644 --- a/examples/src/main/java/ai/djl/examples/training/TrainTicTacToe.java +++ b/examples/src/main/java/ai/djl/examples/training/TrainTicTacToe.java @@ -35,11 +35,13 @@ import ai.djl.training.optimizer.Adam; import ai.djl.training.tracker.LinearTracker; import ai.djl.training.tracker.Tracker; -import java.io.IOException; -import java.nio.file.Paths; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.nio.file.Paths; + /** * An example of training reinforcement learning using {@link TicTacToe} and a {@link QAgent}. * diff --git a/examples/src/main/java/ai/djl/examples/training/TrainWithHpo.java b/examples/src/main/java/ai/djl/examples/training/TrainWithHpo.java index 78d4e5f8da03..acea661676a4 100644 --- a/examples/src/main/java/ai/djl/examples/training/TrainWithHpo.java +++ b/examples/src/main/java/ai/djl/examples/training/TrainWithHpo.java @@ -33,11 +33,13 @@ import ai.djl.training.loss.Loss; import ai.djl.training.util.ProgressBar; import ai.djl.translate.TranslateException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.file.Paths; import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public final class TrainWithHpo { diff --git a/examples/src/main/java/ai/djl/examples/training/TrainWithOptimizers.java b/examples/src/main/java/ai/djl/examples/training/TrainWithOptimizers.java index 07722f7f18ee..ba1ea934fb57 100644 --- a/examples/src/main/java/ai/djl/examples/training/TrainWithOptimizers.java +++ b/examples/src/main/java/ai/djl/examples/training/TrainWithOptimizers.java @@ -47,14 +47,16 @@ import ai.djl.training.util.ProgressBar; import ai.djl.translate.Pipeline; import ai.djl.translate.TranslateException; -import java.io.IOException; -import java.util.Arrays; -import java.util.Map; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; +import java.io.IOException; +import java.util.Arrays; +import java.util.Map; + /** This example features sample usage of a variety of optimizers to train Cifar10. */ public final class TrainWithOptimizers { diff --git a/examples/src/main/java/ai/djl/examples/training/transferlearning/TrainAmazonReviewRanking.java b/examples/src/main/java/ai/djl/examples/training/transferlearning/TrainAmazonReviewRanking.java index ca098e06751f..a95d787d0fa2 100644 --- a/examples/src/main/java/ai/djl/examples/training/transferlearning/TrainAmazonReviewRanking.java +++ b/examples/src/main/java/ai/djl/examples/training/transferlearning/TrainAmazonReviewRanking.java @@ -50,11 +50,13 @@ import ai.djl.training.util.ProgressBar; import ai.djl.translate.PaddingStackBatchifier; import ai.djl.translate.TranslateException; + +import org.apache.commons.csv.CSVFormat; + import java.io.IOException; import java.net.URISyntaxException; import java.util.List; import java.util.Locale; -import org.apache.commons.csv.CSVFormat; public final class TrainAmazonReviewRanking { diff --git a/examples/src/main/java/ai/djl/examples/training/transferlearning/TrainResnetWithCifar10.java b/examples/src/main/java/ai/djl/examples/training/transferlearning/TrainResnetWithCifar10.java index e6278813661a..7acb2f3531fe 100644 --- a/examples/src/main/java/ai/djl/examples/training/transferlearning/TrainResnetWithCifar10.java +++ b/examples/src/main/java/ai/djl/examples/training/transferlearning/TrainResnetWithCifar10.java @@ -50,12 +50,14 @@ import ai.djl.training.util.ProgressBar; import ai.djl.translate.Pipeline; import ai.djl.translate.TranslateException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * An example of training an image classification (ResNet for Cifar10) model. diff --git a/examples/src/main/java/ai/djl/examples/training/util/Arguments.java b/examples/src/main/java/ai/djl/examples/training/util/Arguments.java index 9906f2a909ba..bbfa48f63814 100644 --- a/examples/src/main/java/ai/djl/examples/training/util/Arguments.java +++ b/examples/src/main/java/ai/djl/examples/training/util/Arguments.java @@ -14,9 +14,9 @@ import ai.djl.engine.Engine; import ai.djl.util.JsonUtils; + import com.google.gson.reflect.TypeToken; -import java.lang.reflect.Type; -import java.util.Map; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; @@ -24,6 +24,9 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; +import java.lang.reflect.Type; +import java.util.Map; + public class Arguments { protected int epoch; @@ -142,7 +145,8 @@ public Options getOptions() { .hasArg() .argName("max-batches") .desc( - "Limit each epoch to a fixed number of iterations to test the training script") + "Limit each epoch to a fixed number of iterations to test the" + + " training script") .build()); options.addOption( Option.builder("d") diff --git a/examples/src/main/java/ai/djl/examples/training/util/BertCodeDataset.java b/examples/src/main/java/ai/djl/examples/training/util/BertCodeDataset.java index cdde32e13b0a..f83f5a3d1dcd 100644 --- a/examples/src/main/java/ai/djl/examples/training/util/BertCodeDataset.java +++ b/examples/src/main/java/ai/djl/examples/training/util/BertCodeDataset.java @@ -23,6 +23,7 @@ import ai.djl.translate.Batchifier; import ai.djl.translate.TranslateException; import ai.djl.util.Progress; + import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -138,8 +139,7 @@ public EpochIterable() { } // Create masked instances for training maskedInstances = - sentencePairs - .stream() + sentencePairs.stream() .limit(epochLimit) .map( sentencePair -> @@ -226,14 +226,12 @@ private ParsedFile( private static ParsedFile parse(Path file) { List normalizedLines = - fileToLines(file) - .stream() + fileToLines(file).stream() .map(ParsedFile::normalizeLine) .filter(line -> !line.isEmpty()) .collect(Collectors.toList()); List> tokens = - normalizedLines - .stream() + normalizedLines.stream() .map(ParsedFile::tokenizeLine) .collect(Collectors.toList()); return new ParsedFile(file, normalizedLines, tokens); @@ -309,8 +307,7 @@ public String toDebugString() { return sourceFile + "\n" + "=======================\n" - + tokenizedLines - .stream() + + tokenizedLines.stream() .map(tokens -> String.join("|", tokens)) .collect(Collectors.joining("\n")); } diff --git a/examples/src/test/java/ai/djl/examples/inference/ActionRecognitionTest.java b/examples/src/test/java/ai/djl/examples/inference/ActionRecognitionTest.java index 02f2100d173d..f2b450737669 100644 --- a/examples/src/test/java/ai/djl/examples/inference/ActionRecognitionTest.java +++ b/examples/src/test/java/ai/djl/examples/inference/ActionRecognitionTest.java @@ -16,10 +16,12 @@ import ai.djl.modality.Classifications; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class ActionRecognitionTest { @Test diff --git a/examples/src/test/java/ai/djl/examples/inference/BertQaTest.java b/examples/src/test/java/ai/djl/examples/inference/BertQaTest.java index b80a1e6e7d73..5b9de95a58ad 100644 --- a/examples/src/test/java/ai/djl/examples/inference/BertQaTest.java +++ b/examples/src/test/java/ai/djl/examples/inference/BertQaTest.java @@ -15,10 +15,12 @@ import ai.djl.ModelException; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class BertQaTest { @Test diff --git a/examples/src/test/java/ai/djl/examples/inference/BigGANTest.java b/examples/src/test/java/ai/djl/examples/inference/BigGANTest.java index 86d05a1cb606..00ad1df9a484 100644 --- a/examples/src/test/java/ai/djl/examples/inference/BigGANTest.java +++ b/examples/src/test/java/ai/djl/examples/inference/BigGANTest.java @@ -16,10 +16,12 @@ import ai.djl.modality.cv.Image; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class BigGANTest { @Test diff --git a/examples/src/test/java/ai/djl/examples/inference/FeatureComparisonTest.java b/examples/src/test/java/ai/djl/examples/inference/FeatureComparisonTest.java index a2377c9a2875..ceadef177b16 100644 --- a/examples/src/test/java/ai/djl/examples/inference/FeatureComparisonTest.java +++ b/examples/src/test/java/ai/djl/examples/inference/FeatureComparisonTest.java @@ -19,11 +19,13 @@ import ai.djl.modality.cv.ImageFactory; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; -import org.testng.Assert; -import org.testng.annotations.Test; public class FeatureComparisonTest { diff --git a/examples/src/test/java/ai/djl/examples/inference/FeatureExtractionTest.java b/examples/src/test/java/ai/djl/examples/inference/FeatureExtractionTest.java index ae93bb769da3..56ea8f1bc2a5 100644 --- a/examples/src/test/java/ai/djl/examples/inference/FeatureExtractionTest.java +++ b/examples/src/test/java/ai/djl/examples/inference/FeatureExtractionTest.java @@ -18,11 +18,13 @@ import ai.djl.modality.cv.ImageFactory; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; -import org.testng.Assert; -import org.testng.annotations.Test; public class FeatureExtractionTest { diff --git a/examples/src/test/java/ai/djl/examples/inference/InstanceSegmentationTest.java b/examples/src/test/java/ai/djl/examples/inference/InstanceSegmentationTest.java index 658aea83ce24..68a4b0c96a19 100644 --- a/examples/src/test/java/ai/djl/examples/inference/InstanceSegmentationTest.java +++ b/examples/src/test/java/ai/djl/examples/inference/InstanceSegmentationTest.java @@ -17,10 +17,12 @@ import ai.djl.modality.cv.output.DetectedObjects; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class InstanceSegmentationTest { @Test diff --git a/examples/src/test/java/ai/djl/examples/inference/LightFaceDetectionTest.java b/examples/src/test/java/ai/djl/examples/inference/LightFaceDetectionTest.java index ec98d4fcf37d..bf4baee088df 100644 --- a/examples/src/test/java/ai/djl/examples/inference/LightFaceDetectionTest.java +++ b/examples/src/test/java/ai/djl/examples/inference/LightFaceDetectionTest.java @@ -18,11 +18,13 @@ import ai.djl.modality.cv.output.DetectedObjects; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.util.Collections; import java.util.List; -import org.testng.Assert; -import org.testng.annotations.Test; public class LightFaceDetectionTest { diff --git a/examples/src/test/java/ai/djl/examples/inference/ListModelsTest.java b/examples/src/test/java/ai/djl/examples/inference/ListModelsTest.java index 9dac1ece8e5f..a8266c2b145b 100644 --- a/examples/src/test/java/ai/djl/examples/inference/ListModelsTest.java +++ b/examples/src/test/java/ai/djl/examples/inference/ListModelsTest.java @@ -19,15 +19,17 @@ import ai.djl.repository.Artifact; import ai.djl.repository.zoo.Criteria; import ai.djl.repository.zoo.ModelZoo; + +import org.testng.Assert; +import org.testng.annotations.AfterClass; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; import java.util.List; import java.util.Map; -import org.testng.Assert; -import org.testng.annotations.AfterClass; -import org.testng.annotations.Test; public class ListModelsTest { diff --git a/examples/src/test/java/ai/djl/examples/inference/ObjectDetectionTest.java b/examples/src/test/java/ai/djl/examples/inference/ObjectDetectionTest.java index 5ce01b5dcc00..d798dd3545b2 100644 --- a/examples/src/test/java/ai/djl/examples/inference/ObjectDetectionTest.java +++ b/examples/src/test/java/ai/djl/examples/inference/ObjectDetectionTest.java @@ -17,14 +17,16 @@ import ai.djl.modality.cv.output.DetectedObjects; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; + public class ObjectDetectionTest { private static final Logger logger = LoggerFactory.getLogger(ObjectDetectionTest.class); diff --git a/examples/src/test/java/ai/djl/examples/inference/ObjectDetectionWithTensorflowSavedModelTest.java b/examples/src/test/java/ai/djl/examples/inference/ObjectDetectionWithTensorflowSavedModelTest.java index 0a1565175542..f208d034fd03 100644 --- a/examples/src/test/java/ai/djl/examples/inference/ObjectDetectionWithTensorflowSavedModelTest.java +++ b/examples/src/test/java/ai/djl/examples/inference/ObjectDetectionWithTensorflowSavedModelTest.java @@ -18,11 +18,13 @@ import ai.djl.modality.cv.output.DetectedObjects; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.util.Arrays; import java.util.List; -import org.testng.Assert; -import org.testng.annotations.Test; public class ObjectDetectionWithTensorflowSavedModelTest { diff --git a/examples/src/test/java/ai/djl/examples/inference/PoseEstimationTest.java b/examples/src/test/java/ai/djl/examples/inference/PoseEstimationTest.java index 9a6efbd53e5f..3709433affe5 100644 --- a/examples/src/test/java/ai/djl/examples/inference/PoseEstimationTest.java +++ b/examples/src/test/java/ai/djl/examples/inference/PoseEstimationTest.java @@ -16,10 +16,12 @@ import ai.djl.modality.cv.output.Joints; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class PoseEstimationTest { @Test diff --git a/examples/src/test/java/ai/djl/examples/inference/RetinaFaceDetectionTest.java b/examples/src/test/java/ai/djl/examples/inference/RetinaFaceDetectionTest.java index ded180607e3f..5711e626f437 100644 --- a/examples/src/test/java/ai/djl/examples/inference/RetinaFaceDetectionTest.java +++ b/examples/src/test/java/ai/djl/examples/inference/RetinaFaceDetectionTest.java @@ -18,11 +18,13 @@ import ai.djl.modality.cv.output.DetectedObjects; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.util.Collections; import java.util.List; -import org.testng.Assert; -import org.testng.annotations.Test; public class RetinaFaceDetectionTest { diff --git a/examples/src/test/java/ai/djl/examples/inference/SentimentAnalysisTest.java b/examples/src/test/java/ai/djl/examples/inference/SentimentAnalysisTest.java index c7bda824f92b..504208e71eeb 100644 --- a/examples/src/test/java/ai/djl/examples/inference/SentimentAnalysisTest.java +++ b/examples/src/test/java/ai/djl/examples/inference/SentimentAnalysisTest.java @@ -16,10 +16,12 @@ import ai.djl.modality.Classifications; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class SentimentAnalysisTest { @Test diff --git a/examples/src/test/java/ai/djl/examples/inference/StyleTransferTest.java b/examples/src/test/java/ai/djl/examples/inference/StyleTransferTest.java index ccfa07342161..c6dcec59958b 100644 --- a/examples/src/test/java/ai/djl/examples/inference/StyleTransferTest.java +++ b/examples/src/test/java/ai/djl/examples/inference/StyleTransferTest.java @@ -18,11 +18,13 @@ import ai.djl.repository.zoo.ModelNotFoundException; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; -import java.io.IOException; -import java.nio.file.Paths; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; +import java.nio.file.Paths; + public class StyleTransferTest { @Test diff --git a/examples/src/test/java/ai/djl/examples/inference/SuperResolutionTest.java b/examples/src/test/java/ai/djl/examples/inference/SuperResolutionTest.java index 92147685dc63..81cde8ab876c 100644 --- a/examples/src/test/java/ai/djl/examples/inference/SuperResolutionTest.java +++ b/examples/src/test/java/ai/djl/examples/inference/SuperResolutionTest.java @@ -18,12 +18,14 @@ import ai.djl.modality.cv.ImageFactory; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.file.Paths; import java.util.Arrays; import java.util.List; -import org.testng.Assert; -import org.testng.annotations.Test; public class SuperResolutionTest { diff --git a/examples/src/test/java/ai/djl/examples/inference/UniversalSentenceEncoderTest.java b/examples/src/test/java/ai/djl/examples/inference/UniversalSentenceEncoderTest.java index 957b2c930509..326fd18f41f2 100644 --- a/examples/src/test/java/ai/djl/examples/inference/UniversalSentenceEncoderTest.java +++ b/examples/src/test/java/ai/djl/examples/inference/UniversalSentenceEncoderTest.java @@ -15,11 +15,13 @@ import ai.djl.ModelException; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.testng.Assert; -import org.testng.annotations.Test; public class UniversalSentenceEncoderTest { diff --git a/examples/src/test/java/ai/djl/examples/training/TrainAmazonReviewTest.java b/examples/src/test/java/ai/djl/examples/training/TrainAmazonReviewTest.java index bf299731dca5..fafaa2c7c6c3 100644 --- a/examples/src/test/java/ai/djl/examples/training/TrainAmazonReviewTest.java +++ b/examples/src/test/java/ai/djl/examples/training/TrainAmazonReviewTest.java @@ -17,9 +17,11 @@ import ai.djl.examples.training.transferlearning.TrainAmazonReviewRanking; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; + +import org.testng.annotations.Test; + import java.io.IOException; import java.net.URISyntaxException; -import org.testng.annotations.Test; public class TrainAmazonReviewTest { diff --git a/examples/src/test/java/ai/djl/examples/training/TrainBertTest.java b/examples/src/test/java/ai/djl/examples/training/TrainBertTest.java index 44712d6309a8..a5ad700b5f5e 100644 --- a/examples/src/test/java/ai/djl/examples/training/TrainBertTest.java +++ b/examples/src/test/java/ai/djl/examples/training/TrainBertTest.java @@ -14,9 +14,11 @@ import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.annotations.Test; +import java.io.IOException; + public class TrainBertTest { @Test diff --git a/examples/src/test/java/ai/djl/examples/training/TrainCaptchaTest.java b/examples/src/test/java/ai/djl/examples/training/TrainCaptchaTest.java index 27d2311a7a32..eea5d8d43af8 100644 --- a/examples/src/test/java/ai/djl/examples/training/TrainCaptchaTest.java +++ b/examples/src/test/java/ai/djl/examples/training/TrainCaptchaTest.java @@ -15,10 +15,12 @@ import ai.djl.testing.TestRequirements; import ai.djl.training.TrainingResult; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class TrainCaptchaTest { @Test diff --git a/examples/src/test/java/ai/djl/examples/training/TrainMnistTest.java b/examples/src/test/java/ai/djl/examples/training/TrainMnistTest.java index d4ee92bb6de6..5949ad4067d6 100644 --- a/examples/src/test/java/ai/djl/examples/training/TrainMnistTest.java +++ b/examples/src/test/java/ai/djl/examples/training/TrainMnistTest.java @@ -18,10 +18,12 @@ import ai.djl.testing.TestRequirements; import ai.djl.training.TrainingResult; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class TrainMnistTest { @Test diff --git a/examples/src/test/java/ai/djl/examples/training/TrainMnistWithLSTMTest.java b/examples/src/test/java/ai/djl/examples/training/TrainMnistWithLSTMTest.java index 48fcad879dae..4edd139e140e 100644 --- a/examples/src/test/java/ai/djl/examples/training/TrainMnistWithLSTMTest.java +++ b/examples/src/test/java/ai/djl/examples/training/TrainMnistWithLSTMTest.java @@ -15,10 +15,12 @@ import ai.djl.testing.TestRequirements; import ai.djl.training.TrainingResult; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class TrainMnistWithLSTMTest { @Test diff --git a/examples/src/test/java/ai/djl/examples/training/TrainPikachuTest.java b/examples/src/test/java/ai/djl/examples/training/TrainPikachuTest.java index 7bef6f4ead8d..2a61e25862ec 100644 --- a/examples/src/test/java/ai/djl/examples/training/TrainPikachuTest.java +++ b/examples/src/test/java/ai/djl/examples/training/TrainPikachuTest.java @@ -17,10 +17,12 @@ import ai.djl.testing.TestRequirements; import ai.djl.training.TrainingResult; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class TrainPikachuTest { @Test diff --git a/examples/src/test/java/ai/djl/examples/training/TrainResNetTest.java b/examples/src/test/java/ai/djl/examples/training/TrainResNetTest.java index ef35d961286e..1d2c8d75d3ff 100644 --- a/examples/src/test/java/ai/djl/examples/training/TrainResNetTest.java +++ b/examples/src/test/java/ai/djl/examples/training/TrainResNetTest.java @@ -19,10 +19,12 @@ import ai.djl.testing.TestRequirements; import ai.djl.training.TrainingResult; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class TrainResNetTest { private static final int SEED = 1234; diff --git a/examples/src/test/java/ai/djl/examples/training/TrainSentimentAnalysisTest.java b/examples/src/test/java/ai/djl/examples/training/TrainSentimentAnalysisTest.java index 472e2351e86d..43ce2d8b7a40 100644 --- a/examples/src/test/java/ai/djl/examples/training/TrainSentimentAnalysisTest.java +++ b/examples/src/test/java/ai/djl/examples/training/TrainSentimentAnalysisTest.java @@ -15,9 +15,11 @@ import ai.djl.ModelException; import ai.djl.testing.TestRequirements; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.annotations.Test; +import java.io.IOException; + public class TrainSentimentAnalysisTest { @Test diff --git a/examples/src/test/java/ai/djl/examples/training/TrainSeq2SeqTest.java b/examples/src/test/java/ai/djl/examples/training/TrainSeq2SeqTest.java index 19c2305a5577..df6abf248581 100644 --- a/examples/src/test/java/ai/djl/examples/training/TrainSeq2SeqTest.java +++ b/examples/src/test/java/ai/djl/examples/training/TrainSeq2SeqTest.java @@ -16,10 +16,12 @@ import ai.djl.testing.TestRequirements; import ai.djl.training.TrainingResult; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class TrainSeq2SeqTest { @Test diff --git a/examples/src/test/java/ai/djl/examples/training/TrainTicTacToeTest.java b/examples/src/test/java/ai/djl/examples/training/TrainTicTacToeTest.java index 8a76679dda10..5918b1a1e5e4 100644 --- a/examples/src/test/java/ai/djl/examples/training/TrainTicTacToeTest.java +++ b/examples/src/test/java/ai/djl/examples/training/TrainTicTacToeTest.java @@ -15,10 +15,12 @@ import ai.djl.engine.Engine; import ai.djl.testing.TestRequirements; import ai.djl.training.TrainingResult; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class TrainTicTacToeTest { @Test diff --git a/examples/src/test/java/ai/djl/testing/TestRequirements.java b/examples/src/test/java/ai/djl/testing/TestRequirements.java index 80547fb6e98d..e8c9bd4bdda3 100644 --- a/examples/src/test/java/ai/djl/testing/TestRequirements.java +++ b/examples/src/test/java/ai/djl/testing/TestRequirements.java @@ -14,9 +14,11 @@ import ai.djl.engine.Engine; import ai.djl.engine.EngineException; + +import org.testng.SkipException; + import java.util.Arrays; import java.util.Calendar; -import org.testng.SkipException; /** * This utility class is used to define test requirements. diff --git a/extensions/audio/src/main/java/ai/djl/audio/dataset/AudioData.java b/extensions/audio/src/main/java/ai/djl/audio/dataset/AudioData.java index bf8874e7d5f1..dcd0d2cd5268 100644 --- a/extensions/audio/src/main/java/ai/djl/audio/dataset/AudioData.java +++ b/extensions/audio/src/main/java/ai/djl/audio/dataset/AudioData.java @@ -19,17 +19,19 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDManager; import ai.djl.repository.LocalRepository; -import java.nio.Buffer; -import java.nio.ShortBuffer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; + import org.bytedeco.javacv.FFmpegFrameGrabber; import org.bytedeco.javacv.Frame; import org.bytedeco.javacv.FrameGrabber; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.nio.Buffer; +import java.nio.ShortBuffer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + /** * {@link AudioData} is a utility for managing audio data within a {@link * ai.djl.training.dataset.Dataset}. It contains some basic information of an audio file and provide diff --git a/extensions/audio/src/main/java/ai/djl/audio/dataset/Librispeech.java b/extensions/audio/src/main/java/ai/djl/audio/dataset/Librispeech.java index 9dd24aec0e95..fb9298f5f2ef 100644 --- a/extensions/audio/src/main/java/ai/djl/audio/dataset/Librispeech.java +++ b/extensions/audio/src/main/java/ai/djl/audio/dataset/Librispeech.java @@ -22,6 +22,7 @@ import ai.djl.training.dataset.Record; import ai.djl.translate.TranslateException; import ai.djl.util.Progress; + import java.io.BufferedReader; import java.io.File; import java.io.IOException; diff --git a/extensions/audio/src/main/java/ai/djl/audio/dataset/SpeechRecognitionDataset.java b/extensions/audio/src/main/java/ai/djl/audio/dataset/SpeechRecognitionDataset.java index 47038589c3d5..b834f3355354 100644 --- a/extensions/audio/src/main/java/ai/djl/audio/dataset/SpeechRecognitionDataset.java +++ b/extensions/audio/src/main/java/ai/djl/audio/dataset/SpeechRecognitionDataset.java @@ -23,6 +23,7 @@ import ai.djl.repository.MRL; import ai.djl.repository.Repository; import ai.djl.training.dataset.RandomAccessDataset; + import java.util.List; /** diff --git a/extensions/audio/src/main/java/ai/djl/audio/processor/LinearSpecgram.java b/extensions/audio/src/main/java/ai/djl/audio/processor/LinearSpecgram.java index cebf991b7f15..7f1e7ae7939e 100644 --- a/extensions/audio/src/main/java/ai/djl/audio/processor/LinearSpecgram.java +++ b/extensions/audio/src/main/java/ai/djl/audio/processor/LinearSpecgram.java @@ -16,6 +16,7 @@ import ai.djl.ndarray.NDArrays; import ai.djl.ndarray.NDList; import ai.djl.ndarray.NDManager; + import org.jtransforms.fft.FloatFFT_1D; /** Calculate linear spectrogram by short-time fourier transform. */ diff --git a/extensions/audio/src/test/java/ai/djl/audio/dataset/LibrispeechTest.java b/extensions/audio/src/test/java/ai/djl/audio/dataset/LibrispeechTest.java index 5f776a1d6f51..f105688d9338 100644 --- a/extensions/audio/src/test/java/ai/djl/audio/dataset/LibrispeechTest.java +++ b/extensions/audio/src/test/java/ai/djl/audio/dataset/LibrispeechTest.java @@ -16,10 +16,12 @@ import ai.djl.ndarray.NDManager; import ai.djl.training.dataset.Dataset; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class LibrispeechTest { @Test diff --git a/extensions/audio/src/test/java/ai/djl/audio/processor/AudioProcessorTest.java b/extensions/audio/src/test/java/ai/djl/audio/processor/AudioProcessorTest.java index cb4748b250ce..0c5894dd55af 100644 --- a/extensions/audio/src/test/java/ai/djl/audio/processor/AudioProcessorTest.java +++ b/extensions/audio/src/test/java/ai/djl/audio/processor/AudioProcessorTest.java @@ -21,13 +21,15 @@ import ai.djl.ndarray.types.Shape; import ai.djl.testing.TestRequirements; import ai.djl.training.util.DownloadUtils; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; + import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; + public class AudioProcessorTest { private static final String URL = "https://resources.djl.ai/audios/test_01.wav"; diff --git a/extensions/aws-ai/src/main/java/ai/djl/aws/s3/S3Repository.java b/extensions/aws-ai/src/main/java/ai/djl/aws/s3/S3Repository.java index 05686b1e1ab5..99a429ef434c 100644 --- a/extensions/aws-ai/src/main/java/ai/djl/aws/s3/S3Repository.java +++ b/extensions/aws-ai/src/main/java/ai/djl/aws/s3/S3Repository.java @@ -21,16 +21,10 @@ import ai.djl.repository.Repository; import ai.djl.repository.zoo.DefaultModelZoo; import ai.djl.util.Progress; -import java.io.IOException; -import java.net.URI; -import java.nio.file.Path; -import java.nio.file.Paths; -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; + import software.amazon.awssdk.core.ResponseInputStream; import software.amazon.awssdk.core.exception.SdkException; import software.amazon.awssdk.services.s3.S3Client; @@ -40,6 +34,15 @@ import software.amazon.awssdk.services.s3.model.ListObjectsResponse; import software.amazon.awssdk.services.s3.model.S3Object; +import java.io.IOException; +import java.net.URI; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + /** * A {@code S3Repository} is a {@link Repository} located on a AWS S3. * diff --git a/extensions/aws-ai/src/main/java/ai/djl/aws/s3/S3RepositoryFactory.java b/extensions/aws-ai/src/main/java/ai/djl/aws/s3/S3RepositoryFactory.java index 6044f82d607a..8b9383567b14 100644 --- a/extensions/aws-ai/src/main/java/ai/djl/aws/s3/S3RepositoryFactory.java +++ b/extensions/aws-ai/src/main/java/ai/djl/aws/s3/S3RepositoryFactory.java @@ -14,10 +14,12 @@ import ai.djl.repository.Repository; import ai.djl.repository.RepositoryFactory; + +import software.amazon.awssdk.services.s3.S3Client; + import java.net.URI; import java.util.Collections; import java.util.Set; -import software.amazon.awssdk.services.s3.S3Client; /** A class responsible to create {@link S3Repository} instances. */ public class S3RepositoryFactory implements RepositoryFactory { diff --git a/extensions/aws-ai/src/main/java/ai/djl/aws/sagemaker/SageMaker.java b/extensions/aws-ai/src/main/java/ai/djl/aws/sagemaker/SageMaker.java index c798963033ca..4ee3f271e505 100644 --- a/extensions/aws-ai/src/main/java/ai/djl/aws/sagemaker/SageMaker.java +++ b/extensions/aws-ai/src/main/java/ai/djl/aws/sagemaker/SageMaker.java @@ -15,25 +15,16 @@ import ai.djl.Model; import ai.djl.util.RandomUtils; import ai.djl.util.Utils; + import com.google.gson.JsonElement; import com.google.gson.JsonParser; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Reader; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Objects; + import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import software.amazon.awssdk.core.SdkBytes; import software.amazon.awssdk.core.sync.RequestBody; import software.amazon.awssdk.core.waiters.WaiterResponse; @@ -78,6 +69,19 @@ import software.amazon.awssdk.services.sagemakerruntime.model.InvokeEndpointResponse; import software.amazon.awssdk.services.sts.StsClient; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Reader; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Objects; + /** A utility class that help deploy model to SageMaker. */ public final class SageMaker { diff --git a/extensions/aws-ai/src/test/java/ai/djl/aws/s3/S3RepositoryFactoryTest.java b/extensions/aws-ai/src/test/java/ai/djl/aws/s3/S3RepositoryFactoryTest.java index 2e0cd5d930c6..f6b317ae950a 100644 --- a/extensions/aws-ai/src/test/java/ai/djl/aws/s3/S3RepositoryFactoryTest.java +++ b/extensions/aws-ai/src/test/java/ai/djl/aws/s3/S3RepositoryFactoryTest.java @@ -13,10 +13,12 @@ package ai.djl.aws.s3; import ai.djl.repository.Repository; -import java.net.URI; + import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.net.URI; + public class S3RepositoryFactoryTest { @BeforeClass diff --git a/extensions/aws-ai/src/test/java/ai/djl/aws/s3/S3RepositoryTest.java b/extensions/aws-ai/src/test/java/ai/djl/aws/s3/S3RepositoryTest.java index 7afc9e17ec35..e6c567fdead7 100644 --- a/extensions/aws-ai/src/test/java/ai/djl/aws/s3/S3RepositoryTest.java +++ b/extensions/aws-ai/src/test/java/ai/djl/aws/s3/S3RepositoryTest.java @@ -21,15 +21,18 @@ import ai.djl.repository.zoo.Criteria; import ai.djl.repository.zoo.ModelNotFoundException; import ai.djl.repository.zoo.ZooModel; -import java.io.IOException; -import java.util.List; + import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; + import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.S3Client; +import java.io.IOException; +import java.util.List; + public class S3RepositoryTest { @BeforeClass diff --git a/extensions/aws-ai/src/test/java/ai/djl/aws/sagemaker/SageMakerTest.java b/extensions/aws-ai/src/test/java/ai/djl/aws/sagemaker/SageMakerTest.java index d3a8637dd6eb..8554043c999f 100644 --- a/extensions/aws-ai/src/test/java/ai/djl/aws/sagemaker/SageMakerTest.java +++ b/extensions/aws-ai/src/test/java/ai/djl/aws/sagemaker/SageMakerTest.java @@ -19,7 +19,17 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.util.JsonUtils; import ai.djl.util.Utils; + import com.google.gson.reflect.TypeToken; + +import org.testng.Assert; +import org.testng.SkipException; +import org.testng.annotations.Test; + +import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider; +import software.amazon.awssdk.core.exception.SdkClientException; +import software.amazon.awssdk.core.exception.SdkException; + import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Type; @@ -28,12 +38,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; -import org.testng.Assert; -import org.testng.SkipException; -import org.testng.annotations.Test; -import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider; -import software.amazon.awssdk.core.exception.SdkClientException; -import software.amazon.awssdk.core.exception.SdkException; public class SageMakerTest { diff --git a/extensions/benchmark/src/main/java/ai/djl/benchmark/AbstractBenchmark.java b/extensions/benchmark/src/main/java/ai/djl/benchmark/AbstractBenchmark.java index 22e413ecf546..8ef27cb1fe7e 100644 --- a/extensions/benchmark/src/main/java/ai/djl/benchmark/AbstractBenchmark.java +++ b/extensions/benchmark/src/main/java/ai/djl/benchmark/AbstractBenchmark.java @@ -29,9 +29,7 @@ import ai.djl.translate.TranslatorContext; import ai.djl.util.Pair; import ai.djl.util.PairList; -import java.io.IOException; -import java.nio.FloatBuffer; -import java.time.Duration; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.Options; @@ -39,6 +37,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.nio.FloatBuffer; +import java.time.Duration; + /** Abstract benchmark class. */ public abstract class AbstractBenchmark { diff --git a/extensions/benchmark/src/main/java/ai/djl/benchmark/Arguments.java b/extensions/benchmark/src/main/java/ai/djl/benchmark/Arguments.java index a35c58719c19..4a96e934fe53 100644 --- a/extensions/benchmark/src/main/java/ai/djl/benchmark/Arguments.java +++ b/extensions/benchmark/src/main/java/ai/djl/benchmark/Arguments.java @@ -17,13 +17,7 @@ import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; import ai.djl.util.PairList; -import java.io.IOException; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Option; @@ -32,6 +26,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + /** A class represents parsed command line arguments. */ public class Arguments { @@ -222,7 +224,8 @@ static Options getOptions() { .hasArg() .argName("NEURON-CORES") .desc( - "Number of neuron cores to run multithreading inference, See https://awsdocs-neuron.readthedocs-hosted.com.") + "Number of neuron cores to run multithreading inference, See" + + " https://awsdocs-neuron.readthedocs-hosted.com.") .build()); options.addOptionGroup(deviceGroup); options.addOption( diff --git a/extensions/benchmark/src/main/java/ai/djl/benchmark/Benchmark.java b/extensions/benchmark/src/main/java/ai/djl/benchmark/Benchmark.java index 25432c75bdad..3fad6c37798c 100644 --- a/extensions/benchmark/src/main/java/ai/djl/benchmark/Benchmark.java +++ b/extensions/benchmark/src/main/java/ai/djl/benchmark/Benchmark.java @@ -22,11 +22,13 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.listener.MemoryTrainingListener; import ai.djl.translate.TranslateException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.util.Arrays; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** A class runs single threaded benchmark. */ public final class Benchmark extends AbstractBenchmark { diff --git a/extensions/benchmark/src/main/java/ai/djl/benchmark/MultithreadedBenchmark.java b/extensions/benchmark/src/main/java/ai/djl/benchmark/MultithreadedBenchmark.java index 8c24561525d2..438b176d4ef1 100644 --- a/extensions/benchmark/src/main/java/ai/djl/benchmark/MultithreadedBenchmark.java +++ b/extensions/benchmark/src/main/java/ai/djl/benchmark/MultithreadedBenchmark.java @@ -21,6 +21,10 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.training.listener.MemoryTrainingListener; import ai.djl.translate.TranslateException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -31,8 +35,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** A class runs single threaded benchmark. */ public class MultithreadedBenchmark extends AbstractBenchmark { diff --git a/extensions/benchmark/src/main/java/ai/djl/benchmark/NDListGenerator.java b/extensions/benchmark/src/main/java/ai/djl/benchmark/NDListGenerator.java index 30e007c906d4..eb52178b6b50 100644 --- a/extensions/benchmark/src/main/java/ai/djl/benchmark/NDListGenerator.java +++ b/extensions/benchmark/src/main/java/ai/djl/benchmark/NDListGenerator.java @@ -19,6 +19,15 @@ import ai.djl.ndarray.types.Shape; import ai.djl.util.Pair; import ai.djl.util.PairList; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.DefaultParser; +import org.apache.commons.cli.Option; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.BufferedOutputStream; import java.io.OutputStream; import java.nio.file.Files; @@ -27,13 +36,6 @@ import java.util.Arrays; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.DefaultParser; -import org.apache.commons.cli.Option; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** A class generates NDList files. */ final class NDListGenerator { diff --git a/extensions/benchmark/src/test/java/ai/djl/benchmark/BenchmarkTest.java b/extensions/benchmark/src/test/java/ai/djl/benchmark/BenchmarkTest.java index 5602b6c35684..3b53e6fc8dce 100644 --- a/extensions/benchmark/src/test/java/ai/djl/benchmark/BenchmarkTest.java +++ b/extensions/benchmark/src/test/java/ai/djl/benchmark/BenchmarkTest.java @@ -13,9 +13,7 @@ package ai.djl.benchmark; import ai.djl.ndarray.types.DataType; -import java.net.MalformedURLException; -import java.nio.file.Paths; -import java.util.Map; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.Options; @@ -23,6 +21,10 @@ import org.testng.Assert; import org.testng.annotations.Test; +import java.net.MalformedURLException; +import java.nio.file.Paths; +import java.util.Map; + public class BenchmarkTest { @Test diff --git a/extensions/fasttext/src/main/java/ai/djl/fasttext/FtAbstractBlock.java b/extensions/fasttext/src/main/java/ai/djl/fasttext/FtAbstractBlock.java index 1cb723ef1efd..f177ed068eac 100644 --- a/extensions/fasttext/src/main/java/ai/djl/fasttext/FtAbstractBlock.java +++ b/extensions/fasttext/src/main/java/ai/djl/fasttext/FtAbstractBlock.java @@ -15,6 +15,7 @@ import ai.djl.fasttext.jni.FtWrapper; import ai.djl.nn.AbstractSymbolBlock; import ai.djl.nn.ParameterList; + import java.nio.file.Path; /** diff --git a/extensions/fasttext/src/main/java/ai/djl/fasttext/FtModel.java b/extensions/fasttext/src/main/java/ai/djl/fasttext/FtModel.java index 70fa17c532e4..27e7cc9f5f2d 100644 --- a/extensions/fasttext/src/main/java/ai/djl/fasttext/FtModel.java +++ b/extensions/fasttext/src/main/java/ai/djl/fasttext/FtModel.java @@ -28,6 +28,7 @@ import ai.djl.translate.Translator; import ai.djl.util.PairList; import ai.djl.util.passthrough.PassthroughNDManager; + import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; diff --git a/extensions/fasttext/src/main/java/ai/djl/fasttext/FtTrainingConfig.java b/extensions/fasttext/src/main/java/ai/djl/fasttext/FtTrainingConfig.java index b6e39a117cca..4d32ac608687 100644 --- a/extensions/fasttext/src/main/java/ai/djl/fasttext/FtTrainingConfig.java +++ b/extensions/fasttext/src/main/java/ai/djl/fasttext/FtTrainingConfig.java @@ -21,6 +21,7 @@ import ai.djl.training.loss.Loss; import ai.djl.training.optimizer.Optimizer; import ai.djl.util.PairList; + import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; diff --git a/extensions/fasttext/src/main/java/ai/djl/fasttext/TrainFastText.java b/extensions/fasttext/src/main/java/ai/djl/fasttext/TrainFastText.java index 6250063932ad..34f5fec641b7 100644 --- a/extensions/fasttext/src/main/java/ai/djl/fasttext/TrainFastText.java +++ b/extensions/fasttext/src/main/java/ai/djl/fasttext/TrainFastText.java @@ -14,6 +14,7 @@ import ai.djl.basicdataset.RawDataset; import ai.djl.fasttext.zoo.nlp.textclassification.FtTextClassification; + import java.io.IOException; import java.nio.file.Path; diff --git a/extensions/fasttext/src/main/java/ai/djl/fasttext/jni/FtWrapper.java b/extensions/fasttext/src/main/java/ai/djl/fasttext/jni/FtWrapper.java index 03d9499698d1..bad891e72dac 100644 --- a/extensions/fasttext/src/main/java/ai/djl/fasttext/jni/FtWrapper.java +++ b/extensions/fasttext/src/main/java/ai/djl/fasttext/jni/FtWrapper.java @@ -14,6 +14,7 @@ import ai.djl.modality.Classifications; import ai.djl.util.NativeResource; + import java.util.ArrayList; import java.util.List; diff --git a/extensions/fasttext/src/main/java/ai/djl/fasttext/jni/LibUtils.java b/extensions/fasttext/src/main/java/ai/djl/fasttext/jni/LibUtils.java index 687168812101..1f23f1e22927 100644 --- a/extensions/fasttext/src/main/java/ai/djl/fasttext/jni/LibUtils.java +++ b/extensions/fasttext/src/main/java/ai/djl/fasttext/jni/LibUtils.java @@ -15,13 +15,15 @@ import ai.djl.util.ClassLoaderUtils; import ai.djl.util.Platform; import ai.djl.util.Utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Utilities for finding the SentencePiece binary on the System. diff --git a/extensions/fasttext/src/main/java/ai/djl/fasttext/zoo/FtModelZoo.java b/extensions/fasttext/src/main/java/ai/djl/fasttext/zoo/FtModelZoo.java index 9f8205c87255..a44ba6700f7a 100644 --- a/extensions/fasttext/src/main/java/ai/djl/fasttext/zoo/FtModelZoo.java +++ b/extensions/fasttext/src/main/java/ai/djl/fasttext/zoo/FtModelZoo.java @@ -17,6 +17,7 @@ import ai.djl.repository.Repository; import ai.djl.repository.zoo.ModelLoader; import ai.djl.repository.zoo.ModelZoo; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/extensions/fasttext/src/main/java/ai/djl/fasttext/zoo/nlp/textclassification/FtTextClassification.java b/extensions/fasttext/src/main/java/ai/djl/fasttext/zoo/nlp/textclassification/FtTextClassification.java index c19b1370bfbb..a73a89846693 100644 --- a/extensions/fasttext/src/main/java/ai/djl/fasttext/zoo/nlp/textclassification/FtTextClassification.java +++ b/extensions/fasttext/src/main/java/ai/djl/fasttext/zoo/nlp/textclassification/FtTextClassification.java @@ -23,6 +23,7 @@ import ai.djl.training.TrainingResult; import ai.djl.util.PairList; import ai.djl.util.passthrough.PassthroughNDArray; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/extensions/fasttext/src/main/java/ai/djl/fasttext/zoo/nlp/textclassification/TextClassificationModelLoader.java b/extensions/fasttext/src/main/java/ai/djl/fasttext/zoo/nlp/textclassification/TextClassificationModelLoader.java index 4219420c585a..1665491b302b 100644 --- a/extensions/fasttext/src/main/java/ai/djl/fasttext/zoo/nlp/textclassification/TextClassificationModelLoader.java +++ b/extensions/fasttext/src/main/java/ai/djl/fasttext/zoo/nlp/textclassification/TextClassificationModelLoader.java @@ -25,6 +25,7 @@ import ai.djl.repository.zoo.ZooModel; import ai.djl.util.Progress; import ai.djl.util.passthrough.PassthroughTranslator; + import java.io.IOException; import java.nio.file.Path; diff --git a/extensions/fasttext/src/test/java/ai/djl/fasttext/CookingStackExchangeTest.java b/extensions/fasttext/src/test/java/ai/djl/fasttext/CookingStackExchangeTest.java index 73ba63d4ad9b..37940993344c 100644 --- a/extensions/fasttext/src/test/java/ai/djl/fasttext/CookingStackExchangeTest.java +++ b/extensions/fasttext/src/test/java/ai/djl/fasttext/CookingStackExchangeTest.java @@ -32,6 +32,12 @@ import ai.djl.testing.TestRequirements; import ai.djl.training.TrainingResult; import ai.djl.translate.TranslateException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -42,10 +48,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.testng.Assert; -import org.testng.annotations.Test; public class CookingStackExchangeTest { @@ -143,7 +145,8 @@ public void testBlazingText() throws IOException, ModelException { try (FtModel model = new FtModel("text_classification")) { model.load(modelFile); String text = - "Convair was an american aircraft manufacturing company which later expanded into rockets and spacecraft ."; + "Convair was an american aircraft manufacturing company which later expanded" + + " into rockets and spacecraft ."; Classifications result = ((FtTextClassification) model.getBlock()).classify(text, 5); logger.info("{}", result); diff --git a/extensions/hadoop/src/main/java/ai/djl/hadoop/hdfs/HdfsRepository.java b/extensions/hadoop/src/main/java/ai/djl/hadoop/hdfs/HdfsRepository.java index 3ddd9bbe2ee8..236d9bccc654 100644 --- a/extensions/hadoop/src/main/java/ai/djl/hadoop/hdfs/HdfsRepository.java +++ b/extensions/hadoop/src/main/java/ai/djl/hadoop/hdfs/HdfsRepository.java @@ -21,6 +21,13 @@ import ai.djl.repository.Repository; import ai.djl.repository.zoo.DefaultModelZoo; import ai.djl.util.Progress; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.FileSystem; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.io.InputStream; import java.net.URI; @@ -31,11 +38,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FileStatus; -import org.apache.hadoop.fs.FileSystem; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * A {@code HdfsRepository} is a {@link Repository} located on a Hadoop HDFS. diff --git a/extensions/hadoop/src/main/java/ai/djl/hadoop/hdfs/HdfsRepositoryFactory.java b/extensions/hadoop/src/main/java/ai/djl/hadoop/hdfs/HdfsRepositoryFactory.java index 6bf4ef82b2e0..c6bfe21c059d 100644 --- a/extensions/hadoop/src/main/java/ai/djl/hadoop/hdfs/HdfsRepositoryFactory.java +++ b/extensions/hadoop/src/main/java/ai/djl/hadoop/hdfs/HdfsRepositoryFactory.java @@ -14,10 +14,12 @@ import ai.djl.repository.Repository; import ai.djl.repository.RepositoryFactory; + +import org.apache.hadoop.conf.Configuration; + import java.net.URI; import java.util.Collections; import java.util.Set; -import org.apache.hadoop.conf.Configuration; /** A class responsible to create {@link HdfsRepository} instances. */ public class HdfsRepositoryFactory implements RepositoryFactory { diff --git a/extensions/hadoop/src/test/java/ai/djl/hadoop/hdfs/HdfsRepositoryFactoryTest.java b/extensions/hadoop/src/test/java/ai/djl/hadoop/hdfs/HdfsRepositoryFactoryTest.java index d8c8ee5e8319..25785b5f1405 100644 --- a/extensions/hadoop/src/test/java/ai/djl/hadoop/hdfs/HdfsRepositoryFactoryTest.java +++ b/extensions/hadoop/src/test/java/ai/djl/hadoop/hdfs/HdfsRepositoryFactoryTest.java @@ -13,9 +13,11 @@ package ai.djl.hadoop.hdfs; import ai.djl.repository.Repository; -import java.net.URI; + import org.testng.annotations.Test; +import java.net.URI; + public class HdfsRepositoryFactoryTest { @Test(expectedExceptions = IllegalArgumentException.class) diff --git a/extensions/hadoop/src/test/java/ai/djl/hadoop/hdfs/HdfsRepositoryTest.java b/extensions/hadoop/src/test/java/ai/djl/hadoop/hdfs/HdfsRepositoryTest.java index 19938e13e9f1..4bef642d2be5 100644 --- a/extensions/hadoop/src/test/java/ai/djl/hadoop/hdfs/HdfsRepositoryTest.java +++ b/extensions/hadoop/src/test/java/ai/djl/hadoop/hdfs/HdfsRepositoryTest.java @@ -19,11 +19,7 @@ import ai.djl.testing.TestRequirements; import ai.djl.util.Utils; import ai.djl.util.ZipUtils; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.List; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -33,6 +29,12 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.List; + public class HdfsRepositoryTest { private MiniDFSCluster miniDfs; diff --git a/extensions/opencv/src/main/java/ai/djl/opencv/OpenCVImage.java b/extensions/opencv/src/main/java/ai/djl/opencv/OpenCVImage.java index 4453ebd3b9c1..9aac8e799d20 100644 --- a/extensions/opencv/src/main/java/ai/djl/opencv/OpenCVImage.java +++ b/extensions/opencv/src/main/java/ai/djl/opencv/OpenCVImage.java @@ -24,16 +24,7 @@ import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; import ai.djl.util.RandomUtils; -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.image.BufferedImage; -import java.awt.image.DataBufferByte; -import java.io.IOException; -import java.io.OutputStream; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; + import org.opencv.core.CvType; import org.opencv.core.Mat; import org.opencv.core.MatOfByte; @@ -45,6 +36,17 @@ import org.opencv.imgcodecs.Imgcodecs; import org.opencv.imgproc.Imgproc; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; +import java.awt.image.DataBufferByte; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + /** {@code OpenCVImage} is a high performance implementation of {@link Image}. */ class OpenCVImage implements Image { diff --git a/extensions/opencv/src/main/java/ai/djl/opencv/OpenCVImageFactory.java b/extensions/opencv/src/main/java/ai/djl/opencv/OpenCVImageFactory.java index 7fbd4d4f6ae0..0eff732ed970 100644 --- a/extensions/opencv/src/main/java/ai/djl/opencv/OpenCVImageFactory.java +++ b/extensions/opencv/src/main/java/ai/djl/opencv/OpenCVImageFactory.java @@ -19,16 +19,19 @@ import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; import ai.djl.util.Utils; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Path; + import nu.pattern.OpenCV; + import org.opencv.core.CvType; import org.opencv.core.Mat; import org.opencv.core.MatOfByte; import org.opencv.imgcodecs.Imgcodecs; import org.opencv.imgproc.Imgproc; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Path; + /** {@code OpenCVImageFactory} is a high performance implementation of {@link ImageFactory}. */ public class OpenCVImageFactory extends ImageFactory { diff --git a/extensions/opencv/src/test/java/ai/djl/opencv/OpenCVImageFactoryTest.java b/extensions/opencv/src/test/java/ai/djl/opencv/OpenCVImageFactoryTest.java index 096e3577bc35..7809f58e2119 100644 --- a/extensions/opencv/src/test/java/ai/djl/opencv/OpenCVImageFactoryTest.java +++ b/extensions/opencv/src/test/java/ai/djl/opencv/OpenCVImageFactoryTest.java @@ -25,6 +25,10 @@ import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.DataType; import ai.djl.testing.TestRequirements; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.io.OutputStream; import java.nio.file.Files; @@ -34,8 +38,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.testng.Assert; -import org.testng.annotations.Test; public class OpenCVImageFactoryTest { diff --git a/extensions/sentencepiece/src/main/java/ai/djl/sentencepiece/SpTextEmbedding.java b/extensions/sentencepiece/src/main/java/ai/djl/sentencepiece/SpTextEmbedding.java index d14e9b2f425e..4a707d78da6e 100644 --- a/extensions/sentencepiece/src/main/java/ai/djl/sentencepiece/SpTextEmbedding.java +++ b/extensions/sentencepiece/src/main/java/ai/djl/sentencepiece/SpTextEmbedding.java @@ -14,6 +14,7 @@ import ai.djl.modality.nlp.embedding.TextEmbedding; import ai.djl.ndarray.NDArray; + import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/extensions/sentencepiece/src/main/java/ai/djl/sentencepiece/SpTokenizer.java b/extensions/sentencepiece/src/main/java/ai/djl/sentencepiece/SpTokenizer.java index 37b39bba0e7a..acb95a0e5e2b 100644 --- a/extensions/sentencepiece/src/main/java/ai/djl/sentencepiece/SpTokenizer.java +++ b/extensions/sentencepiece/src/main/java/ai/djl/sentencepiece/SpTokenizer.java @@ -13,6 +13,7 @@ package ai.djl.sentencepiece; import ai.djl.modality.nlp.preprocess.Tokenizer; + import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; diff --git a/extensions/sentencepiece/src/main/java/ai/djl/sentencepiece/jni/LibUtils.java b/extensions/sentencepiece/src/main/java/ai/djl/sentencepiece/jni/LibUtils.java index b7fa0b0dff53..296546bffb1c 100644 --- a/extensions/sentencepiece/src/main/java/ai/djl/sentencepiece/jni/LibUtils.java +++ b/extensions/sentencepiece/src/main/java/ai/djl/sentencepiece/jni/LibUtils.java @@ -15,13 +15,15 @@ import ai.djl.util.ClassLoaderUtils; import ai.djl.util.Platform; import ai.djl.util.Utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Utilities for finding the SentencePiece binary on the System. diff --git a/extensions/sentencepiece/src/test/java/ai/djl/sentencepiece/SpTextEmbeddingTest.java b/extensions/sentencepiece/src/test/java/ai/djl/sentencepiece/SpTextEmbeddingTest.java index 8ddf25b97525..8d816f203b80 100644 --- a/extensions/sentencepiece/src/test/java/ai/djl/sentencepiece/SpTextEmbeddingTest.java +++ b/extensions/sentencepiece/src/test/java/ai/djl/sentencepiece/SpTextEmbeddingTest.java @@ -14,14 +14,16 @@ import ai.djl.testing.TestRequirements; import ai.djl.training.util.DownloadUtils; + +import org.testng.Assert; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collections; -import org.testng.Assert; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; public class SpTextEmbeddingTest { @BeforeTest diff --git a/extensions/sentencepiece/src/test/java/ai/djl/sentencepiece/SpTokenizerTest.java b/extensions/sentencepiece/src/test/java/ai/djl/sentencepiece/SpTokenizerTest.java index 635cf6ac627b..fbb44985e7df 100644 --- a/extensions/sentencepiece/src/test/java/ai/djl/sentencepiece/SpTokenizerTest.java +++ b/extensions/sentencepiece/src/test/java/ai/djl/sentencepiece/SpTokenizerTest.java @@ -15,15 +15,17 @@ import ai.djl.testing.TestRequirements; import ai.djl.training.util.DownloadUtils; + +import org.testng.Assert; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; import java.util.List; -import org.testng.Assert; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; public class SpTokenizerTest { diff --git a/extensions/sentencepiece/src/test/java/ai/djl/sentencepiece/SpVocabularyTest.java b/extensions/sentencepiece/src/test/java/ai/djl/sentencepiece/SpVocabularyTest.java index 2b1acc0d1ee5..f342795391c6 100644 --- a/extensions/sentencepiece/src/test/java/ai/djl/sentencepiece/SpVocabularyTest.java +++ b/extensions/sentencepiece/src/test/java/ai/djl/sentencepiece/SpVocabularyTest.java @@ -15,13 +15,15 @@ import ai.djl.testing.TestRequirements; import ai.djl.training.util.DownloadUtils; + +import org.testng.Assert; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.testng.Assert; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; public class SpVocabularyTest { diff --git a/extensions/tablesaw/src/main/java/ai/djl/tablesaw/TablesawDataset.java b/extensions/tablesaw/src/main/java/ai/djl/tablesaw/TablesawDataset.java index fb2694d1c85d..aaa2772552d7 100644 --- a/extensions/tablesaw/src/main/java/ai/djl/tablesaw/TablesawDataset.java +++ b/extensions/tablesaw/src/main/java/ai/djl/tablesaw/TablesawDataset.java @@ -14,12 +14,14 @@ import ai.djl.basicdataset.tabular.TabularDataset; import ai.djl.util.Progress; -import java.util.Collections; -import java.util.List; + import tech.tablesaw.api.Row; import tech.tablesaw.api.Table; import tech.tablesaw.io.ReadOptions; +import java.util.Collections; +import java.util.List; + /** {@code TablesawDataset} represents the dataset that stored in a .csv file. */ public class TablesawDataset extends TabularDataset { diff --git a/extensions/tablesaw/src/test/java/ai/djl/tablesaw/TablesawDatasetTest.java b/extensions/tablesaw/src/test/java/ai/djl/tablesaw/TablesawDatasetTest.java index be7d71dd4792..461e403e44ad 100644 --- a/extensions/tablesaw/src/test/java/ai/djl/tablesaw/TablesawDatasetTest.java +++ b/extensions/tablesaw/src/test/java/ai/djl/tablesaw/TablesawDatasetTest.java @@ -18,13 +18,16 @@ import ai.djl.nn.Blocks; import ai.djl.training.dataset.Record; import ai.djl.translate.TranslateException; -import java.io.IOException; -import java.net.URL; + import org.testng.Assert; import org.testng.annotations.Test; + import tech.tablesaw.api.ColumnType; import tech.tablesaw.io.csv.CsvReadOptions; +import java.io.IOException; +import java.net.URL; + public class TablesawDatasetTest { @Test diff --git a/extensions/tokenizers/src/main/java/ai/djl/huggingface/tokenizers/HuggingFaceTokenizer.java b/extensions/tokenizers/src/main/java/ai/djl/huggingface/tokenizers/HuggingFaceTokenizer.java index 1d540faaf708..77bc17dbaab5 100644 --- a/extensions/tokenizers/src/main/java/ai/djl/huggingface/tokenizers/HuggingFaceTokenizer.java +++ b/extensions/tokenizers/src/main/java/ai/djl/huggingface/tokenizers/HuggingFaceTokenizer.java @@ -18,6 +18,7 @@ import ai.djl.modality.nlp.preprocess.Tokenizer; import ai.djl.util.NativeResource; import ai.djl.util.Utils; + import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; diff --git a/extensions/tokenizers/src/main/java/ai/djl/huggingface/tokenizers/jni/LibUtils.java b/extensions/tokenizers/src/main/java/ai/djl/huggingface/tokenizers/jni/LibUtils.java index 2be6bc9d6d48..d66098bbc1b4 100644 --- a/extensions/tokenizers/src/main/java/ai/djl/huggingface/tokenizers/jni/LibUtils.java +++ b/extensions/tokenizers/src/main/java/ai/djl/huggingface/tokenizers/jni/LibUtils.java @@ -16,13 +16,15 @@ import ai.djl.util.ClassLoaderUtils; import ai.djl.util.Platform; import ai.djl.util.Utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** Utilities for finding the Huggingface tokenizer native binary on the System. */ @SuppressWarnings("MissingJavadocMethod") diff --git a/extensions/tokenizers/src/test/java/ai/djl/huggingface/tokenizers/HuggingFaceTokenizerTest.java b/extensions/tokenizers/src/test/java/ai/djl/huggingface/tokenizers/HuggingFaceTokenizerTest.java index 2dd1e51561cf..909589c0803b 100644 --- a/extensions/tokenizers/src/test/java/ai/djl/huggingface/tokenizers/HuggingFaceTokenizerTest.java +++ b/extensions/tokenizers/src/test/java/ai/djl/huggingface/tokenizers/HuggingFaceTokenizerTest.java @@ -15,12 +15,14 @@ import ai.djl.huggingface.tokenizers.jni.CharSpan; import ai.djl.testing.TestRequirements; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.testng.Assert; -import org.testng.annotations.Test; public class HuggingFaceTokenizerTest { diff --git a/integration/src/main/java/ai/djl/integration/IntegrationTest.java b/integration/src/main/java/ai/djl/integration/IntegrationTest.java index 6209a4bdbc06..41a7cafaf428 100644 --- a/integration/src/main/java/ai/djl/integration/IntegrationTest.java +++ b/integration/src/main/java/ai/djl/integration/IntegrationTest.java @@ -13,6 +13,21 @@ package ai.djl.integration; import ai.djl.integration.util.Arguments; + +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.DefaultParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.testng.SkipException; +import org.testng.annotations.AfterClass; +import org.testng.annotations.AfterTest; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; + import java.io.File; import java.io.IOException; import java.lang.reflect.Constructor; @@ -35,19 +50,6 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.stream.Collectors; -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.DefaultParser; -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.testng.SkipException; -import org.testng.annotations.AfterClass; -import org.testng.annotations.AfterTest; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; public class IntegrationTest { diff --git a/integration/src/main/java/ai/djl/integration/tests/inference/PredictorTest.java b/integration/src/main/java/ai/djl/integration/tests/inference/PredictorTest.java index 66ffda3673b6..960a3aa9c02c 100644 --- a/integration/src/main/java/ai/djl/integration/tests/inference/PredictorTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/inference/PredictorTest.java @@ -27,6 +27,7 @@ import ai.djl.training.loss.Loss; import ai.djl.translate.NoopTranslator; import ai.djl.translate.TranslateException; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/modality/cv/BufferedImageFactoryTest.java b/integration/src/main/java/ai/djl/integration/tests/modality/cv/BufferedImageFactoryTest.java index 953097fbdf07..7dfabebc4e04 100644 --- a/integration/src/main/java/ai/djl/integration/tests/modality/cv/BufferedImageFactoryTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/modality/cv/BufferedImageFactoryTest.java @@ -19,10 +19,12 @@ import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; import ai.djl.testing.Assertions; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class BufferedImageFactoryTest { @Test public void testLoadImage() throws IOException { diff --git a/integration/src/main/java/ai/djl/integration/tests/modality/cv/MultiBoxDetectionTest.java b/integration/src/main/java/ai/djl/integration/tests/modality/cv/MultiBoxDetectionTest.java index 872fd4d9480d..5938906880f6 100644 --- a/integration/src/main/java/ai/djl/integration/tests/modality/cv/MultiBoxDetectionTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/modality/cv/MultiBoxDetectionTest.java @@ -18,6 +18,7 @@ import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.Shape; import ai.djl.testing.Assertions; + import org.testng.annotations.Test; public class MultiBoxDetectionTest { diff --git a/integration/src/main/java/ai/djl/integration/tests/modality/cv/MultiBoxPriorTest.java b/integration/src/main/java/ai/djl/integration/tests/modality/cv/MultiBoxPriorTest.java index f494352d8131..f014bd681672 100644 --- a/integration/src/main/java/ai/djl/integration/tests/modality/cv/MultiBoxPriorTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/modality/cv/MultiBoxPriorTest.java @@ -16,11 +16,13 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.Shape; -import java.util.Arrays; -import java.util.List; + import org.testng.Assert; import org.testng.annotations.Test; +import java.util.Arrays; +import java.util.List; + public class MultiBoxPriorTest { @Test public void testMultiBoxPriors() { diff --git a/integration/src/main/java/ai/djl/integration/tests/modality/cv/MultiBoxTargetTest.java b/integration/src/main/java/ai/djl/integration/tests/modality/cv/MultiBoxTargetTest.java index 9fc7a7a47aa2..c01666b851c8 100644 --- a/integration/src/main/java/ai/djl/integration/tests/modality/cv/MultiBoxTargetTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/modality/cv/MultiBoxTargetTest.java @@ -18,6 +18,7 @@ import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.Shape; import ai.djl.testing.Assertions; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/modality/cv/NDImageUtilsTest.java b/integration/src/main/java/ai/djl/integration/tests/modality/cv/NDImageUtilsTest.java index 4326c9fcf30e..4f737db354c4 100644 --- a/integration/src/main/java/ai/djl/integration/tests/modality/cv/NDImageUtilsTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/modality/cv/NDImageUtilsTest.java @@ -21,6 +21,7 @@ import ai.djl.testing.Assertions; import ai.djl.testing.TestRequirements; import ai.djl.util.cuda.CudaUtils; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/modality/cv/SingleShotDetectionTest.java b/integration/src/main/java/ai/djl/integration/tests/modality/cv/SingleShotDetectionTest.java index 2f6e41cda364..ecee193ab319 100644 --- a/integration/src/main/java/ai/djl/integration/tests/modality/cv/SingleShotDetectionTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/modality/cv/SingleShotDetectionTest.java @@ -20,11 +20,13 @@ import ai.djl.nn.Block; import ai.djl.nn.SequentialBlock; import ai.djl.training.ParameterStore; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.testng.Assert; -import org.testng.annotations.Test; public class SingleShotDetectionTest { diff --git a/integration/src/main/java/ai/djl/integration/tests/modality/nlp/SimpleTextEncoderTest.java b/integration/src/main/java/ai/djl/integration/tests/modality/nlp/SimpleTextEncoderTest.java index e62d0454cf47..e725f3aa2a09 100644 --- a/integration/src/main/java/ai/djl/integration/tests/modality/nlp/SimpleTextEncoderTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/modality/nlp/SimpleTextEncoderTest.java @@ -23,10 +23,12 @@ import ai.djl.ndarray.types.Shape; import ai.djl.nn.recurrent.LSTM; import ai.djl.training.ParameterStore; -import java.util.Arrays; + import org.testng.Assert; import org.testng.annotations.Test; +import java.util.Arrays; + public class SimpleTextEncoderTest { @Test diff --git a/integration/src/main/java/ai/djl/integration/tests/model_zoo/CustomTranslatorTest.java b/integration/src/main/java/ai/djl/integration/tests/model_zoo/CustomTranslatorTest.java index 8c7aa52373d0..bc86d2c5aedf 100644 --- a/integration/src/main/java/ai/djl/integration/tests/model_zoo/CustomTranslatorTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/model_zoo/CustomTranslatorTest.java @@ -37,7 +37,14 @@ import ai.djl.util.JsonUtils; import ai.djl.util.Utils; import ai.djl.util.ZipUtils; + import com.google.gson.reflect.TypeToken; + +import org.testng.Assert; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -51,10 +58,6 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; -import org.testng.Assert; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; public class CustomTranslatorTest { diff --git a/integration/src/main/java/ai/djl/integration/tests/model_zoo/ImperativeModelZooTest.java b/integration/src/main/java/ai/djl/integration/tests/model_zoo/ImperativeModelZooTest.java index e58f179c86b1..c86f73678daf 100644 --- a/integration/src/main/java/ai/djl/integration/tests/model_zoo/ImperativeModelZooTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/model_zoo/ImperativeModelZooTest.java @@ -28,10 +28,12 @@ import ai.djl.training.DefaultTrainingConfig; import ai.djl.training.Trainer; import ai.djl.training.loss.SoftmaxCrossEntropyLoss; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class ImperativeModelZooTest { @Test diff --git a/integration/src/main/java/ai/djl/integration/tests/model_zoo/ModelZooTest.java b/integration/src/main/java/ai/djl/integration/tests/model_zoo/ModelZooTest.java index b52239d67955..a8a07d1ef306 100644 --- a/integration/src/main/java/ai/djl/integration/tests/model_zoo/ModelZooTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/model_zoo/ModelZooTest.java @@ -21,13 +21,15 @@ import ai.djl.repository.zoo.ModelZoo; import ai.djl.testing.TestRequirements; import ai.djl.util.Utils; -import java.io.IOException; -import java.nio.file.Paths; -import java.util.List; + import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.io.IOException; +import java.nio.file.Paths; +import java.util.List; + public class ModelZooTest { @BeforeClass diff --git a/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/AlexNetTest.java b/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/AlexNetTest.java index cd10129372b2..537dc944225a 100644 --- a/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/AlexNetTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/AlexNetTest.java @@ -33,11 +33,13 @@ import ai.djl.training.loss.Loss; import ai.djl.translate.Batchifier; import ai.djl.util.PairList; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; + import org.testng.Assert; import org.testng.annotations.Test; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + public class AlexNetTest { @Test diff --git a/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/GoogLeNetTest.java b/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/GoogLeNetTest.java index 748940d3f770..517920a148ac 100644 --- a/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/GoogLeNetTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/GoogLeNetTest.java @@ -32,11 +32,13 @@ import ai.djl.training.loss.Loss; import ai.djl.translate.Batchifier; import ai.djl.util.PairList; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; + import org.testng.Assert; import org.testng.annotations.Test; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + public class GoogLeNetTest { @Test diff --git a/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/LeNetTest.java b/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/LeNetTest.java index edba40a52fd7..2bf10ce2678e 100644 --- a/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/LeNetTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/LeNetTest.java @@ -33,11 +33,13 @@ import ai.djl.training.loss.Loss; import ai.djl.translate.Batchifier; import ai.djl.util.PairList; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; + import org.testng.Assert; import org.testng.annotations.Test; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + public class LeNetTest { @Test diff --git a/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/NiNTest.java b/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/NiNTest.java index 0d77cbb9f38a..4c4d9d0d96de 100644 --- a/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/NiNTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/NiNTest.java @@ -32,11 +32,13 @@ import ai.djl.training.loss.Loss; import ai.djl.translate.Batchifier; import ai.djl.util.PairList; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; + import org.testng.Assert; import org.testng.annotations.Test; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + public class NiNTest { @Test diff --git a/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/ResnetTest.java b/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/ResnetTest.java index 49afb20cb27b..31d46cd4a3ab 100644 --- a/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/ResnetTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/ResnetTest.java @@ -43,10 +43,12 @@ import ai.djl.translate.NoopTranslator; import ai.djl.translate.TranslateException; import ai.djl.util.PairList; + +import org.testng.annotations.Test; + import java.io.IOException; import java.util.Collections; import java.util.List; -import org.testng.annotations.Test; public class ResnetTest { diff --git a/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/SqueezenetTest.java b/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/SqueezenetTest.java index 43d008cc4bd4..2daa60696294 100644 --- a/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/SqueezenetTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/SqueezenetTest.java @@ -32,6 +32,7 @@ import ai.djl.training.loss.Loss; import ai.djl.translate.Batchifier; import ai.djl.util.PairList; + import org.testng.annotations.Test; public class SqueezenetTest { diff --git a/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/VGGTest.java b/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/VGGTest.java index a92bd7b0ba68..76c7d3dbfb5a 100644 --- a/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/VGGTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/model_zoo/classification/VGGTest.java @@ -33,11 +33,13 @@ import ai.djl.training.loss.Loss; import ai.djl.translate.Batchifier; import ai.djl.util.PairList; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; + import org.testng.Assert; import org.testng.annotations.Test; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + public class VGGTest { @Test diff --git a/integration/src/main/java/ai/djl/integration/tests/model_zoo/object_detection/SingleShotDetectionTest.java b/integration/src/main/java/ai/djl/integration/tests/model_zoo/object_detection/SingleShotDetectionTest.java index 12acab0cdcca..28cdfd2b3a4c 100644 --- a/integration/src/main/java/ai/djl/integration/tests/model_zoo/object_detection/SingleShotDetectionTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/model_zoo/object_detection/SingleShotDetectionTest.java @@ -45,11 +45,13 @@ import ai.djl.training.loss.SingleShotDetectionLoss; import ai.djl.translate.Pipeline; import ai.djl.translate.TranslateException; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; -import org.testng.Assert; -import org.testng.annotations.Test; public class SingleShotDetectionTest { diff --git a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayAttachmentTest.java b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayAttachmentTest.java index 65fbb1990d2f..c5526d355b21 100644 --- a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayAttachmentTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayAttachmentTest.java @@ -16,6 +16,7 @@ import ai.djl.ndarray.NDManager; import ai.djl.ndarray.index.NDIndex; import ai.djl.ndarray.types.Shape; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayCreationOpTest.java b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayCreationOpTest.java index 49087c850130..4c337dc820fb 100644 --- a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayCreationOpTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayCreationOpTest.java @@ -24,11 +24,13 @@ import ai.djl.testing.TestRequirements; import ai.djl.util.Pair; import ai.djl.util.PairList; -import java.nio.FloatBuffer; -import java.util.stream.IntStream; + import org.testng.Assert; import org.testng.annotations.Test; +import java.nio.FloatBuffer; +import java.util.stream.IntStream; + public class NDArrayCreationOpTest { @Test diff --git a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayElementArithmeticOpTest.java b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayElementArithmeticOpTest.java index d52a1a2154d1..278943eb9293 100644 --- a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayElementArithmeticOpTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayElementArithmeticOpTest.java @@ -25,11 +25,13 @@ import ai.djl.training.Trainer; import ai.djl.training.initializer.Initializer; import ai.djl.training.loss.Loss; -import java.util.function.BiFunction; -import java.util.function.Function; + import org.testng.Assert; import org.testng.annotations.Test; +import java.util.function.BiFunction; +import java.util.function.Function; + public class NDArrayElementArithmeticOpTest { private void testCornerCase( diff --git a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayElementComparisonOpTest.java b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayElementComparisonOpTest.java index 9d99486b26a0..dc6ffc8742ba 100644 --- a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayElementComparisonOpTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayElementComparisonOpTest.java @@ -17,6 +17,7 @@ import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayLogicalOpTest.java b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayLogicalOpTest.java index 27b4d08ce17e..1224a5af4534 100644 --- a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayLogicalOpTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayLogicalOpTest.java @@ -18,6 +18,7 @@ import ai.djl.ndarray.types.DataType; import ai.djl.ndarray.types.Shape; import ai.djl.testing.Assertions; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayNumericOpTest.java b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayNumericOpTest.java index d50bb85365d3..ece281054814 100644 --- a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayNumericOpTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayNumericOpTest.java @@ -16,10 +16,12 @@ import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.Shape; import ai.djl.testing.Assertions; -import java.util.stream.DoubleStream; + import org.testng.Assert; import org.testng.annotations.Test; +import java.util.stream.DoubleStream; + public class NDArrayNumericOpTest { @Test diff --git a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayOtherOpTest.java b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayOtherOpTest.java index df9b596a8398..b69359ff039b 100644 --- a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayOtherOpTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayOtherOpTest.java @@ -24,10 +24,12 @@ import ai.djl.testing.Assertions; import ai.djl.training.GradientCollector; import ai.djl.util.Hex; -import java.nio.FloatBuffer; + import org.testng.Assert; import org.testng.annotations.Test; +import java.nio.FloatBuffer; + public class NDArrayOtherOpTest { @Test diff --git a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayReductionOpTest.java b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayReductionOpTest.java index 55ffd31ad7aa..2987ae0310ab 100644 --- a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayReductionOpTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayReductionOpTest.java @@ -15,6 +15,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.Shape; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayShapesManipulationOpTest.java b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayShapesManipulationOpTest.java index a516a2f90976..081afd999ad9 100644 --- a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayShapesManipulationOpTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDArrayShapesManipulationOpTest.java @@ -18,6 +18,7 @@ import ai.djl.ndarray.NDManager; import ai.djl.ndarray.types.Shape; import ai.djl.testing.Assertions; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDIndexTest.java b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDIndexTest.java index 88abee3ad28f..6e4368760fed 100644 --- a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDIndexTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDIndexTest.java @@ -16,6 +16,7 @@ import ai.djl.ndarray.NDManager; import ai.djl.ndarray.index.NDIndex; import ai.djl.ndarray.types.Shape; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDListTest.java b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDListTest.java index ff613601d4db..704165a9867b 100644 --- a/integration/src/main/java/ai/djl/integration/tests/ndarray/NDListTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/ndarray/NDListTest.java @@ -14,6 +14,7 @@ import ai.djl.ndarray.NDList; import ai.djl.ndarray.NDManager; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/nn/BlockCoreTest.java b/integration/src/main/java/ai/djl/integration/tests/nn/BlockCoreTest.java index 83afde91f59a..f2dccd9889c3 100644 --- a/integration/src/main/java/ai/djl/integration/tests/nn/BlockCoreTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/nn/BlockCoreTest.java @@ -53,6 +53,10 @@ import ai.djl.training.loss.Loss; import ai.djl.training.loss.SoftmaxCrossEntropyLoss; import ai.djl.util.PairList; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.File; @@ -60,8 +64,6 @@ import java.nio.file.Files; import java.util.Arrays; import java.util.stream.IntStream; -import org.testng.Assert; -import org.testng.annotations.Test; public class BlockCoreTest { diff --git a/integration/src/main/java/ai/djl/integration/tests/nn/BlockFactoryTest.java b/integration/src/main/java/ai/djl/integration/tests/nn/BlockFactoryTest.java index fcf671a055b2..93a0968f823a 100644 --- a/integration/src/main/java/ai/djl/integration/tests/nn/BlockFactoryTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/nn/BlockFactoryTest.java @@ -35,13 +35,15 @@ import ai.djl.translate.TranslateException; import ai.djl.util.Utils; import ai.djl.util.ZipUtils; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Map; -import org.testng.Assert; -import org.testng.annotations.Test; public class BlockFactoryTest { diff --git a/integration/src/main/java/ai/djl/integration/tests/nn/PoolingOperationsTest.java b/integration/src/main/java/ai/djl/integration/tests/nn/PoolingOperationsTest.java index 44a4e9816dd6..4cf5fc72c106 100644 --- a/integration/src/main/java/ai/djl/integration/tests/nn/PoolingOperationsTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/nn/PoolingOperationsTest.java @@ -25,6 +25,7 @@ import ai.djl.training.TrainingConfig; import ai.djl.training.initializer.Initializer; import ai.djl.training.loss.Loss; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/nn/ScaledDotProductAttentionBlockTest.java b/integration/src/main/java/ai/djl/integration/tests/nn/ScaledDotProductAttentionBlockTest.java index df8a64f4803b..46534ccbf272 100644 --- a/integration/src/main/java/ai/djl/integration/tests/nn/ScaledDotProductAttentionBlockTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/nn/ScaledDotProductAttentionBlockTest.java @@ -25,6 +25,7 @@ import ai.djl.training.ParameterStore; import ai.djl.training.initializer.Initializer; import ai.djl.training.initializer.NormalInitializer; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/repository/RepositoryTest.java b/integration/src/main/java/ai/djl/integration/tests/repository/RepositoryTest.java index 3d6ce6800187..8921615ac3c7 100644 --- a/integration/src/main/java/ai/djl/integration/tests/repository/RepositoryTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/repository/RepositoryTest.java @@ -20,6 +20,12 @@ import ai.djl.repository.zoo.DefaultModelZoo; import ai.djl.util.Utils; import ai.djl.util.ZipUtils; + +import org.testng.Assert; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + import java.io.IOException; import java.io.Writer; import java.nio.file.Files; @@ -27,10 +33,6 @@ import java.nio.file.Paths; import java.util.List; import java.util.Map; -import org.testng.Assert; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; public class RepositoryTest { diff --git a/integration/src/main/java/ai/djl/integration/tests/training/ActivationTest.java b/integration/src/main/java/ai/djl/integration/tests/training/ActivationTest.java index 77dc13f8cabd..1b30d4b541e7 100644 --- a/integration/src/main/java/ai/djl/integration/tests/training/ActivationTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/training/ActivationTest.java @@ -25,6 +25,7 @@ import ai.djl.training.TrainingConfig; import ai.djl.training.initializer.Initializer; import ai.djl.training.loss.Loss; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/training/BlocksTest.java b/integration/src/main/java/ai/djl/integration/tests/training/BlocksTest.java index 630ad57d3e6d..01df52766ea5 100644 --- a/integration/src/main/java/ai/djl/integration/tests/training/BlocksTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/training/BlocksTest.java @@ -26,6 +26,7 @@ import ai.djl.training.TrainingConfig; import ai.djl.training.initializer.Initializer; import ai.djl.training.loss.Loss; + import org.testng.annotations.Test; public class BlocksTest { diff --git a/integration/src/main/java/ai/djl/integration/tests/training/DatasetTest.java b/integration/src/main/java/ai/djl/integration/tests/training/DatasetTest.java index e36bd13de068..878a300af491 100644 --- a/integration/src/main/java/ai/djl/integration/tests/training/DatasetTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/training/DatasetTest.java @@ -34,6 +34,10 @@ import ai.djl.training.loss.Loss; import ai.djl.translate.TranslateException; import ai.djl.util.Pair; + +import org.testng.Assert; +import org.testng.annotations.Test; + import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -43,8 +47,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.LongStream; -import org.testng.Assert; -import org.testng.annotations.Test; public class DatasetTest { diff --git a/integration/src/main/java/ai/djl/integration/tests/training/EvaluateDatasetTest.java b/integration/src/main/java/ai/djl/integration/tests/training/EvaluateDatasetTest.java index 5865a3a33289..f3d657a24663 100644 --- a/integration/src/main/java/ai/djl/integration/tests/training/EvaluateDatasetTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/training/EvaluateDatasetTest.java @@ -29,10 +29,12 @@ import ai.djl.training.optimizer.Optimizer; import ai.djl.training.tracker.Tracker; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class EvaluateDatasetTest { @Test diff --git a/integration/src/main/java/ai/djl/integration/tests/training/EvaluatorTest.java b/integration/src/main/java/ai/djl/integration/tests/training/EvaluatorTest.java index 7e92a1d17972..597ebb54c795 100644 --- a/integration/src/main/java/ai/djl/integration/tests/training/EvaluatorTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/training/EvaluatorTest.java @@ -20,6 +20,7 @@ import ai.djl.training.evaluator.AbstractAccuracy; import ai.djl.training.evaluator.Accuracy; import ai.djl.training.evaluator.TopKAccuracy; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/training/GradientCollectorIntegrationTest.java b/integration/src/main/java/ai/djl/integration/tests/training/GradientCollectorIntegrationTest.java index 320023c9445c..340c856f0b6b 100644 --- a/integration/src/main/java/ai/djl/integration/tests/training/GradientCollectorIntegrationTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/training/GradientCollectorIntegrationTest.java @@ -41,10 +41,12 @@ import ai.djl.training.tracker.Tracker; import ai.djl.translate.Batchifier; import ai.djl.translate.TranslateException; -import java.io.IOException; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; + public class GradientCollectorIntegrationTest { @Test diff --git a/integration/src/main/java/ai/djl/integration/tests/training/LossTest.java b/integration/src/main/java/ai/djl/integration/tests/training/LossTest.java index aec66b5fff70..3989c90e2d1d 100644 --- a/integration/src/main/java/ai/djl/integration/tests/training/LossTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/training/LossTest.java @@ -18,6 +18,7 @@ import ai.djl.ndarray.types.Shape; import ai.djl.testing.Assertions; import ai.djl.training.loss.Loss; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/training/ModelTest.java b/integration/src/main/java/ai/djl/integration/tests/training/ModelTest.java index 6023b1b054f5..c3e461292096 100644 --- a/integration/src/main/java/ai/djl/integration/tests/training/ModelTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/training/ModelTest.java @@ -21,11 +21,13 @@ import ai.djl.nn.convolutional.Conv2d; import ai.djl.nn.norm.BatchNorm; import ai.djl.testing.Assertions; -import java.io.IOException; -import java.nio.file.Paths; + import org.testng.Assert; import org.testng.annotations.Test; +import java.io.IOException; +import java.nio.file.Paths; + public class ModelTest { @Test diff --git a/integration/src/main/java/ai/djl/integration/tests/training/OptimizerTest.java b/integration/src/main/java/ai/djl/integration/tests/training/OptimizerTest.java index b9fd87b1087a..bc1b0747067e 100644 --- a/integration/src/main/java/ai/djl/integration/tests/training/OptimizerTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/training/OptimizerTest.java @@ -34,6 +34,7 @@ import ai.djl.training.optimizer.Optimizer; import ai.djl.training.tracker.Tracker; import ai.djl.translate.Batchifier; + import org.testng.annotations.Test; public class OptimizerTest { @@ -314,8 +315,7 @@ private NDArray runOptimizer(NDManager manager, Trainer trainer, Block block, in trainer.step(); return NDArrays.stack( new NDList( - block.getParameters() - .stream() + block.getParameters().stream() .map(paramPair -> paramPair.getValue().getArray().mean()) .toArray(NDArray[]::new))); } diff --git a/integration/src/main/java/ai/djl/integration/tests/training/WeightDecayTest.java b/integration/src/main/java/ai/djl/integration/tests/training/WeightDecayTest.java index 0b3b03237cb5..b0616af9125b 100644 --- a/integration/src/main/java/ai/djl/integration/tests/training/WeightDecayTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/training/WeightDecayTest.java @@ -19,6 +19,7 @@ import ai.djl.training.loss.L1WeightDecay; import ai.djl.training.loss.L2WeightDecay; import ai.djl.training.loss.Loss; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/translate/PaddingStackBatchifierTest.java b/integration/src/main/java/ai/djl/integration/tests/translate/PaddingStackBatchifierTest.java index d2a746f4a870..64f54168133e 100644 --- a/integration/src/main/java/ai/djl/integration/tests/translate/PaddingStackBatchifierTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/translate/PaddingStackBatchifierTest.java @@ -18,6 +18,7 @@ import ai.djl.ndarray.types.Shape; import ai.djl.translate.Batchifier; import ai.djl.translate.PaddingStackBatchifier; + import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration/src/main/java/ai/djl/integration/tests/translate/StackBatchifierTest.java b/integration/src/main/java/ai/djl/integration/tests/translate/StackBatchifierTest.java index 4060e57b2f88..7d807271fcad 100644 --- a/integration/src/main/java/ai/djl/integration/tests/translate/StackBatchifierTest.java +++ b/integration/src/main/java/ai/djl/integration/tests/translate/StackBatchifierTest.java @@ -17,10 +17,12 @@ import ai.djl.ndarray.types.Shape; import ai.djl.translate.Batchifier; import ai.djl.translate.StackBatchifier; -import java.util.Arrays; + import org.testng.Assert; import org.testng.annotations.Test; +import java.util.Arrays; + public class StackBatchifierTest { @Test diff --git a/integration/src/main/java/ai/djl/integration/util/DebugEnvironment.java b/integration/src/main/java/ai/djl/integration/util/DebugEnvironment.java index df009a8f0480..f3146c6f2f01 100644 --- a/integration/src/main/java/ai/djl/integration/util/DebugEnvironment.java +++ b/integration/src/main/java/ai/djl/integration/util/DebugEnvironment.java @@ -13,6 +13,7 @@ package ai.djl.integration.util; import ai.djl.engine.Engine; + import java.io.IOException; import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; diff --git a/integration/src/main/java/ai/djl/integration/util/TestUtils.java b/integration/src/main/java/ai/djl/integration/util/TestUtils.java index 9329990bde87..de8b59385f1c 100644 --- a/integration/src/main/java/ai/djl/integration/util/TestUtils.java +++ b/integration/src/main/java/ai/djl/integration/util/TestUtils.java @@ -19,6 +19,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.types.Shape; import ai.djl.testing.Assertions; + import org.testng.Assert; public final class TestUtils { diff --git a/integration/src/test/java/ai/djl/CoverageTest.java b/integration/src/test/java/ai/djl/CoverageTest.java index 65b8e20acb5c..3580f74afb01 100644 --- a/integration/src/test/java/ai/djl/CoverageTest.java +++ b/integration/src/test/java/ai/djl/CoverageTest.java @@ -16,9 +16,11 @@ import ai.djl.basicmodelzoo.cv.classification.ResNetV1; import ai.djl.repository.Repository; import ai.djl.testing.CoverageUtils; + +import org.testng.annotations.Test; + import java.io.IOException; import java.net.URISyntaxException; -import org.testng.annotations.Test; public class CoverageTest { diff --git a/integration/src/test/java/ai/djl/integration/IntegrationTests.java b/integration/src/test/java/ai/djl/integration/IntegrationTests.java index 490d0af77be7..f6e410dd9a54 100644 --- a/integration/src/test/java/ai/djl/integration/IntegrationTests.java +++ b/integration/src/test/java/ai/djl/integration/IntegrationTests.java @@ -13,6 +13,7 @@ package ai.djl.integration; import ai.djl.util.cuda.CudaUtils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; diff --git a/model-zoo/src/main/java/ai/djl/basicmodelzoo/BasicModelZoo.java b/model-zoo/src/main/java/ai/djl/basicmodelzoo/BasicModelZoo.java index 68a7db4906c9..34b2ab8a69ef 100644 --- a/model-zoo/src/main/java/ai/djl/basicmodelzoo/BasicModelZoo.java +++ b/model-zoo/src/main/java/ai/djl/basicmodelzoo/BasicModelZoo.java @@ -18,6 +18,7 @@ import ai.djl.repository.zoo.BaseModelLoader; import ai.djl.repository.zoo.ModelLoader; import ai.djl.repository.zoo.ModelZoo; + import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/model-zoo/src/main/java/ai/djl/basicmodelzoo/basic/Mlp.java b/model-zoo/src/main/java/ai/djl/basicmodelzoo/basic/Mlp.java index 1d231925625c..05f171c1ec22 100644 --- a/model-zoo/src/main/java/ai/djl/basicmodelzoo/basic/Mlp.java +++ b/model-zoo/src/main/java/ai/djl/basicmodelzoo/basic/Mlp.java @@ -17,6 +17,7 @@ import ai.djl.nn.Blocks; import ai.djl.nn.SequentialBlock; import ai.djl.nn.core.Linear; + import java.util.function.Function; /** diff --git a/model-zoo/src/main/java/ai/djl/basicmodelzoo/basic/MlpBlockFactory.java b/model-zoo/src/main/java/ai/djl/basicmodelzoo/basic/MlpBlockFactory.java index 54229d8ec2a9..6f40ef399a40 100644 --- a/model-zoo/src/main/java/ai/djl/basicmodelzoo/basic/MlpBlockFactory.java +++ b/model-zoo/src/main/java/ai/djl/basicmodelzoo/basic/MlpBlockFactory.java @@ -16,6 +16,7 @@ import ai.djl.nn.Block; import ai.djl.nn.BlockFactory; import ai.djl.translate.ArgumentsUtil; + import java.nio.file.Path; import java.util.List; import java.util.Map; @@ -35,9 +36,7 @@ public Block newBlock(Model model, Path modelPath, Map arguments) { int input = width * height; int[] hidden = ((List) arguments.get("hidden")) - .stream() - .mapToInt(Double::intValue) - .toArray(); + .stream().mapToInt(Double::intValue).toArray(); return new Mlp(input, output, hidden); } diff --git a/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/classification/GoogLeNet.java b/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/classification/GoogLeNet.java index 0e1719e3d1d3..a82083f390e2 100644 --- a/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/classification/GoogLeNet.java +++ b/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/classification/GoogLeNet.java @@ -24,6 +24,7 @@ import ai.djl.nn.convolutional.Conv2d; import ai.djl.nn.core.Linear; import ai.djl.nn.pooling.Pool; + import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; diff --git a/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/classification/ResNetV1.java b/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/classification/ResNetV1.java index 9c862faf86e2..471086697f41 100644 --- a/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/classification/ResNetV1.java +++ b/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/classification/ResNetV1.java @@ -23,6 +23,7 @@ import ai.djl.nn.core.Linear; import ai.djl.nn.norm.BatchNorm; import ai.djl.nn.pooling.Pool; + import java.util.Arrays; /** diff --git a/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/classification/ResnetBlockFactory.java b/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/classification/ResnetBlockFactory.java index 6654baae04d8..57675dc999fc 100644 --- a/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/classification/ResnetBlockFactory.java +++ b/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/classification/ResnetBlockFactory.java @@ -17,6 +17,7 @@ import ai.djl.nn.Block; import ai.djl.nn.BlockFactory; import ai.djl.translate.ArgumentsUtil; + import java.nio.file.Path; import java.util.List; import java.util.Map; @@ -36,9 +37,7 @@ public Block newBlock(Model model, Path modelPath, Map arguments) { Shape shape = new Shape( ((List) arguments.get("imageShape")) - .stream() - .mapToLong(Double::longValue) - .toArray()); + .stream().mapToLong(Double::longValue).toArray()); ResNetV1.Builder blockBuilder = ResNetV1.builder().setNumLayers(numLayers).setOutSize(outSize).setImageShape(shape); if (arguments.containsKey("batchNormMomentum")) { diff --git a/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/classification/SqueezeNet.java b/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/classification/SqueezeNet.java index 9bfb93b4a988..631704798f31 100644 --- a/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/classification/SqueezeNet.java +++ b/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/classification/SqueezeNet.java @@ -24,6 +24,7 @@ import ai.djl.nn.convolutional.Conv2d; import ai.djl.nn.norm.Dropout; import ai.djl.nn.pooling.Pool; + import java.util.Arrays; /** diff --git a/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/object_detection/ssd/SingleShotDetection.java b/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/object_detection/ssd/SingleShotDetection.java index 871d9d5b201d..8cea00a621bc 100644 --- a/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/object_detection/ssd/SingleShotDetection.java +++ b/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/object_detection/ssd/SingleShotDetection.java @@ -30,6 +30,7 @@ import ai.djl.nn.pooling.Pool; import ai.djl.training.ParameterStore; import ai.djl.util.PairList; + import java.io.DataInputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/object_detection/ssd/SsdBlockFactory.java b/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/object_detection/ssd/SsdBlockFactory.java index dd1186a829a2..b1eb97c31daf 100644 --- a/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/object_detection/ssd/SsdBlockFactory.java +++ b/model-zoo/src/main/java/ai/djl/basicmodelzoo/cv/object_detection/ssd/SsdBlockFactory.java @@ -17,6 +17,7 @@ import ai.djl.nn.BlockFactory; import ai.djl.nn.SequentialBlock; import ai.djl.translate.ArgumentsUtil; + import java.nio.file.Path; import java.util.ArrayList; import java.util.List; @@ -37,23 +38,19 @@ public Block newBlock(Model model, Path modelPath, Map arguments) { boolean globalPool = ArgumentsUtil.booleanValue(arguments, "globalPool"); int[] numFilters = ((List) arguments.get("numFilters")) - .stream() - .mapToInt(Double::intValue) - .toArray(); + .stream().mapToInt(Double::intValue).toArray(); List ratio = ((List) arguments.get("ratios")) - .stream() - .map(Double::floatValue) - .collect(Collectors.toList()); + .stream().map(Double::floatValue).collect(Collectors.toList()); List> sizes = ((List>) arguments.get("sizes")) .stream() - .map( - size -> - size.stream() - .map(Double::floatValue) - .collect(Collectors.toList())) - .collect(Collectors.toList()); + .map( + size -> + size.stream() + .map(Double::floatValue) + .collect(Collectors.toList())) + .collect(Collectors.toList()); List> ratios = new ArrayList<>(); for (int i = 0; i < 5; i++) { ratios.add(ratio); diff --git a/testing/src/main/java/ai/djl/testing/Assertions.java b/testing/src/main/java/ai/djl/testing/Assertions.java index 59f6604984f1..c1a8f909b7e0 100644 --- a/testing/src/main/java/ai/djl/testing/Assertions.java +++ b/testing/src/main/java/ai/djl/testing/Assertions.java @@ -14,6 +14,7 @@ import ai.djl.ndarray.NDArray; import ai.djl.ndarray.NDList; + import org.testng.Assert; public final class Assertions { diff --git a/testing/src/main/java/ai/djl/testing/CoverageUtils.java b/testing/src/main/java/ai/djl/testing/CoverageUtils.java index 31053bab41ef..07213638bf81 100644 --- a/testing/src/main/java/ai/djl/testing/CoverageUtils.java +++ b/testing/src/main/java/ai/djl/testing/CoverageUtils.java @@ -13,6 +13,7 @@ package ai.djl.testing; import ai.djl.util.ClassLoaderUtils; + import java.io.File; import java.io.IOException; import java.lang.reflect.Constructor; diff --git a/testing/src/main/java/ai/djl/testing/TestRequirements.java b/testing/src/main/java/ai/djl/testing/TestRequirements.java index a5975d5837e9..0142dbcbca79 100644 --- a/testing/src/main/java/ai/djl/testing/TestRequirements.java +++ b/testing/src/main/java/ai/djl/testing/TestRequirements.java @@ -13,9 +13,11 @@ package ai.djl.testing; import ai.djl.engine.Engine; + +import org.testng.SkipException; + import java.util.Arrays; import java.util.Calendar; -import org.testng.SkipException; /** * This utility class is used to define test requirements. diff --git a/tools/conf/checkstyle.xml b/tools/conf/checkstyle.xml index e7aa3af52740..4dd8c7bb0d5c 100644 --- a/tools/conf/checkstyle.xml +++ b/tools/conf/checkstyle.xml @@ -270,7 +270,6 @@ - --> @@ -278,6 +277,7 @@ + --> diff --git a/tools/gradle/java-formatter.gradle b/tools/gradle/java-formatter.gradle index 6d587571e42f..5bf1b92f350f 100644 --- a/tools/gradle/java-formatter.gradle +++ b/tools/gradle/java-formatter.gradle @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath 'com.google.googlejavaformat:google-java-format:1.6' + classpath 'com.google.googlejavaformat:google-java-format:1.15.0' } } @@ -25,7 +25,6 @@ class JavaFormatterPlugin implements Plugin { project.task('formatJava') { doLast { Main formatter = new Main(new PrintWriter(System.out, true), new PrintWriter(System.err, true), System.in) - Project rootProject = project.getRootProject() for (item in project.sourceSets) { for (File file : item.getAllSource()) { if (!file.getName().endsWith(".java") || file.getAbsolutePath().contains("generated-src")) { @@ -41,20 +40,13 @@ class JavaFormatterPlugin implements Plugin { project.task('verifyJava') { doLast { - def options = JavaFormatterOptions.builder().style(JavaFormatterOptions.Style.AOSP).build() - Formatter formatter = new Formatter(options) - Project rootProject = project.getRootProject() + Main formatter = new Main(new PrintWriter(System.out, true), new PrintWriter(System.err, true), System.in) for (item in project.sourceSets) { for (File file : item.getAllSource()) { if (!file.getName().endsWith(".java") || file.getAbsolutePath().contains("generated-src")) { continue } - - String src = new String(file.bytes, "UTF-8") - String formatted = formatter.formatSource(src) - formatted = RemoveUnusedImports.removeUnusedImports(formatted, RemoveUnusedImports.JavadocOnlyImports.KEEP) - formatted = ImportOrderer.reorderImports(formatted); - if (!src.equals(formatted)) { + if (formatter.format("-a", "-n", "--set-exit-if-changed", file.getAbsolutePath()) != 0) { throw new GradleException("File not formatted: " + file.getAbsolutePath() + System.lineSeparator() + "In order to reformat your code, run './gradlew formatJava' (or './gradlew fJ' for short)" From aaef36faae307767d6c889d37e104ee43219071c Mon Sep 17 00:00:00 2001 From: Frank Liu Date: Mon, 20 Jun 2022 11:24:10 -0700 Subject: [PATCH 4/7] [api] Add name to LambdaBlock (#1726) Change-Id: I6dbceb21493443e06aa2911d5c74dbc8b93b9f99 --- api/src/main/java/ai/djl/nn/Activation.java | 22 +++---- api/src/main/java/ai/djl/nn/Blocks.java | 6 +- api/src/main/java/ai/djl/nn/LambdaBlock.java | 41 +++++++++++- .../main/java/ai/djl/nn/SequentialBlock.java | 26 ++++++++ .../ai/djl/nn/convolutional/Convolution.java | 63 +++++++++++++++++++ api/src/main/java/ai/djl/nn/pooling/Pool.java | 42 +++++++------ 6 files changed, 165 insertions(+), 35 deletions(-) diff --git a/api/src/main/java/ai/djl/nn/Activation.java b/api/src/main/java/ai/djl/nn/Activation.java index dbd626d8575f..2297915a4dd8 100644 --- a/api/src/main/java/ai/djl/nn/Activation.java +++ b/api/src/main/java/ai/djl/nn/Activation.java @@ -313,7 +313,7 @@ public static NDList mish(NDList arrays) { * function */ public static Block reluBlock() { - return new LambdaBlock(Activation::relu); + return new LambdaBlock(Activation::relu, "ReLU"); } /** @@ -324,7 +324,7 @@ public static Block reluBlock() { * function */ public static Block sigmoidBlock() { - return new LambdaBlock(Activation::sigmoid); + return new LambdaBlock(Activation::sigmoid, "sigmoid"); } /** @@ -335,7 +335,7 @@ public static Block sigmoidBlock() { * function */ public static Block tanhBlock() { - return new LambdaBlock(Activation::tanh); + return new LambdaBlock(Activation::tanh, "Tanh"); } /** @@ -346,7 +346,7 @@ public static Block tanhBlock() { * function */ public static Block softPlusBlock() { - return new LambdaBlock(Activation::softPlus); + return new LambdaBlock(Activation::softPlus, "softPlus"); } /** @@ -357,7 +357,7 @@ public static Block softPlusBlock() { * function */ public static Block softSignBlock() { - return new LambdaBlock(Activation::softSign); + return new LambdaBlock(Activation::softSign, "softSign"); } /** @@ -369,7 +369,7 @@ public static Block softSignBlock() { * activation function */ public static Block leakyReluBlock(float alpha) { - return new LambdaBlock(arrays -> Activation.leakyRelu(arrays, alpha)); + return new LambdaBlock(arrays -> Activation.leakyRelu(arrays, alpha), "LeakyReLU"); } /** @@ -381,7 +381,7 @@ public static Block leakyReluBlock(float alpha) { * function */ public static Block eluBlock(float alpha) { - return new LambdaBlock(arrays -> Activation.elu(arrays, alpha)); + return new LambdaBlock(arrays -> Activation.elu(arrays, alpha), "ELU"); } /** @@ -392,7 +392,7 @@ public static Block eluBlock(float alpha) { * function */ public static Block seluBlock() { - return new LambdaBlock(Activation::selu); + return new LambdaBlock(Activation::selu, "SELU"); } /** @@ -403,7 +403,7 @@ public static Block seluBlock() { * function */ public static Block geluBlock() { - return new LambdaBlock(Activation::gelu); + return new LambdaBlock(Activation::gelu, "GELU"); } /** @@ -415,7 +415,7 @@ public static Block geluBlock() { * activation function */ public static Block swishBlock(float beta) { - return new LambdaBlock(arrays -> Activation.swish(arrays, beta)); + return new LambdaBlock(arrays -> Activation.swish(arrays, beta), "Swish"); } /** @@ -426,7 +426,7 @@ public static Block swishBlock(float beta) { * function */ public static Block mishBlock() { - return new LambdaBlock(Activation::mish); + return new LambdaBlock(Activation::mish, "Mish"); } /** diff --git a/api/src/main/java/ai/djl/nn/Blocks.java b/api/src/main/java/ai/djl/nn/Blocks.java index ae90667d1f9d..3eb7a9f0a224 100644 --- a/api/src/main/java/ai/djl/nn/Blocks.java +++ b/api/src/main/java/ai/djl/nn/Blocks.java @@ -58,7 +58,7 @@ public static NDArray batchFlatten(NDArray array, long size) { * batchFlatten} method */ public static Block batchFlattenBlock() { - return LambdaBlock.singleton(Blocks::batchFlatten); + return LambdaBlock.singleton(Blocks::batchFlatten, "batchFlatten"); } /** @@ -70,7 +70,7 @@ public static Block batchFlattenBlock() { * batchFlatten} method */ public static Block batchFlattenBlock(long size) { - return LambdaBlock.singleton(array -> batchFlatten(array, size)); + return LambdaBlock.singleton(array -> batchFlatten(array, size), "batchFlatten"); } /** @@ -79,6 +79,6 @@ public static Block batchFlattenBlock(long size) { * @return an identity {@link Block} */ public static Block identityBlock() { - return new LambdaBlock(x -> x); + return new LambdaBlock(x -> x, "identity"); } } diff --git a/api/src/main/java/ai/djl/nn/LambdaBlock.java b/api/src/main/java/ai/djl/nn/LambdaBlock.java index a0469a4180a4..77801ebc8121 100644 --- a/api/src/main/java/ai/djl/nn/LambdaBlock.java +++ b/api/src/main/java/ai/djl/nn/LambdaBlock.java @@ -37,6 +37,7 @@ public class LambdaBlock extends AbstractBlock { private static final byte VERSION = 2; private Function lambda; + private String name; /** * Creates a LambdaBlock that can apply the specified function. @@ -44,19 +45,53 @@ public class LambdaBlock extends AbstractBlock { * @param lambda the function to apply */ public LambdaBlock(Function lambda) { + this(lambda, "anonymous"); + } + + /** + * Creates a LambdaBlock that can apply the specified function. + * + * @param lambda the function to apply + * @param name the function name + */ + public LambdaBlock(Function lambda, String name) { super(VERSION); this.lambda = lambda; + this.name = name; + } + + /** + * Returns the lambda function name. + * + * @return the lambda function name + */ + public String getName() { + return name; } /** * Creates a {@link LambdaBlock} for a singleton function. * - * @param lambda a function accepting a singleton {@link NDList} and returning another sinleton + * @param lambda a function accepting a singleton {@link NDList} and returning another singleton * {@link NDList} * @return a new {@link LambdaBlock} for the function */ public static LambdaBlock singleton(Function lambda) { - return new LambdaBlock(arrays -> new NDList(lambda.apply(arrays.singletonOrThrow()))); + return new LambdaBlock( + arrays -> new NDList(lambda.apply(arrays.singletonOrThrow())), + lambda.getClass().getSimpleName()); + } + + /** + * Creates a {@link LambdaBlock} for a singleton function. + * + * @param lambda a function accepting a singleton {@link NDList} and returning another singleton + * {@link NDList} + * @param name the function name + * @return a new {@link LambdaBlock} for the function + */ + public static LambdaBlock singleton(Function lambda, String name) { + return new LambdaBlock(arrays -> new NDList(lambda.apply(arrays.singletonOrThrow())), name); } /** {@inheritDoc} */ @@ -101,6 +136,6 @@ public void loadParameters(NDManager manager, DataInputStream is) /** {@inheritDoc} */ @Override public String toString() { - return "Lambda()"; + return "Lambda::" + name + "()"; } } diff --git a/api/src/main/java/ai/djl/nn/SequentialBlock.java b/api/src/main/java/ai/djl/nn/SequentialBlock.java index e686de7a8047..7d34fb5c48fe 100644 --- a/api/src/main/java/ai/djl/nn/SequentialBlock.java +++ b/api/src/main/java/ai/djl/nn/SequentialBlock.java @@ -92,6 +92,18 @@ public SequentialBlock add(Function f) { return this; } + /** + * Adds a {@link LambdaBlock} that applies the given function to the sequence of blocks. + * + * @param f the function forms the {@link LambdaBlock} + * @param name the function name + * @return this block + */ + public SequentialBlock add(Function f, String name) { + add(new LambdaBlock(f, name)); + return this; + } + /** * Adds a {@link LambdaBlock#singleton(Function)} that applies the given function to the * sequence of blocks. @@ -105,6 +117,20 @@ public SequentialBlock addSingleton(Function f) { return this; } + /** + * Adds a {@link LambdaBlock#singleton(Function)} that applies the given function to the + * sequence of blocks. + * + * @param f the function forms the {@link LambdaBlock} + * @param name the function name + * @return this block + * @see LambdaBlock#singleton(Function) + */ + public SequentialBlock addSingleton(Function f, String name) { + add(LambdaBlock.singleton(f, name)); + return this; + } + /** Removes the {@link Block} added last from the sequence of blocks. */ public void removeLastBlock() { children.remove(children.size() - 1); diff --git a/api/src/main/java/ai/djl/nn/convolutional/Convolution.java b/api/src/main/java/ai/djl/nn/convolutional/Convolution.java index 32ca368621b7..f862ee13274e 100644 --- a/api/src/main/java/ai/djl/nn/convolutional/Convolution.java +++ b/api/src/main/java/ai/djl/nn/convolutional/Convolution.java @@ -196,6 +196,69 @@ public void loadMetadata(byte loadVersion, DataInputStream is) } } + /** + * Returns the shape of the kernel. + * + * @return the shape of the kernel + */ + public Shape getKernelShape() { + return kernelShape; + } + + /** + * Returns the stride of the convolution. + * + * @return the stride of the convolution + */ + public Shape getStride() { + return stride; + } + + /** + * Returns the padding along each dimension. + * + * @return the padding along each dimension + */ + public Shape getPadding() { + return padding; + } + + /** + * Returns the dilation along each dimension. + * + * @return the dilation along each dimension + */ + public Shape getDilation() { + return dilation; + } + + /** + * Returns the required number of filters. + * + * @return the required number of filters + */ + public int getFilters() { + return filters; + } + + /** + * Returns the number of group partitions. + * + * @return the number of group partitions + */ + public int getGroups() { + return groups; + } + + /** + * Returns whether to include a bias vector. + * + * @return whether to include a bias vector + */ + public boolean isIncludeBias() { + return includeBias; + } + /** * Applies N-D convolution over an input signal composed of several input planes. * diff --git a/api/src/main/java/ai/djl/nn/pooling/Pool.java b/api/src/main/java/ai/djl/nn/pooling/Pool.java index 2b3b2702f7cd..da31ced35fed 100644 --- a/api/src/main/java/ai/djl/nn/pooling/Pool.java +++ b/api/src/main/java/ai/djl/nn/pooling/Pool.java @@ -411,7 +411,7 @@ public static NDArray globalLpPool3d(NDArray input, float normType) { public static Block maxPool1dBlock( Shape kernelShape, Shape stride, Shape padding, boolean ceilMode) { return LambdaBlock.singleton( - array -> maxPool1d(array, kernelShape, stride, padding, ceilMode)); + array -> maxPool1d(array, kernelShape, stride, padding, ceilMode), "maxPool1d"); } /** @@ -468,7 +468,7 @@ public static Block maxPool1dBlock(Shape kernelShape) { public static Block maxPool2dBlock( Shape kernelShape, Shape stride, Shape padding, boolean ceilMode) { return LambdaBlock.singleton( - array -> maxPool2d(array, kernelShape, stride, padding, ceilMode)); + array -> maxPool2d(array, kernelShape, stride, padding, ceilMode), "maxPool2d"); } /** @@ -525,7 +525,7 @@ public static Block maxPool2dBlock(Shape kernelShape) { public static Block maxPool3dBlock( Shape kernelShape, Shape stride, Shape padding, boolean ceilMode) { return LambdaBlock.singleton( - array -> maxPool3d(array, kernelShape, stride, padding, ceilMode)); + array -> maxPool3d(array, kernelShape, stride, padding, ceilMode), "maxPool3d"); } /** @@ -575,7 +575,7 @@ public static Block maxPool3dBlock(Shape kernelShape) { * globalmaxPool1dBlock} pooling function */ public static Block globalMaxPool1dBlock() { - return LambdaBlock.singleton(Pool::globalMaxPool1d); + return LambdaBlock.singleton(Pool::globalMaxPool1d, "globalMaxPool1d"); } /** @@ -586,7 +586,7 @@ public static Block globalMaxPool1dBlock() { * globalmaxPool2dBlock} pooling function */ public static Block globalMaxPool2dBlock() { - return LambdaBlock.singleton(Pool::globalMaxPool2d); + return LambdaBlock.singleton(Pool::globalMaxPool2d, "globalMaxPool2d"); } /** @@ -597,7 +597,7 @@ public static Block globalMaxPool2dBlock() { * globalmaxPool3dBlock} pooling function */ public static Block globalMaxPool3dBlock() { - return LambdaBlock.singleton(Pool::globalMaxPool3d); + return LambdaBlock.singleton(Pool::globalMaxPool3d, "globalMaxPool3d"); } /** @@ -620,7 +620,8 @@ public static Block avgPool1dBlock( boolean ceilMode, boolean countIncludePad) { return LambdaBlock.singleton( - array -> avgPool1d(array, kernelShape, stride, padding, ceilMode, countIncludePad)); + array -> avgPool1d(array, kernelShape, stride, padding, ceilMode, countIncludePad), + "avgPool1d"); } /** @@ -699,7 +700,8 @@ public static Block avgPool2dBlock( boolean ceilMode, boolean countIncludePad) { return LambdaBlock.singleton( - array -> avgPool2d(array, kernelShape, stride, padding, ceilMode, countIncludePad)); + array -> avgPool2d(array, kernelShape, stride, padding, ceilMode, countIncludePad), + "avgPool2d"); } /** @@ -778,7 +780,8 @@ public static Block avgPool3dBlock( boolean ceilMode, boolean countIncludePad) { return LambdaBlock.singleton( - array -> avgPool3d(array, kernelShape, stride, padding, ceilMode, countIncludePad)); + array -> avgPool3d(array, kernelShape, stride, padding, ceilMode, countIncludePad), + "avgPool3d"); } /** @@ -845,7 +848,7 @@ public static Block avgPool3dBlock(Shape kernelShape) { * globalAvgPool1d} pooling function */ public static Block globalAvgPool1dBlock() { - return LambdaBlock.singleton(Pool::globalAvgPool1d); + return LambdaBlock.singleton(Pool::globalAvgPool1d, "globalAvgPool1d"); } /** @@ -856,7 +859,7 @@ public static Block globalAvgPool1dBlock() { * globalAvgPool2d} pooling function */ public static Block globalAvgPool2dBlock() { - return LambdaBlock.singleton(Pool::globalAvgPool2d); + return LambdaBlock.singleton(Pool::globalAvgPool2d, "globalAvgPool2d"); } /** @@ -867,7 +870,7 @@ public static Block globalAvgPool2dBlock() { * globalAvgPool3d} pooling function */ public static Block globalAvgPool3dBlock() { - return LambdaBlock.singleton(Pool::globalAvgPool3d); + return LambdaBlock.singleton(Pool::globalAvgPool3d, "globalAvgPool3d"); } /** @@ -886,7 +889,8 @@ public static Block globalAvgPool3dBlock() { public static Block lpPool1dBlock( float normType, Shape kernelShape, Shape stride, Shape padding, boolean ceilMode) { return LambdaBlock.singleton( - array -> lpPool1d(array, normType, kernelShape, stride, padding, ceilMode)); + array -> lpPool1d(array, normType, kernelShape, stride, padding, ceilMode), + "lpPool1d"); } /** @@ -934,7 +938,8 @@ public static Block lpPool1dBlock(float normType, Shape kernelShape) { public static Block lpPool2dBlock( float normType, Shape kernelShape, Shape stride, Shape padding, boolean ceilMode) { return LambdaBlock.singleton( - array -> lpPool2d(array, normType, kernelShape, stride, padding, ceilMode)); + array -> lpPool2d(array, normType, kernelShape, stride, padding, ceilMode), + "lpPool2d"); } /** @@ -996,7 +1001,8 @@ public static Block lpPool2dBlock(float normType, Shape kernelShape) { public static Block lpPool3dBlock( float normType, Shape kernelShape, Shape stride, Shape padding, boolean ceilMode) { return LambdaBlock.singleton( - array -> lpPool3d(array, normType, kernelShape, stride, padding, ceilMode)); + array -> lpPool3d(array, normType, kernelShape, stride, padding, ceilMode), + "lpPool3d"); } /** @@ -1051,7 +1057,7 @@ public static Block lpPool3dBlock(float normType, Shape kernelShape) { * globalLpPool1d} pooling function */ public static Block globalLpPool1dBlock(float normType) { - return LambdaBlock.singleton(array -> globalLpPool1d(array, normType)); + return LambdaBlock.singleton(array -> globalLpPool1d(array, normType), "globalLpPool1d"); } /** @@ -1063,7 +1069,7 @@ public static Block globalLpPool1dBlock(float normType) { * globalLpPool2d} pooling function */ public static Block globalLpPool2dBlock(float normType) { - return LambdaBlock.singleton(array -> globalLpPool2d(array, normType)); + return LambdaBlock.singleton(array -> globalLpPool2d(array, normType), "globalLpPool2d"); } /** @@ -1075,6 +1081,6 @@ public static Block globalLpPool2dBlock(float normType) { * globalLpPool3d} pooling function */ public static Block globalLpPool3dBlock(float normType) { - return LambdaBlock.singleton(array -> globalLpPool3d(array, normType)); + return LambdaBlock.singleton(array -> globalLpPool3d(array, normType), "globalLpPool3d"); } } From 0208ce9d9f04ac990ed645cee709d2307675d547 Mon Sep 17 00:00:00 2001 From: Frank Liu Date: Mon, 20 Jun 2022 13:07:52 -0700 Subject: [PATCH 5/7] [tensorflow] Avoid NPE in TfEngine (#1734) Fixes #1733 Change-Id: I445f25e376accc84f12ce5ef324fcc4b06f4497c --- .../src/main/java/ai/djl/tensorflow/engine/TfEngine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfEngine.java b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfEngine.java index d9969b967276..bd8d10f36405 100644 --- a/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfEngine.java +++ b/engines/tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfEngine.java @@ -63,7 +63,7 @@ static TfEngine newInstance() { TensorFlow.version(); return new TfEngine(); } catch (Throwable t) { - if (t.getMessage().contains("libstdc++")) { + if (t.getMessage() != null && t.getMessage().contains("libstdc++")) { // Does not mention .so to work with osx .dylib String msg = "There was an issue with your libstdc++ file required for the Tensorflow" From fb61b7ce8e1fc7a7342ee3fb2c6791049a176b68 Mon Sep 17 00:00:00 2001 From: Qing Lan Date: Mon, 20 Jun 2022 18:54:33 -0700 Subject: [PATCH 6/7] add disable static option in DJL to allow some model running (#1735) --- .../how_to_convert_your_model_to_symbol.md | 23 +++++++++++++++++-- .../main/java/ai/djl/mxnet/jna/JnaUtils.java | 12 +++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/docs/mxnet/how_to_convert_your_model_to_symbol.md b/docs/mxnet/how_to_convert_your_model_to_symbol.md index 54d6af4922e8..79b1319db272 100644 --- a/docs/mxnet/how_to_convert_your_model_to_symbol.md +++ b/docs/mxnet/how_to_convert_your_model_to_symbol.md @@ -14,7 +14,7 @@ net.add(nn.Dense(10)) # initialize and hybridize the block net.initialize() -net.hybridize() +net.hybridize(static_alloc=True, static_shape=True) # create sample input and run forward once x = nd.random.uniform(shape=(2, 20)) @@ -36,7 +36,7 @@ from gluoncv import model_zoo # get the pretrained model from the gluon model zoo net = model_zoo.get_model('resnet18_v1', pretrained=True) -net.hybridize() +net.hybridize(static_alloc=True, static_shape=True) # create a sample input and run forward once (required for tracing) x = nd.random.uniform(shape=(1, 3, 224, 224)) @@ -45,3 +45,22 @@ net(x) # export your model net.export("sample_model") ``` + +### hybridize without `static_alloc=True, static_shape=True` + +It is always recommended enabling the static settings when exporting Apache MXNet model. This will ensure DJL to have the best performance for inference. + +If you run hybridize without `static_alloc=True, static_shape=True`: + +``` +net.hybridize() +``` + +you can enable this Java property with DJL: + +``` +-Dai.djl.mxnet.static_alloc=False -Dai.djl.mxnet.static_shape=False +``` + +This will ensure we skip the static settings in the inference model and make DJL produce consistent result with Python. + diff --git a/engines/mxnet/mxnet-engine/src/main/java/ai/djl/mxnet/jna/JnaUtils.java b/engines/mxnet/mxnet-engine/src/main/java/ai/djl/mxnet/jna/JnaUtils.java index 7e071c6220ff..a7010b343d6d 100644 --- a/engines/mxnet/mxnet-engine/src/main/java/ai/djl/mxnet/jna/JnaUtils.java +++ b/engines/mxnet/mxnet-engine/src/main/java/ai/djl/mxnet/jna/JnaUtils.java @@ -1887,8 +1887,18 @@ public static CachedOp createCachedOp( PointerByReference ref = REFS.acquire(); // static_alloc and static_shape are enabled by default + String staticAlloc = "1"; + String staticShape = "1"; + if (!Boolean.parseBoolean(System.getProperty("ai.djl.mxnet.static_alloc", "true"))) { + staticAlloc = "0"; + } + if (!Boolean.parseBoolean(System.getProperty("ai.djl.mxnet.static_shape", "true"))) { + staticShape = "0"; + } String[] keys = {"data_indices", "param_indices", "static_alloc", "static_shape"}; - String[] values = {dataIndices.values().toString(), paramIndices.toString(), "1", "1"}; + String[] values = { + dataIndices.values().toString(), paramIndices.toString(), staticAlloc, staticShape + }; checkCall(LIB.MXCreateCachedOpEx(symbolHandle, keys.length, keys, values, ref)); Pointer pointer = ref.getValue(); From fe5ee3fee97092a82896db5562c0e2be77ee00a4 Mon Sep 17 00:00:00 2001 From: Frank Liu Date: Tue, 21 Jun 2022 08:15:23 -0700 Subject: [PATCH 7/7] [mxnet] Update document to use MXNet 1.9.0 (#1737) Change-Id: I990c1db63a52890010579d4896b3ea9e598abd11 --- engines/mxnet/mxnet-engine/README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/engines/mxnet/mxnet-engine/README.md b/engines/mxnet/mxnet-engine/README.md index 9d00548f631a..09f88bfa4a95 100644 --- a/engines/mxnet/mxnet-engine/README.md +++ b/engines/mxnet/mxnet-engine/README.md @@ -50,7 +50,7 @@ Finally, you can also specify the path to a valid MXNet build using the `MXNET_L For macOS, you can use the following library: -- ai.djl.mxnet:mxnet-native-mkl:1.8.0:osx-x86_64 +- ai.djl.mxnet:mxnet-native-mkl:1.9.0:osx-x86_64 This package takes advantage of the Intel MKL library to boost performance. ```xml @@ -58,7 +58,7 @@ For macOS, you can use the following library: ai.djl.mxnet mxnet-native-mkl osx-x86_64 - 1.8.0 + 1.9.0 runtime ``` @@ -76,15 +76,15 @@ Apache MXNet no longer statically link CUDNN and NCCL in it. Apache MXNet 1.8.0 cu110 package supports SM 5.0, 6.0, 7.0 and 8.0 cuda architectures. Apache MXNet 1.8.0 cu102 package supports SM 3.0, 5.0, 6.0, 7.0 and 7.5 cuda architectures. -- ai.djl.mxnet:mxnet-native-cu102mkl:1.8.0:linux-x86_64 - CUDA 11.0 -- ai.djl.mxnet:mxnet-native-cu101mkl:1.8.0:linux-x86_64 - CUDA 10.2 +- ai.djl.mxnet:mxnet-native-cu102mkl:1.9.0:linux-x86_64 - CUDA 11.2 +- ai.djl.mxnet:mxnet-native-cu101mkl:1.9.0:linux-x86_64 - CUDA 10.2 ```xml ai.djl.mxnet - mxnet-native-cu110mkl + mxnet-native-cu112mkl linux-x86_64 - 1.8.0 + 1.9.0 runtime ``` @@ -94,14 +94,14 @@ Apache MXNet 1.8.0 cu102 package supports SM 3.0, 5.0, 6.0, 7.0 and 7.5 cuda arc ai.djl.mxnet mxnet-native-cu102mkl linux-x86_64 - 1.8.0 + 1.9.0 runtime ``` #### Linux CPU -- ai.djl.mxnet:mxnet-native-mkl:1.8.0:linux-x86_64 +- ai.djl.mxnet:mxnet-native-mkl:1.9.0:linux-x86_64 ```xml @@ -109,7 +109,7 @@ Apache MXNet 1.8.0 cu102 package supports SM 3.0, 5.0, 6.0, 7.0 and 7.5 cuda arc mxnet-native-mkl linux-x86_64 runtime - 1.8.0 + 1.9.0 ``` @@ -126,11 +126,11 @@ You can still access GPU on windows by using the [automatic runtime download](#I #### Windows GPU -This package supports CUDA 11.0 and CUDA 10.2 for Windows. +This package supports CUDA 11.2 and CUDA 10.2 for Windows. ### Windows CPU -- ai.djl.mxnet:mxnet-native-mkl:1.8.0:win-x86_64 +- ai.djl.mxnet:mxnet-native-mkl:1.9.0:win-x86_64 ```xml @@ -138,6 +138,6 @@ This package supports CUDA 11.0 and CUDA 10.2 for Windows. mxnet-native-mkl win-x86_64 runtime - 1.8.0 + 1.9.0 ```