From ebe413267b3951cedd428c4f60b1e8ce8050ee15 Mon Sep 17 00:00:00 2001
From: Rhys <rhys.compton@gmail.com>
Date: Tue, 24 Mar 2020 12:56:53 +1300
Subject: [PATCH 1/2] Added swish activation function in mapToActivation

Swish function already implemented, and accounted for in getActivationFunction, just not for in the if-else chain of mapToActivation
---
 .../nn/modelimport/keras/config/KerasLayerConfiguration.java    | 1 +
 .../nn/modelimport/keras/utils/KerasActivationUtils.java        | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/config/KerasLayerConfiguration.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/config/KerasLayerConfiguration.java
index 7841fdf27..4ffdc20c3 100644
--- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/config/KerasLayerConfiguration.java
+++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/config/KerasLayerConfiguration.java
@@ -334,6 +334,7 @@ public class KerasLayerConfiguration {
     private final String KERAS_ACTIVATION_SIGMOID = "sigmoid";
     private final String KERAS_ACTIVATION_HARD_SIGMOID = "hard_sigmoid";
     private final String KERAS_ACTIVATION_LINEAR = "linear";
+    private final String KERAS_ACTIVATION_SWISH = "swish";
     private final String KERAS_ACTIVATION_ELU = "elu"; // keras 2 only
     private final String KERAS_ACTIVATION_SELU = "selu"; // keras 2 only
 
diff --git a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasActivationUtils.java b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasActivationUtils.java
index f0ddfd912..cdf8bc923 100644
--- a/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasActivationUtils.java
+++ b/deeplearning4j/deeplearning4j-modelimport/src/main/java/org/deeplearning4j/nn/modelimport/keras/utils/KerasActivationUtils.java
@@ -63,6 +63,8 @@ public class KerasActivationUtils {
             dl4jActivation = Activation.HARDSIGMOID;
         } else if (kerasActivation.equals(conf.getKERAS_ACTIVATION_LINEAR())) {
             dl4jActivation = Activation.IDENTITY;
+        } else if (kerasActivation.equals(conf.getKERAS_ACTIVATION_SWISH())) {
+            dl4jActivation = Activation.SWISH;
         } else {
             throw new UnsupportedKerasConfigurationException(
                     "Unknown Keras activation function " + kerasActivation);

From 364f9a660c66003dbffceb9dd7ec957d961886ba Mon Sep 17 00:00:00 2001
From: mheck136 <mheck136@gmail.com>
Date: Thu, 26 Mar 2020 01:33:56 +0100
Subject: [PATCH 2/2] Set source and target version of nd4j-native to java 7
 (#8808)

Signed-off-by: Martin Heck <mheck136@gmail.com>
---
 nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml
index 4026de17e..0aab8c241 100644
--- a/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml
+++ b/nd4j/nd4j-backends/nd4j-backend-impls/nd4j-native/pom.xml
@@ -230,8 +230,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>7</source>
+                    <target>7</target>
                 </configuration>
             </plugin>
         </plugins>