progress

src/main/java/de/monticore/lang/monticar/cnnarch/_symboltable/CNNArchSymbolTableCreator.java

@@ -256,14 +256,6 @@ public class CNNArchSymbolTableCreator extends de.monticore.symboltable.CommonSy
         UnrollDeclarationSymbol unrollDeclaration = (UnrollDeclarationSymbol) ast.getSymbolOpt().get();
         unrollDeclaration.setBody((SerialCompositeElementSymbol) ast.getBody().getSymbolOpt().get());
 
-        try{
-            System.err.println("Body: " + (ast.getBody().getSymbolOpt().get().toString()));
-            System.err.println("Body2: " + (ast.getBody().getElementsList().toString()));
-            System.err.println("Body_Name: " + ast.getName());
-        }catch(Exception e){
-            e.printStackTrace();
-        }
-
         List<VariableSymbol> parameters = new ArrayList<>(4);
         for (ASTLayerParameter astParam : ast.getParametersList()){
             VariableSymbol parameter = (VariableSymbol) astParam.getSymbolOpt().get();
@@ -360,6 +352,7 @@ public class CNNArchSymbolTableCreator extends de.monticore.symboltable.CommonSy
     @Override
     public void endVisit(ASTUnroll ast) {
         UnrollSymbol layer = (UnrollSymbol) ast.getSymbolOpt().get();
+        layer.getDeclaration().setBody((SerialCompositeElementSymbol) ast.getBody().getSymbolOpt().get());
 
         List<ArgumentSymbol> arguments = new ArrayList<>(6);
         for (ASTArchArgument astArgument : ast.getArgumentsList()){

src/main/java/de/monticore/lang/monticar/cnnarch/_symboltable/UnrollDeclarationSymbol.java

@@ -76,6 +76,7 @@ public class UnrollDeclarationSymbol extends CommonScopeSpanningSymbol {
     }
 
     public SerialCompositeElementSymbol getBody() {
+        System.err.println("Body_elements in UNROLLDECLARATIONSYMBOL: " + body.getElements().toString());
         return body;
     }
 

src/main/java/de/monticore/lang/monticar/cnnarch/predefined/BeamSearchStart.java

@@ -38,15 +38,16 @@ public class BeamSearchStart extends PredefinedUnrollDeclaration {
     public List<ArchTypeSymbol> computeOutputTypes(List<ArchTypeSymbol> inputTypes, UnrollSymbol layer) {
 
         try {
-            System.err.println("TEST0: ");
-            System.err.println("LastElementSize-3: " + getAstNode().get().toString());
-            System.err.println("LastElementSize-2: " + getBody().getLastAtomicElements().toString());
-            //System.err.println("LastElementSize-1: " + layer.computeOutputTypes().toString());
-            //System.err.println("LastElementSize0: " + layer.getDeclaration().toString());
-            //System.err.println("LastElementSize0.5: " + layer.getDeclaration().getBody().toString());
-            //System.err.println("LastElementSize1: " + layer.getDeclaration().getBody().getLastAtomicElements().size());
-            //System.err.println("LastElementSize2: " + layer.getDeclaration().getBody().computeOutputTypes());
-            //System.err.println("LastElementSize3: " + layer.getDeclaration().getBody().computeOutputTypes().size());
+            System.err.println("allElements: " + layer.getDeclaration().getBody().getElements().toString());
+            List<ArchitectureElementSymbol> elements = new ArrayList<ArchitectureElementSymbol>();
+            elements = layer.getDeclaration().getBody().getElements();
+            System.err.println("LastElement: " + elements.get(elements.size()-1));
+            //System.err.println("LastElement_Channels: " + elements.get(elements.size()-1).getOutputTypes().get(0).getChannels());
+            for(ArchitectureElementSymbol item:elements){
+                System.err.println("name2" + item.getOutputElement().get().toString());
+                System.err.println("channels: " + item.getOutputTypes().get(0).getChannels().toString());
+                System.err.println("name3" + item.getName());
+            }
         }catch(Exception e){
             e.printStackTrace();
         }

src/test/resources/architectures/Alexnet.cnna

@@ -2,15 +2,6 @@ architecture Alexnet(img_height=224, img_width=224, img_channels=3, classes=10){
     def input Z(0:255)^{img_channels, img_height, img_width} data
     def output Q(0:1)^{classes} predictions
 
-
-    unroll<t=5> beamSearchStart (width=5, max_length=50){
-        FullyConnected(units=4096) ->
-        Relu() ->
-        Dropout()
-    }
-
-
-
     def split1(i){
         [i] ->
         Convolution(kernel=(5,5), channels=128) ->