Merge branch 'tensorflow_group' into 'master'

Tensorflow group 2

See merge request !26

.circleci/config.yml

+#
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 # (c) https://github.com/MontiCore/monticore
 
 

.gitlab-ci.yml

+#
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 # (c) https://github.com/MontiCore/monticore
 #
 

README.md

@@ -3,6 +3,13 @@
 ![coverage](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/languages/CNNArchLang/badges/master/coverage.svg)
 
 # CNNArch
+
+**!!Attention: 
+For all layers with padding: For the gluon backend currently only the default value is working ("same"). As there is and was the same
+custom calculations done there is no behaviorial change to previous versions. See the following issue:
+https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/generators/cnnarch2x/issues/2
+!!**
+
 ## Introduction
 CNNArch is a descriptive language to model architectures of feedforward neural networks with a special focus on convolutional neural networks. 
 It is being developed for use in the MontiCar language family, along with CNNTrain, which configures the training of the network, and EmbeddedMontiArcDL, which integrates CNNArch into EmbeddedMontiArc.
@@ -403,4 +410,13 @@ All predefined methods start with a capital letter and all constructed methods h
 
   * **size** (integer > 0, optional): The OneHot-vector's size. Can be omitted to automatically use the output size of the architecture.
   
+* **UpConvolution(kernel, channels, stride=(1,1), no_bias=false, padding="same")**
+
+  Creates a up convolutional layer (also known as transposed convolution ). Is currently only supported in the tesnsorflow backend.
+    
+  * **kernel** (integer tuple > 0, required): convolution kernel size: (height, width).
+  * **channels** (integer > 0, required): number of up convolution filters and number of output channels.
+  * **stride** (integer tuple > 0, optional, default=(1,1)): up convolution stride: (height, width).
+  * **padding** ({"valid", "same", "no_loss"}, optional, default="same"): One of "valid", "same" or "no_loss". "valid" means no padding. "same"   results in padding the input such that the output has the same length as the original input divided by the stride (rounded up). "no_loss" results in minimal padding such that each input is used by at least one filter (identical to "valid" if *stride* equals 1).
+  * **no_bias** (boolean, optional, default=false): Whether to disable the bias parameter.
     

pom.xml

+<!--
+
+
+    (c) https://github.com/MontiCore/monticore
+
+    The license generally applicable for this project
+    can be found under https://github.com/MontiCore/monticore.
+
+-->
 <!-- (c) https://github.com/MontiCore/monticore -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"

settings.xml

 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    (c) https://github.com/MontiCore/monticore
+
+    The license generally applicable for this project
+    can be found under https://github.com/MontiCore/monticore.
+
+-->
 <!-- (c) https://github.com/MontiCore/monticore -->
 
 

src/main/java/de/monticore/lang/monticar/cnnarch/ConfigChainAutomation.properties

+#
+#
+# (c) https://github.com/MontiCore/monticore
+#
+# The license generally applicable for this project
+# can be found under https://github.com/MontiCore/monticore.
+#
+
 # (c) https://github.com/MontiCore/monticore
 
 #configuration chaniautomation

src/main/java/de/monticore/lang/monticar/cnnarch/_ast/ASTArchSpecialArgument.java

+/**
+ *
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.monticar.cnnarch._ast;
 

src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CNNArchCocos.java

+/**
+ *
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.monticar.cnnarch._cocos;
 

src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CNNArchSymbolCoCo.java

+/**
+ *
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.monticar.cnnarch._cocos;
 

src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CNNArchSymbolCoCoChecker.java

+/**
+ *
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.monticar.cnnarch._cocos;
 

src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckArchitectureFinished.java

+/**
+ *
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.monticar.cnnarch._cocos;
 

src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckArgument.java

+/**
+ *
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.monticar.cnnarch._cocos;
 

src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckElementInputs.java

+/**
+ *
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.monticar.cnnarch._cocos;
 

src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckExpressions.java

+/**
+ *
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.monticar.cnnarch._cocos;
 

src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckIOAccessAndIOMissing.java

+/**
+ *
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.monticar.cnnarch._cocos;
 

src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckIOType.java

+/**
+ *
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.monticar.cnnarch._cocos;
 

src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckLayer.java

+/**
+ *
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.monticar.cnnarch._cocos;
 

src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckLayerName.java

+/**
+ *
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.monticar.cnnarch._cocos;
 

src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckLayerRecursion.java

+/**
+ *
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.monticar.cnnarch._cocos;
 

src/main/java/de/monticore/lang/monticar/cnnarch/_cocos/CheckLayerVariableDeclarationIsUsed.java

+/**
+ *
+ * (c) https://github.com/MontiCore/monticore
+ *
+ * The license generally applicable for this project
+ * can be found under https://github.com/MontiCore/monticore.
+ */
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.monticar.cnnarch._cocos;