You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/01/12 09:23:03 UTC
[camel] branch master updated: Upgrade to Deep Java Library 0.9.0
(#4864)
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 522a074 Upgrade to Deep Java Library 0.9.0 (#4864)
522a074 is described below
commit 522a0748e28fefe303b6a761b6fa6acdba0fae1d
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Tue Jan 12 04:22:32 2021 -0500
Upgrade to Deep Java Library 0.9.0 (#4864)
---
camel-dependencies/pom.xml | 6 +++---
.../djl/ImageClassificationLocalTest.java | 3 +--
.../component/djl/training/MnistTraining.java | 2 +-
.../test/resources/models/mnist/mlp-0007.params | Bin 438209 -> 438234 bytes
parent/pom.xml | 6 +++---
5 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index a50aeea..e101b6a 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -172,9 +172,9 @@
<directory-watcher-version>0.11.0</directory-watcher-version>
<disruptor-version>3.4.2</disruptor-version>
<djl-mxnet-native-version>1.7.0-backport</djl-mxnet-native-version>
- <djl-pytorch-native-version>1.6.0</djl-pytorch-native-version>
- <djl-tensorflow-native-version>2.3.0</djl-tensorflow-native-version>
- <djl-version>0.8.0</djl-version>
+ <djl-pytorch-native-version>1.7.0</djl-pytorch-native-version>
+ <djl-tensorflow-native-version>2.3.1</djl-tensorflow-native-version>
+ <djl-version>0.9.0</djl-version>
<dnsjava-version>3.3.1</dnsjava-version>
<docker-java-version>3.2.7</docker-java-version>
<dozer-version>6.5.0</dozer-version>
diff --git a/components/camel-djl/src/test/java/org/apache/camel/component/djl/ImageClassificationLocalTest.java b/components/camel-djl/src/test/java/org/apache/camel/component/djl/ImageClassificationLocalTest.java
index 5d33661..f244c20 100644
--- a/components/camel-djl/src/test/java/org/apache/camel/component/djl/ImageClassificationLocalTest.java
+++ b/components/camel-djl/src/test/java/org/apache/camel/component/djl/ImageClassificationLocalTest.java
@@ -33,7 +33,6 @@ import ai.djl.modality.Classifications;
import ai.djl.modality.cv.Image;
import ai.djl.modality.cv.transform.ToTensor;
import ai.djl.modality.cv.translator.ImageClassificationTranslator;
-import ai.djl.translate.TranslateException;
import ai.djl.translate.Translator;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -86,7 +85,7 @@ public class ImageClassificationLocalTest extends CamelTestSupport {
};
}
- private void loadLocalModel() throws IOException, MalformedModelException, TranslateException {
+ private void loadLocalModel() throws IOException, MalformedModelException {
// create deep learning model
Model model = Model.newInstance(MODEL_NAME);
model.setBlock(new Mlp(28 * 28, 10, new int[] { 128, 64 }));
diff --git a/components/camel-djl/src/test/java/org/apache/camel/component/djl/training/MnistTraining.java b/components/camel-djl/src/test/java/org/apache/camel/component/djl/training/MnistTraining.java
index 9ee10fc..dc9b2f0 100644
--- a/components/camel-djl/src/test/java/org/apache/camel/component/djl/training/MnistTraining.java
+++ b/components/camel-djl/src/test/java/org/apache/camel/component/djl/training/MnistTraining.java
@@ -74,7 +74,7 @@ public final class MnistTraining {
// initialize trainer with proper input shape
trainer.initialize(inputShape);
- EasyTrain.fit(trainer, 10, trainingSet, validateSet);
+ EasyTrain.fit(trainer, 20, trainingSet, validateSet);
}
model.save(Paths.get(MODEL_DIR), MODEL_NAME);
}
diff --git a/components/camel-djl/src/test/resources/models/mnist/mlp-0007.params b/components/camel-djl/src/test/resources/models/mnist/mlp-0007.params
index 46c099f..96ea89d 100644
Binary files a/components/camel-djl/src/test/resources/models/mnist/mlp-0007.params and b/components/camel-djl/src/test/resources/models/mnist/mlp-0007.params differ
diff --git a/parent/pom.xml b/parent/pom.xml
index 5c512a0..37c5a0c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -151,10 +151,10 @@
<directory-watcher-version>0.11.0</directory-watcher-version>
<disruptor-version>3.4.2</disruptor-version>
<dnsjava-version>3.3.1</dnsjava-version>
- <djl-version>0.8.0</djl-version>
+ <djl-version>0.9.0</djl-version>
<djl-mxnet-native-version>1.7.0-backport</djl-mxnet-native-version>
- <djl-pytorch-native-version>1.6.0</djl-pytorch-native-version>
- <djl-tensorflow-native-version>2.3.0</djl-tensorflow-native-version>
+ <djl-pytorch-native-version>1.7.0</djl-pytorch-native-version>
+ <djl-tensorflow-native-version>2.3.1</djl-tensorflow-native-version>
<docker-java-version>3.2.7</docker-java-version>
<dozer-version>6.5.0</dozer-version>
<drools-version>7.47.0.Final</drools-version>