Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CAMEL-17537: camel-djl - Upgrade to 0.16.0 #7514

Merged
merged 1 commit into from Apr 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion camel-dependencies/pom.xml
Expand Up @@ -176,7 +176,7 @@
<djl-mxnet-native-version>1.8.0</djl-mxnet-native-version>
<djl-pytorch-native-version>1.8.1</djl-pytorch-native-version>
<djl-tensorflow-native-version>2.4.1</djl-tensorflow-native-version>
<djl-version>0.11.0</djl-version>
<djl-version>0.16.0</djl-version>
<dnsjava-version>3.5.0</dnsjava-version>
<docker-java-version>3.2.13</docker-java-version>
<dozer-version>6.5.2</dozer-version>
Expand Down
Expand Up @@ -20,10 +20,10 @@
import java.io.IOException;
import java.nio.file.Paths;

import ai.djl.Device;
import ai.djl.Model;
import ai.djl.basicdataset.cv.classification.Mnist;
import ai.djl.basicmodelzoo.basic.Mlp;
import ai.djl.engine.Engine;
import ai.djl.metric.Metrics;
import ai.djl.ndarray.types.Shape;
import ai.djl.nn.Block;
Expand All @@ -37,13 +37,9 @@
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;

// Helper to train mnist model for tests
public final class MnistTraining {
private static final Logger LOG = LoggerFactory.getLogger(MnistTraining.class);

private static final String MODEL_DIR = "src/test/resources/models/mnist";
private static final String MODEL_NAME = "mlp";

Expand All @@ -62,9 +58,10 @@ public static void main(String[] args) throws IOException, TranslateException {
RandomAccessDataset trainingSet = prepareDataset(Dataset.Usage.TRAIN, 64, Long.MAX_VALUE);
RandomAccessDataset validateSet = prepareDataset(Dataset.Usage.TEST, 64, Long.MAX_VALUE);

final Engine engine = Engine.getInstance();
// setup training configuration
DefaultTrainingConfig config = new DefaultTrainingConfig(Loss.softmaxCrossEntropyLoss())
.addEvaluator(new Accuracy()).optDevices(Device.getDevices(Device.getGpuCount()))
.addEvaluator(new Accuracy()).optDevices(engine.getDevices(engine.getGpuCount()))
.addTrainingListeners(TrainingListener.Defaults.logging());

try (Trainer trainer = model.newTrainer(config)) {
Expand Down
2 changes: 1 addition & 1 deletion parent/pom.xml
Expand Up @@ -154,7 +154,7 @@
<directory-watcher-version>0.15.1</directory-watcher-version>
<disruptor-version>3.4.4</disruptor-version>
<dnsjava-version>3.5.0</dnsjava-version>
<djl-version>0.11.0</djl-version>
<djl-version>0.16.0</djl-version>
<djl-mxnet-native-version>1.8.0</djl-mxnet-native-version>
<djl-pytorch-native-version>1.8.1</djl-pytorch-native-version>
<djl-tensorflow-native-version>2.4.1</djl-tensorflow-native-version>
Expand Down