Added LSTM and GRU layers

pom.xml

@@ -8,14 +8,14 @@
 
   <groupId>de.monticore.lang.monticar</groupId>
   <artifactId>cnnarch-gluon-generator</artifactId>
-  <version>0.2.7-SNAPSHOT</version>
+  <version>0.2.8-SNAPSHOT</version>
 
   <!-- == PROJECT DEPENDENCIES ============================================= -->
 
   <properties>
 
     <!-- .. SE-Libraries .................................................. -->
-      <CNNArch.version>0.3.2-SNAPSHOT</CNNArch.version>
+      <CNNArch.version>0.3.3-SNAPSHOT</CNNArch.version>
       <CNNTrain.version>0.3.6-SNAPSHOT</CNNTrain.version>
       <CNNArch2X.version>0.0.3-SNAPSHOT</CNNArch2X.version>
       <embedded-montiarc-math-opt-generator>0.1.4</embedded-montiarc-math-opt-generator>

src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNArch2GluonLayerSupportChecker.java

@@ -24,6 +24,8 @@ public class CNNArch2GluonLayerSupportChecker extends LayerSupportChecker {
         supportedLayerList.add(AllPredefinedLayers.FLATTEN_NAME);
         supportedLayerList.add(AllPredefinedLayers.ONE_HOT_NAME);
         supportedLayerList.add(AllPredefinedLayers.RNN_NAME);
+        supportedLayerList.add(AllPredefinedLayers.LSTM_NAME);
+        supportedLayerList.add(AllPredefinedLayers.GRU_NAME);
     }
 
 }

src/main/resources/templates/gluon/elements/GRU.ftl

+<#if element.member == "NONE">
+<#assign input = element.inputs[0]>
+<#if mode == "ARCHITECTURE_DEFINITION">
+            self.rnn_${element.element.name} = gluon.rnn.GRU(hidden_size=${element.units?c}, num_layers=${element.layers?c}, layout='NTC')
+            <#include "OutputShape.ftl">
+<#elseif mode == "FORWARD_FUNCTION">
+        ${element.name}, ${element.element.name}_state_ = self.rnn_${element.element.name}(${input}, ${element.element.name}_state_)
+</#if>
+<#elseif element.member == "STATE">
+<#if element.inputs?size gte 1>
+<#assign input = element.inputs[0]>
+<#if mode == "FORWARD_FUNCTION">
+        ${element.name} = ${input}
+<#elseif mode == "PYTHON_INLINE">
+                    ${element.name} = ${input}
+<#elseif mode == "CPP_INLINE">
+    ${element.name} = ${input}
+</#if>
+</#if>
+</#if>
\ No newline at end of file

src/main/resources/templates/gluon/elements/LSTM.ftl

+<#if element.member == "NONE">
+<#assign input = element.inputs[0]>
+<#if mode == "ARCHITECTURE_DEFINITION">
+            self.rnn_${element.element.name} = gluon.rnn.LSTM(hidden_size=${element.units?c}, num_layers=${element.layers?c}, layout='NTC')
+            <#include "OutputShape.ftl">
+<#elseif mode == "FORWARD_FUNCTION">
+        ${element.name}, ${element.element.name}_state_ = self.rnn_${element.element.name}(${input}, ${element.element.name}_state_)
+</#if>
+<#elseif element.member == "STATE">
+<#if element.inputs?size gte 1>
+<#assign input = element.inputs[0]>
+<#if mode == "FORWARD_FUNCTION">
+        ${element.name} = ${input}
+<#elseif mode == "PYTHON_INLINE">
+                    ${element.name} = ${input}
+<#elseif mode == "CPP_INLINE">
+    ${element.name} = ${input}
+</#if>
+</#if>
+</#if>
\ No newline at end of file

src/main/resources/templates/gluon/elements/RNN.ftl

 <#if element.member == "NONE">
 <#assign input = element.inputs[0]>
 <#if mode == "ARCHITECTURE_DEFINITION">
-            self.rnn_${element.element.name} = gluon.rnn.RNN(hidden_size=${element.units?c}, num_layers=${element.layers?c}, layout='NTC')
+            self.rnn_${element.element.name} = gluon.rnn.RNN(hidden_size=${element.units?c}, num_layers=${element.layers?c}, activation='tanh', layout='NTC')
             <#include "OutputShape.ftl">
 <#elseif mode == "FORWARD_FUNCTION">
         ${element.name}, ${element.element.name}_state_ = self.rnn_${element.element.name}(${input}, ${element.element.name}_state_)