Merge pull request deeplearning4j#4031 from deeplearning4j/mp_elu_mod…

…el_import support elu and selu in model import
KraFusion · Sep 8, 2017 · 648ebbd · 648ebbd
2 parents 79215bd + 4fa7389
commit 648ebbd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...ort/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasActivationUtils.java b/...ort/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasActivationUtils.java
@@ -50,6 +50,10 @@ public static IActivation mapActivation(String kerasActivation, KerasLayerConfig
             dl4jActivation = new ActivationSoftSign();
         } else if (kerasActivation.equals(conf.getKERAS_ACTIVATION_RELU())) {
             dl4jActivation = new ActivationReLU();
+        } else if (kerasActivation.equals(conf.getKERAS_ACTIVATION_ELU())) {
+            dl4jActivation = new ActivationELU();
+        } else if (kerasActivation.equals(conf.getKERAS_ACTIVATION_SELU())) {
+            dl4jActivation = new ActivationSELU();
         } else if (kerasActivation.equals(conf.getKERAS_ACTIVATION_TANH())) {
             dl4jActivation = new ActivationTanH();
         } else if (kerasActivation.equals(conf.getKERAS_ACTIVATION_SIGMOID())) {

diff --git a/deeplearning4j-modelimport/src/test/resources/configs/keras2/keras2_mlp_config.json b/deeplearning4j-modelimport/src/test/resources/configs/keras2/keras2_mlp_config.json
@@ -19,7 +19,7 @@
         "bias_regularizer": null,
         "bias_constraint": null,
         "dtype": "float32",
-        "activation": "linear",
+        "activation": "elu",
         "trainable": true,
         "kernel_regularizer": null,
         "bias_initializer": {
@@ -100,7 +100,7 @@
         "bias_regularizer": null,
         "bias_constraint": null,
         "dtype": "float32",
-        "activation": "tanh",
+        "activation": "selu",
         "trainable": true,
         "kernel_regularizer": null,
         "bias_initializer": {