From 89631ebf76aceeddad5f77922be62e8100f9274d Mon Sep 17 00:00:00 2001 From: Zach Kimberg Date: Tue, 12 Jan 2021 16:42:47 -0800 Subject: [PATCH] Rename DJL-Easy to DJL-Zero Change-Id: I7b40591eb1e3768ea790b100665127adf3cf8091 --- djl-easy/src/main/javadoc/overview.html | 14 -------------- {djl-easy => djl-zero}/README.md | 8 ++++---- {djl-easy => djl-zero}/build.gradle | 0 {djl-easy => djl-zero}/gradlew | 0 .../src/main/java/ai/djl/zero}/DatasetFactory.java | 2 +- .../src/main/java/ai/djl/zero}/Performance.java | 2 +- .../src/main/java/ai/djl/zero}/RequireZoo.java | 2 +- .../java/ai/djl/zero}/cv/ImageClassification.java | 6 +++--- .../cv/ImageClassificationDatasetFactory.java | 4 ++-- .../main/java/ai/djl/zero}/cv/package-info.java | 5 ++--- .../src/main/java/ai/djl/zero}/package-info.java | 6 +++--- djl-zero/src/main/javadoc/overview.html | 14 ++++++++++++++ .../ai/djl/zero}/cv/ImageClassificationTest.java | 6 +++--- .../test/java/ai/djl/zero}/cv/package-info.java | 4 ++-- settings.gradle | 2 +- 15 files changed, 37 insertions(+), 38 deletions(-) delete mode 100644 djl-easy/src/main/javadoc/overview.html rename {djl-easy => djl-zero}/README.md (64%) rename {djl-easy => djl-zero}/build.gradle (100%) rename {djl-easy => djl-zero}/gradlew (100%) rename {djl-easy/src/main/java/ai/djl/easy => djl-zero/src/main/java/ai/djl/zero}/DatasetFactory.java (98%) rename {djl-easy/src/main/java/ai/djl/easy => djl-zero/src/main/java/ai/djl/zero}/Performance.java (98%) rename {djl-easy/src/main/java/ai/djl/easy => djl-zero/src/main/java/ai/djl/zero}/RequireZoo.java (99%) rename {djl-easy/src/main/java/ai/djl/easy => djl-zero/src/main/java/ai/djl/zero}/cv/ImageClassification.java (98%) rename {djl-easy/src/main/java/ai/djl/easy => djl-zero/src/main/java/ai/djl/zero}/cv/ImageClassificationDatasetFactory.java (96%) rename {djl-easy/src/main/java/ai/djl/easy => djl-zero/src/main/java/ai/djl/zero}/cv/package-info.java (81%) rename {djl-easy/src/main/java/ai/djl/easy => djl-zero/src/main/java/ai/djl/zero}/package-info.java (79%) create mode 100644 djl-zero/src/main/javadoc/overview.html rename {djl-easy/src/test/java/ai/djl/easy => djl-zero/src/test/java/ai/djl/zero}/cv/ImageClassificationTest.java (94%) rename {djl-easy/src/test/java/ai/djl/easy => djl-zero/src/test/java/ai/djl/zero}/cv/package-info.java (88%) diff --git a/djl-easy/src/main/javadoc/overview.html b/djl-easy/src/main/javadoc/overview.html deleted file mode 100644 index 6b48c4c15f2..00000000000 --- a/djl-easy/src/main/javadoc/overview.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - -

This document is the API specification for the Deep Java Library (DJL) easy API.

- -

- The easy module contains a no deep learning knowledge required wrapper over DJL. - See here for more details. -

- - - diff --git a/djl-easy/README.md b/djl-zero/README.md similarity index 64% rename from djl-easy/README.md rename to djl-zero/README.md index 1dbbecd121b..1e0792d673e 100644 --- a/djl-easy/README.md +++ b/djl-zero/README.md @@ -1,8 +1,8 @@ -# DJL Easy +# DJL Zero ## Overview -This module is a no deep learning knowledge required wrapper over DJL. Instead of worrying about finding a model or how to train, this will provide a simple recommendation for your deep learning application. It is the easiest way to get started with DJL and get a solution for your deep learning problem. +This module is a zero deep learning knowledge required wrapper over DJL. Instead of worrying about finding a model or how to train, this will provide a simple recommendation for your deep learning application. It is the easiest way to get started with DJL and get a solution for your deep learning problem. ## List of Applications @@ -13,7 +13,7 @@ This module contains the following applications: ## Documentation -The latest javadocs can be found on the [djl.ai website](https://javadoc.io/doc/ai.djl/easy/latest/index.html). +The latest javadocs can be found on the [djl.ai website](https://javadoc.io/doc/ai.djl/zero/latest/index.html). You can also build the latest javadocs locally using the following command: @@ -33,7 +33,7 @@ You can pull the module from the central Maven repository by including the follo ```xml ai.djl - easy + djl-zero 0.10.0-SNAPSHOT ``` diff --git a/djl-easy/build.gradle b/djl-zero/build.gradle similarity index 100% rename from djl-easy/build.gradle rename to djl-zero/build.gradle diff --git a/djl-easy/gradlew b/djl-zero/gradlew similarity index 100% rename from djl-easy/gradlew rename to djl-zero/gradlew diff --git a/djl-easy/src/main/java/ai/djl/easy/DatasetFactory.java b/djl-zero/src/main/java/ai/djl/zero/DatasetFactory.java similarity index 98% rename from djl-easy/src/main/java/ai/djl/easy/DatasetFactory.java rename to djl-zero/src/main/java/ai/djl/zero/DatasetFactory.java index a50e51583e4..7afbc178ae4 100644 --- a/djl-easy/src/main/java/ai/djl/easy/DatasetFactory.java +++ b/djl-zero/src/main/java/ai/djl/zero/DatasetFactory.java @@ -10,7 +10,7 @@ * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions * and limitations under the License. */ -package ai.djl.easy; +package ai.djl.zero; import ai.djl.training.dataset.Dataset; import ai.djl.training.dataset.Dataset.Usage; diff --git a/djl-easy/src/main/java/ai/djl/easy/Performance.java b/djl-zero/src/main/java/ai/djl/zero/Performance.java similarity index 98% rename from djl-easy/src/main/java/ai/djl/easy/Performance.java rename to djl-zero/src/main/java/ai/djl/zero/Performance.java index d2d956858c3..4bbf7735805 100644 --- a/djl-easy/src/main/java/ai/djl/easy/Performance.java +++ b/djl-zero/src/main/java/ai/djl/zero/Performance.java @@ -10,7 +10,7 @@ * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions * and limitations under the License. */ -package ai.djl.easy; +package ai.djl.zero; /** * Describes the speed/accuracy tradeoff. diff --git a/djl-easy/src/main/java/ai/djl/easy/RequireZoo.java b/djl-zero/src/main/java/ai/djl/zero/RequireZoo.java similarity index 99% rename from djl-easy/src/main/java/ai/djl/easy/RequireZoo.java rename to djl-zero/src/main/java/ai/djl/zero/RequireZoo.java index 1da61fac554..04c0028a0cc 100644 --- a/djl-easy/src/main/java/ai/djl/easy/RequireZoo.java +++ b/djl-zero/src/main/java/ai/djl/zero/RequireZoo.java @@ -10,7 +10,7 @@ * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions * and limitations under the License. */ -package ai.djl.easy; +package ai.djl.zero; import ai.djl.engine.Engine; import ai.djl.repository.zoo.ModelZoo; diff --git a/djl-easy/src/main/java/ai/djl/easy/cv/ImageClassification.java b/djl-zero/src/main/java/ai/djl/zero/cv/ImageClassification.java similarity index 98% rename from djl-easy/src/main/java/ai/djl/easy/cv/ImageClassification.java rename to djl-zero/src/main/java/ai/djl/zero/cv/ImageClassification.java index 02d6d439be4..7ef7dd56200 100644 --- a/djl-easy/src/main/java/ai/djl/easy/cv/ImageClassification.java +++ b/djl-zero/src/main/java/ai/djl/zero/cv/ImageClassification.java @@ -10,7 +10,7 @@ * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions * and limitations under the License. */ -package ai.djl.easy.cv; +package ai.djl.zero.cv; import ai.djl.Application.CV; import ai.djl.MalformedModelException; @@ -18,8 +18,6 @@ import ai.djl.basicdataset.cv.classification.ImageNet; import ai.djl.basicdataset.cv.classification.Mnist; import ai.djl.basicmodelzoo.cv.classification.ResNetV1; -import ai.djl.easy.Performance; -import ai.djl.easy.RequireZoo; import ai.djl.modality.Classifications; import ai.djl.modality.cv.Image; import ai.djl.modality.cv.transform.Resize; @@ -41,6 +39,8 @@ import ai.djl.training.loss.Loss; import ai.djl.translate.TranslateException; import ai.djl.translate.Translator; +import ai.djl.zero.Performance; +import ai.djl.zero.RequireZoo; import java.io.IOException; import java.util.List; diff --git a/djl-easy/src/main/java/ai/djl/easy/cv/ImageClassificationDatasetFactory.java b/djl-zero/src/main/java/ai/djl/zero/cv/ImageClassificationDatasetFactory.java similarity index 96% rename from djl-easy/src/main/java/ai/djl/easy/cv/ImageClassificationDatasetFactory.java rename to djl-zero/src/main/java/ai/djl/zero/cv/ImageClassificationDatasetFactory.java index b2e5b6bbdf8..4a0963442f7 100644 --- a/djl-easy/src/main/java/ai/djl/easy/cv/ImageClassificationDatasetFactory.java +++ b/djl-zero/src/main/java/ai/djl/zero/cv/ImageClassificationDatasetFactory.java @@ -10,11 +10,11 @@ * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions * and limitations under the License. */ -package ai.djl.easy.cv; +package ai.djl.zero.cv; import ai.djl.basicdataset.ImageClassificationDataset; -import ai.djl.easy.DatasetFactory; import ai.djl.training.dataset.Dataset.Usage; +import ai.djl.zero.DatasetFactory; import java.util.List; /** A {@link DatasetFactory} for {@link ImageClassification}. */ diff --git a/djl-easy/src/main/java/ai/djl/easy/cv/package-info.java b/djl-zero/src/main/java/ai/djl/zero/cv/package-info.java similarity index 81% rename from djl-easy/src/main/java/ai/djl/easy/cv/package-info.java rename to djl-zero/src/main/java/ai/djl/zero/cv/package-info.java index bfb20bb5beb..f5cc9f26a40 100644 --- a/djl-easy/src/main/java/ai/djl/easy/cv/package-info.java +++ b/djl-zero/src/main/java/ai/djl/zero/cv/package-info.java @@ -12,7 +12,6 @@ */ /** - * Contains easy pretrained models and training for Computer Vision({@link ai.djl.Application.CV}) - * tasks. + * Contains pretrained models and training for Computer Vision({@link ai.djl.Application.CV}) tasks. */ -package ai.djl.easy.cv; +package ai.djl.zero.cv; diff --git a/djl-easy/src/main/java/ai/djl/easy/package-info.java b/djl-zero/src/main/java/ai/djl/zero/package-info.java similarity index 79% rename from djl-easy/src/main/java/ai/djl/easy/package-info.java rename to djl-zero/src/main/java/ai/djl/zero/package-info.java index cabe513e53b..8c64d054e17 100644 --- a/djl-easy/src/main/java/ai/djl/easy/package-info.java +++ b/djl-zero/src/main/java/ai/djl/zero/package-info.java @@ -12,8 +12,8 @@ */ /** - * Contains a no deep learning knowledge required wrapper over DJL. + * Contains a zero deep learning knowledge required wrapper over DJL. * - *

See more details. + *

See more details. */ -package ai.djl.easy; +package ai.djl.zero; diff --git a/djl-zero/src/main/javadoc/overview.html b/djl-zero/src/main/javadoc/overview.html new file mode 100644 index 00000000000..2c10f0850f0 --- /dev/null +++ b/djl-zero/src/main/javadoc/overview.html @@ -0,0 +1,14 @@ + + + + + +

This document is the API specification for the Deep Java Library (DJL) Zero API.

+ +

+ The zero module contains a zero deep learning knowledge required wrapper over DJL. + See here for more details. +

+ + + diff --git a/djl-easy/src/test/java/ai/djl/easy/cv/ImageClassificationTest.java b/djl-zero/src/test/java/ai/djl/zero/cv/ImageClassificationTest.java similarity index 94% rename from djl-easy/src/test/java/ai/djl/easy/cv/ImageClassificationTest.java rename to djl-zero/src/test/java/ai/djl/zero/cv/ImageClassificationTest.java index 8fd815e17b9..14916b5a922 100644 --- a/djl-easy/src/test/java/ai/djl/easy/cv/ImageClassificationTest.java +++ b/djl-zero/src/test/java/ai/djl/zero/cv/ImageClassificationTest.java @@ -10,14 +10,14 @@ * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions * and limitations under the License. */ -package ai.djl.easy.cv; +package ai.djl.zero.cv; import ai.djl.MalformedModelException; -import ai.djl.easy.Performance; -import ai.djl.easy.cv.ImageClassification.Classes; import ai.djl.modality.cv.Image; import ai.djl.repository.zoo.ModelNotFoundException; import ai.djl.repository.zoo.ZooModel; +import ai.djl.zero.Performance; +import ai.djl.zero.cv.ImageClassification.Classes; import java.io.IOException; import java.io.InputStream; import java.net.URL; diff --git a/djl-easy/src/test/java/ai/djl/easy/cv/package-info.java b/djl-zero/src/test/java/ai/djl/zero/cv/package-info.java similarity index 88% rename from djl-easy/src/test/java/ai/djl/easy/cv/package-info.java rename to djl-zero/src/test/java/ai/djl/zero/cv/package-info.java index 54794ae91d2..92e4d1223e4 100644 --- a/djl-easy/src/test/java/ai/djl/easy/cv/package-info.java +++ b/djl-zero/src/test/java/ai/djl/zero/cv/package-info.java @@ -11,5 +11,5 @@ * and limitations under the License. */ -/** Contains tests for {@link ai.djl.easy.cv}. */ -package ai.djl.easy.cv; +/** Contains tests for {@link ai.djl.zero.cv}. */ +package ai.djl.zero.cv; diff --git a/settings.gradle b/settings.gradle index a587b28431f..4732711b82f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,7 +3,7 @@ include ':api' include ':basicdataset' include ':examples' include ':model-zoo' -include ':djl-easy' +include ':djl-zero' include ':serving' include ':integration' include ':mxnet:jnarator'