From 2aa2a8be4019dbf2ce0b58082796a5cc58387d84 Mon Sep 17 00:00:00 2001 From: Ross Messing Date: Mon, 25 Jan 2021 19:10:13 -0500 Subject: [PATCH] Added Maximum merge layer to getKerasLayerFromConfig (#9161) Signed-off-by: Ross Messing --- .../nn/modelimport/keras/utils/KerasLayerUtils.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasLayerUtils.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasLayerUtils.java index 13d555281..6b1fe6b08 100644 --- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasLayerUtils.java +++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasLayerUtils.java @@ -280,6 +280,9 @@ public class KerasLayerUtils { } else if (layerClassName.equals(conf.getLAYER_CLASS_NAME_MULTIPLY()) || layerClassName.equals(conf.getLAYER_CLASS_NAME_FUNCTIONAL_MULTIPLY())) { layer = new KerasMerge(layerConfig, ElementWiseVertex.Op.Product, enforceTrainingConfig); + } else if (layerClassName.equals(conf.getLAYER_CLASS_NAME_MAXIMUM()) || + layerClassName.equals(conf.getLAYER_CLASS_NAME_FUNCTIONAL_MAXIMUM())) { + layer = new KerasMerge(layerConfig, ElementWiseVertex.Op.Max, enforceTrainingConfig); } else if (layerClassName.equals(conf.getLAYER_CLASS_NAME_CONCATENATE()) || layerClassName.equals(conf.getLAYER_CLASS_NAME_FUNCTIONAL_CONCATENATE())) { layer = new KerasMerge(layerConfig, null, enforceTrainingConfig);