From efcd6240830d24545eb8b9602f1b98f73e949ace Mon Sep 17 00:00:00 2001
From: Sebastian Nickels <snickels@foxfire.consulting>
Date: Thu, 23 May 2019 08:39:30 +0200
Subject: [PATCH] Updated for multiple instructions change

---
 pom.xml                                                   | 8 ++++----
 src/test/resources/models/Alexnet.emadl                   | 2 +-
 src/test/resources/models/InstanceTest/NetworkB.emadl     | 2 +-
 src/test/resources/models/InvalidLayerInput.emadl         | 2 +-
 src/test/resources/models/MultipleOutputs.emadl           | 2 +-
 src/test/resources/models/ResNeXt50.emadl                 | 2 +-
 src/test/resources/models/ResNet152.emadl                 | 2 +-
 src/test/resources/models/ResNet34.emadl                  | 2 +-
 src/test/resources/models/ThreeInputCNN_M14.emadl         | 2 +-
 src/test/resources/models/VGG16.emadl                     | 2 +-
 src/test/resources/models/cNNCalculator/Network.emadl     | 2 +-
 src/test/resources/models/cifar10/CifarNetwork.emadl      | 2 +-
 .../resources/models/instanceTestCifar/CifarNetwork.emadl | 2 +-
 src/test/resources/models/mnist/LeNetNetwork.emadl        | 2 +-
 .../resources/models/simpleCifar10/CifarNetwork.emadl     | 2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index 007cea1..791e099 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,18 +8,18 @@
 
   <groupId>de.monticore.lang.monticar</groupId>
   <artifactId>embedded-montiarc-emadl-generator</artifactId>
-  <version>0.3.0</version>
+  <version>0.3.0-SNAPSHOT</version>
 
   <!-- == PROJECT DEPENDENCIES ============================================= -->
 
   <properties>
 
     <!-- .. SE-Libraries .................................................. -->
-    <emadl.version>0.2.6</emadl.version>
-    <CNNTrain.version>0.2.6</CNNTrain.version>
+    <emadl.version>0.2.7-SNAPSHOT</emadl.version>
+    <CNNTrain.version>0.3.0-SNAPSHOT</CNNTrain.version>
     <cnnarch-mxnet-generator.version>0.2.14-SNAPSHOT</cnnarch-mxnet-generator.version>
     <cnnarch-caffe2-generator.version>0.2.11-SNAPSHOT</cnnarch-caffe2-generator.version>
-    <cnnarch-gluon-generator.version>0.1.6</cnnarch-gluon-generator.version>
+    <cnnarch-gluon-generator.version>0.2.0-SNAPSHOT</cnnarch-gluon-generator.version>
     <embedded-montiarc-math-opt-generator>0.1.4</embedded-montiarc-math-opt-generator>
 
         <!-- .. Libraries .................................................. -->
diff --git a/src/test/resources/models/Alexnet.emadl b/src/test/resources/models/Alexnet.emadl
index 2ebdf8a..10a9ea9 100644
--- a/src/test/resources/models/Alexnet.emadl
+++ b/src/test/resources/models/Alexnet.emadl
@@ -41,7 +41,7 @@ component Alexnet{
         fc(->=2) ->
         FullyConnected(units=1000) ->
         Softmax() ->
-        predictions
+        predictions;
 
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/InstanceTest/NetworkB.emadl b/src/test/resources/models/InstanceTest/NetworkB.emadl
index fe4d404..5f43423 100644
--- a/src/test/resources/models/InstanceTest/NetworkB.emadl
+++ b/src/test/resources/models/InstanceTest/NetworkB.emadl
@@ -18,7 +18,7 @@ component NetworkB<Z classes = 10> (Z convChannels){
         Dropout() ->
         FullyConnected(units=classes) ->
         Softmax() ->
-        predictions
+        predictions;
 
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/InvalidLayerInput.emadl b/src/test/resources/models/InvalidLayerInput.emadl
index 39dfc46..176a056 100644
--- a/src/test/resources/models/InvalidLayerInput.emadl
+++ b/src/test/resources/models/InvalidLayerInput.emadl
@@ -27,6 +27,6 @@ component InvalidLayerInput{
         fc() ->
         FullyConnected(units=1000) ->
         Softmax() ->
-        predictions
+        predictions;
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/MultipleOutputs.emadl b/src/test/resources/models/MultipleOutputs.emadl
index 5a90917..3d0c00d 100644
--- a/src/test/resources/models/MultipleOutputs.emadl
+++ b/src/test/resources/models/MultipleOutputs.emadl
@@ -24,6 +24,6 @@ component MultipleOutputs{
             [1] ->
             Softmax() ->
             pred[1]
-        )
+        );
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/ResNeXt50.emadl b/src/test/resources/models/ResNeXt50.emadl
index 83fa122..a0666ab 100644
--- a/src/test/resources/models/ResNeXt50.emadl
+++ b/src/test/resources/models/ResNeXt50.emadl
@@ -40,6 +40,6 @@ component ResNeXt50{
         GlobalPooling(pool_type="avg") ->
         FullyConnected(units=1000) ->
         Softmax() ->
-        predictions
+        predictions;
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/ResNet152.emadl b/src/test/resources/models/ResNet152.emadl
index 571e6f8..6769eae 100644
--- a/src/test/resources/models/ResNet152.emadl
+++ b/src/test/resources/models/ResNet152.emadl
@@ -34,6 +34,6 @@ component ResNet152{
         GlobalPooling(pool_type="avg") ->
         FullyConnected(units=1000) ->
         Softmax() ->
-        predictions
+        predictions;
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/ResNet34.emadl b/src/test/resources/models/ResNet34.emadl
index ae5e609..3e76dba 100644
--- a/src/test/resources/models/ResNet34.emadl
+++ b/src/test/resources/models/ResNet34.emadl
@@ -32,6 +32,6 @@ component ResNet34{
         GlobalPooling(pool_type="avg") ->
         FullyConnected(units=1000) ->
         Softmax() ->
-        predictions
+        predictions;
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/ThreeInputCNN_M14.emadl b/src/test/resources/models/ThreeInputCNN_M14.emadl
index 5328d09..add46cd 100644
--- a/src/test/resources/models/ThreeInputCNN_M14.emadl
+++ b/src/test/resources/models/ThreeInputCNN_M14.emadl
@@ -24,7 +24,7 @@ component ThreeInputCNN_M14{
         Relu() ->
         FullyConnected(units=10) ->
         Softmax() ->
-        predictions
+        predictions;
 
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/VGG16.emadl b/src/test/resources/models/VGG16.emadl
index f9007ec..dad51c5 100644
--- a/src/test/resources/models/VGG16.emadl
+++ b/src/test/resources/models/VGG16.emadl
@@ -29,6 +29,6 @@ component VGG16{
         fc() ->
         FullyConnected(units=1000) ->
         Softmax() ->
-        predictions
+        predictions;
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/cNNCalculator/Network.emadl b/src/test/resources/models/cNNCalculator/Network.emadl
index 7ee371c..aba73c0 100644
--- a/src/test/resources/models/cNNCalculator/Network.emadl
+++ b/src/test/resources/models/cNNCalculator/Network.emadl
@@ -14,7 +14,7 @@ component Network{
         Relu() ->
         FullyConnected(units=10) ->
         Softmax() ->
-        predictions
+        predictions;
 
     }
 }
diff --git a/src/test/resources/models/cifar10/CifarNetwork.emadl b/src/test/resources/models/cifar10/CifarNetwork.emadl
index 0719c3a..66ca644 100644
--- a/src/test/resources/models/cifar10/CifarNetwork.emadl
+++ b/src/test/resources/models/cifar10/CifarNetwork.emadl
@@ -34,7 +34,7 @@ component CifarNetwork<Z(2:oo) classes = 10>{
         Dropout()->
         FullyConnected(units=classes) ->
         Softmax() ->
-        softmax
+        softmax;
 
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/instanceTestCifar/CifarNetwork.emadl b/src/test/resources/models/instanceTestCifar/CifarNetwork.emadl
index 43333f5..2d50ee9 100644
--- a/src/test/resources/models/instanceTestCifar/CifarNetwork.emadl
+++ b/src/test/resources/models/instanceTestCifar/CifarNetwork.emadl
@@ -12,7 +12,7 @@ component CifarNetwork<Z(2:oo) classes = 10>{
         Dropout()->
         FullyConnected(units=classes) ->
         Softmax() ->
-        softmax
+        softmax;
 
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/models/mnist/LeNetNetwork.emadl b/src/test/resources/models/mnist/LeNetNetwork.emadl
index d6fe184..3b9c0ee 100644
--- a/src/test/resources/models/mnist/LeNetNetwork.emadl
+++ b/src/test/resources/models/mnist/LeNetNetwork.emadl
@@ -14,7 +14,7 @@ component LeNetNetwork<Z(2:oo) classes = 10>{
         Relu() ->
         FullyConnected(units=classes) ->
         Softmax() ->
-        predictions
+        predictions;
 
     }
 }
diff --git a/src/test/resources/models/simpleCifar10/CifarNetwork.emadl b/src/test/resources/models/simpleCifar10/CifarNetwork.emadl
index 63dabff..bb755c2 100644
--- a/src/test/resources/models/simpleCifar10/CifarNetwork.emadl
+++ b/src/test/resources/models/simpleCifar10/CifarNetwork.emadl
@@ -12,7 +12,7 @@ component CifarNetwork<Z(2:oo) classes = 10>{
         Dropout()->
         FullyConnected(units=classes) ->
         Softmax() ->
-        softmax
+        softmax;
 
     }
 }
\ No newline at end of file
-- 
GitLab