This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 60bad9d CAMEL-15221: Upgrade to Deep Java Library 0.5.0 (#3937)
60bad9d is described below
commit 60bad9dc897b824928ca7ba08c661470217e842d
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Mon Jun 22 00:10:46 2020 -0400
CAMEL-15221: Upgrade to Deep Java Library 0.5.0 (#3937)
---
camel-dependencies/pom.xml | 6 ++-
components/camel-djl/pom.xml | 50 +++++++++++++++++++++-
.../camel-djl/src/main/docs/djl-component.adoc | 40 ++++++++++++++---
parent/pom.xml | 6 ++-
4 files changed, 90 insertions(+), 12 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 1b0b983..3c42b51 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -168,8 +168,10 @@
<digitalocean-api-client-version>2.17</digitalocean-api-client-version>
<directory-watcher-version>0.9.10</directory-watcher-version>
<disruptor-version>3.4.2</disruptor-version>
- <djl-mxnet-native-version>1.6.0</djl-mxnet-native-version>
- <djl-version>0.4.0</djl-version>
+ <djl-mxnet-native-version>1.7.0-a</djl-mxnet-native-version>
+ <djl-pytorch-native-version>1.5.0</djl-pytorch-native-version>
+ <djl-tensorflow-native-version>2.1.0</djl-tensorflow-native-version>
+ <djl-version>0.5.0</djl-version>
<dnsjava-version>3.1.0</dnsjava-version>
<docker-java-version>3.2.1</docker-java-version>
<dozer-version>6.5.0</dozer-version>
diff --git a/components/camel-djl/pom.xml b/components/camel-djl/pom.xml
index f20bcec..178ffd2 100644
--- a/components/camel-djl/pom.xml
+++ b/components/camel-djl/pom.xml
@@ -49,16 +49,18 @@
<version>${djl-version}</version>
</dependency>
- <!-- MxNet Engine -->
+ <!-- MxNet Engine-->
<dependency>
<groupId>ai.djl.mxnet</groupId>
<artifactId>mxnet-model-zoo</artifactId>
<version>${djl-version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>ai.djl.mxnet</groupId>
<artifactId>mxnet-engine</artifactId>
<version>${djl-version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>ai.djl.mxnet</groupId>
@@ -67,6 +69,52 @@
<scope>runtime</scope>
</dependency>
+ <!-- Pytorch Engine -->
+ <dependency>
+ <groupId>ai.djl.pytorch</groupId>
+ <artifactId>pytorch-model-zoo</artifactId>
+ <version>${djl-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ai.djl.pytorch</groupId>
+ <artifactId>pytorch-engine</artifactId>
+ <version>${djl-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ai.djl.pytorch</groupId>
+ <artifactId>pytorch-native-auto</artifactId>
+ <version>${djl-pytorch-native-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Tensorflow Engine -->
+ <dependency>
+ <groupId>ai.djl.tensorflow</groupId>
+ <artifactId>tensorflow-model-zoo</artifactId>
+ <version>${djl-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ai.djl.tensorflow</groupId>
+ <artifactId>tensorflow-engine</artifactId>
+ <version>${djl-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ai.djl.tensorflow</groupId>
+ <artifactId>tensorflow-api</artifactId>
+ <version>${djl-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ai.djl.tensorflow</groupId>
+ <artifactId>tensorflow-native-auto</artifactId>
+ <version>${djl-tensorflow-native-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
<!-- logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/components/camel-djl/src/main/docs/djl-component.adoc
b/components/camel-djl/src/main/docs/djl-component.adoc
index 7a5f461..118f63b 100644
--- a/components/camel-djl/src/main/docs/djl-component.adoc
+++ b/components/camel-djl/src/main/docs/djl-component.adoc
@@ -120,7 +120,7 @@ You can pull the MXNet engine from the central Maven
repository by including the
<dependency>
<groupId>ai.djl.mxnet</groupId>
<artifactId>mxnet-engine</artifactId>
- <version>0.4.0</version>
+ <version>x.x.x</version>
<scope>runtime</scope>
</dependency>
----
@@ -133,7 +133,7 @@ It will automatically determine the appropriate jars for
your system based on th
<dependency>
<groupId>ai.djl.mxnet</groupId>
<artifactId>mxnet-native-auto</artifactId>
- <version>1.6.0</version>
+ <version>1.7.0-a</version>
<scope>runtime</scope>
</dependency>
----
@@ -147,9 +147,9 @@ You can pull the PyTorch engine from the central Maven
repository by including t
[source,xml]
----
<dependency>
- <groupId>ai.djl.mxnet</groupId>
+ <groupId>ai.djl.pytorch</groupId>
<artifactId>pytorch-engine</artifactId>
- <version>0.4.0</version>
+ <version>x.x.x</version>
<scope>runtime</scope>
</dependency>
----
@@ -160,9 +160,9 @@ It will automatically determine the appropriate jars for
your system based on th
[source,xml]
----
<dependency>
- <groupId>ai.djl.mxnet</groupId>
+ <groupId>ai.djl.pytorch</groupId>
<artifactId>pytorch-native-auto</artifactId>
- <version>1.4.0</version>
+ <version>1.5.0</version>
<scope>runtime</scope>
</dependency>
----
@@ -171,7 +171,33 @@ More information about
https://github.com/awslabs/djl/blob/master/pytorch/pytorc
=== Tensorflow engine
-Right now, the TensorFlow Engine is still experimental.
+You can pull the Tensorflow engine from the central Maven repository by
including the following dependency:
+
+[source,xml]
+----
+<dependency>
+ <groupId>ai.djl.tensorflow</groupId>
+ <artifactId>tensorflow-engine</artifactId>
+ <version>x.x.x</version>
+ <scope>runtime</scope>
+</dependency>
+----
+
+DJL offers an automatic option that will download the jars the first time you
run DJL.
+It will automatically determine the appropriate jars for your system based on
the platform and GPU support.
+
+[source,xml]
+----
+ <dependency>
+ <groupId>ai.djl.tensorflow</groupId>
+ <artifactId>tensorflow-native-auto</artifactId>
+ <version>2.1.0</version>
+ <scope>runtime</scope>
+ </dependency>
+----
+
+More information about
https://github.com/awslabs/djl/tree/master/tensorflow#installation[Tensorflow
engine installation]
+
== Examples
diff --git a/parent/pom.xml b/parent/pom.xml
index b4d2ab7..018ea7b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -147,8 +147,10 @@
<directory-watcher-version>0.9.10</directory-watcher-version>
<disruptor-version>3.4.2</disruptor-version>
<dnsjava-version>3.1.0</dnsjava-version>
- <djl-version>0.4.0</djl-version>
- <djl-mxnet-native-version>1.6.0</djl-mxnet-native-version>
+ <djl-version>0.5.0</djl-version>
+ <djl-mxnet-native-version>1.7.0-a</djl-mxnet-native-version>
+ <djl-pytorch-native-version>1.5.0</djl-pytorch-native-version>
+ <djl-tensorflow-native-version>2.1.0</djl-tensorflow-native-version>
<docker-java-version>3.2.1</docker-java-version>
<dozer-version>6.5.0</dozer-version>
<drools-version>7.38.0.Final</drools-version>
