From 8d87b078c2a023bffca2b6ef92e192e03f69c687 Mon Sep 17 00:00:00 2001 From: Alex Black Date: Sat, 23 Nov 2019 12:09:37 +1100 Subject: [PATCH] Fix master (#74) * Remove non-existent cases Signed-off-by: Paul Dubs * Add dependency for non-oracle jdk Signed-off-by: Paul Dubs --- .../org/deeplearning4j/nn/conf/MultiLayerConfiguration.java | 4 ---- .../deeplearning4j-ui-parent/deeplearning4j-vertx/pom.xml | 6 +++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/MultiLayerConfiguration.java b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/MultiLayerConfiguration.java index 52a67ef16..b1ac6a968 100644 --- a/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/MultiLayerConfiguration.java +++ b/deeplearning4j/deeplearning4j-nn/src/main/java/org/deeplearning4j/nn/conf/MultiLayerConfiguration.java @@ -27,7 +27,6 @@ import org.deeplearning4j.nn.conf.memory.LayerMemoryReport; import org.deeplearning4j.nn.conf.memory.MemoryReport; import org.deeplearning4j.nn.conf.memory.NetworkMemoryReport; import org.deeplearning4j.nn.conf.serde.JsonMappers; -import org.deeplearning4j.nn.layers.recurrent.LastTimeStepLayer; import org.deeplearning4j.nn.weights.IWeightInit; import org.deeplearning4j.nn.weights.WeightInit; import org.deeplearning4j.util.OutputLayerUtil; @@ -248,11 +247,8 @@ public class MultiLayerConfiguration implements Serializable, Cloneable { break; //Remaining: TODO - case EXPLL: - case RMSE_XENT: case SQUARED_LOSS: case RECONSTRUCTION_CROSSENTROPY: - case CUSTOM: default: log.warn("OutputLayer with null LossFunction or pre-0.6.0 loss function configuration detected: could not set loss function for {}", lossFunction); diff --git a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/pom.xml b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/pom.xml index 044c3220d..8a621b40b 100644 --- a/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/pom.xml +++ b/deeplearning4j/deeplearning4j-ui-parent/deeplearning4j-vertx/pom.xml @@ -70,7 +70,11 @@ - + + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.2 +