Merge branch 'develop' of...

Merge branch 'develop' of git.rwth-aachen.de:monticore/EmbeddedMontiArc/languages/CNNTrainLang into develop

cnntrainlang.log

-[INFO] Scanning for projects...
-[INFO] 
-[INFO] ----------------< de.monticore.lang.monticar:cnn-train >----------------
-[INFO] Building cnn-train 0.3.6-SNAPSHOT
-[INFO] --------------------------------[ jar ]---------------------------------
-[INFO] 
-[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cnn-train ---
-[INFO] Deleting /home/julian/Dropbox/Dokumente/bachelorarbeit/pipeline/CNNTrainLang/target
-[INFO] 
-[INFO] --- jacoco-maven-plugin:0.8.1:prepare-agent (pre-unit-test) @ cnn-train ---
-[INFO] argLine set to -javaagent:/home/julian/.m2/repository/org/jacoco/org.jacoco.agent/0.8.1/org.jacoco.agent-0.8.1-runtime.jar=destfile=/home/julian/Dropbox/Dokumente/bachelorarbeit/pipeline/CNNTrainLang/target/jacoco.exec
-[INFO] 
-[INFO] --- monticore-maven-plugin:5.0.1:generate (default) @ cnn-train ---
-[INFO] Changes detected for /home/julian/Dropbox/Dokumente/bachelorarbeit/pipeline/CNNTrainLang/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4. Regenerating...

src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4

@@ -30,6 +30,7 @@ grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.Number
     BatchSizeEntry implements ConfigEntry = name:"batch_size" ":" value:IntegerValue;
     LoadCheckpointEntry implements ConfigEntry = name:"load_checkpoint" ":" value:BooleanValue;
     CheckpointPeriodEntry implements ConfigEntry = name:"checkpoint_period" ":" value:IntegerValue;
+    LoadPretrainedEntry implements ConfigEntry = name:"load_pretrained" ":" value:BooleanValue;
     LogPeriodEntry implements ConfigEntry = name:"log_period" ":" value:IntegerValue;
     NormalizeEntry implements ConfigEntry = name:"normalize" ":" value:BooleanValue;
 
@@ -46,6 +47,7 @@ grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.Number
     interface EvalMetricValue extends MultiParamValue;
     AccuracyEvalMetric implements EvalMetricValue = name:"accuracy";
     BleuMetric implements EvalMetricValue = name:"bleu" ("{" params:BleuEntry* "}")?;
+    AccIgnoreLabelMetric implements EvalMetricValue = name:"accuracy_ignore_label" ("{" params:AccIgnoreLabelEntry* "}")?;
     CrossEntropyEvalMetric implements EvalMetricValue = name:"cross_entropy";
     F1EvalMetric implements EvalMetricValue = name:"f1";
     MAEEvalMetric implements EvalMetricValue = name:"mae";
@@ -57,6 +59,10 @@ grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.Number
     interface BleuEntry extends Entry;
     ExcludeBleuEntry implements BleuEntry = name:"exclude" ":" value:IntegerListValue;
 
+    interface AccIgnoreLabelEntry extends Entry;
+    AxisAccIgnoreLabelEntry implements AccIgnoreLabelEntry = name:"axis" ":" value:IntegerValue;
+    IgnoreLabelAccIgnoreLabelEntry implements AccIgnoreLabelEntry = name:"metric_ignore_label" ":" value:IntegerValue;
+
     EvalTrainEntry implements ConfigEntry = name:"eval_train" ":" value:BooleanValue;
 
     LRPolicyValue implements ConfigValue =(fixed:"fixed"
@@ -91,6 +97,12 @@ grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.Number
     interface SoftmaxCrossEntropyIgnoreIndicesEntry extends Entry;
     SoftmaxCrossEntropyIgnoreIndicesLoss implements LossValue = name:"softmax_cross_entropy_ignore_indices" ("{" params:SoftmaxCrossEntropyIgnoreIndicesEntry* "}")?;
 
+    interface DiceEntry extends Entry;
+    DiceLoss implements LossValue = name:"dice_loss" ("{" params:DiceEntry* "}")?;
+
+    interface SoftmaxCrossEntropyIgnoreLabelEntry extends Entry;
+    SoftmaxCrossEntropyIgnoreLabelLoss implements LossValue = name:"softmax_cross_entropy_ignore_label" ("{" params:SoftmaxCrossEntropyIgnoreLabelEntry* "}")?;
+
     SigmoidBinaryCrossEntropyLoss implements LossValue = name:"sigmoid_binary_cross_entropy" ("{" params:Entry* "}")?;
 
     interface HingeEntry extends Entry;
@@ -105,11 +117,12 @@ grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.Number
     interface KullbackLeiblerEntry extends Entry;
     KullbackLeiblerLoss implements LossValue = name:"kullback_leibler" ("{" params:KullbackLeiblerEntry* "}")?;
 
-    SparseLabelEntry implements CrossEntropyEntry, SoftmaxCrossEntropyEntry, SoftmaxCrossEntropyIgnoreIndicesEntry = name:"sparse_label" ":" value:BooleanValue;
-    FromLogitsEntry implements SoftmaxCrossEntropyEntry, SoftmaxCrossEntropyIgnoreIndicesEntry, KullbackLeiblerEntry = name:"from_logits" ":" value:BooleanValue;
-    LossAxisEntry implements CrossEntropyEntry, SoftmaxCrossEntropyEntry, SoftmaxCrossEntropyIgnoreIndicesEntry = name:"loss_axis" ":" value:IntegerValue;
-    BatchAxisEntry implements CrossEntropyEntry, SoftmaxCrossEntropyEntry, SoftmaxCrossEntropyIgnoreIndicesEntry = name:"batch_axis" ":" value:IntegerValue;
+    SparseLabelEntry implements CrossEntropyEntry, SoftmaxCrossEntropyEntry, SoftmaxCrossEntropyIgnoreIndicesEntry, DiceEntry, SoftmaxCrossEntropyIgnoreLabelEntry = name:"sparse_label" ":" value:BooleanValue;
+    FromLogitsEntry implements SoftmaxCrossEntropyEntry, SoftmaxCrossEntropyIgnoreIndicesEntry, KullbackLeiblerEntry, DiceEntry, SoftmaxCrossEntropyIgnoreLabelEntry = name:"from_logits" ":" value:BooleanValue;
+    LossAxisEntry implements CrossEntropyEntry, SoftmaxCrossEntropyEntry, SoftmaxCrossEntropyIgnoreIndicesEntry, DiceEntry,SoftmaxCrossEntropyIgnoreLabelEntry = name:"loss_axis" ":" value:IntegerValue;
+    BatchAxisEntry implements CrossEntropyEntry, SoftmaxCrossEntropyEntry, SoftmaxCrossEntropyIgnoreIndicesEntry, DiceEntry, SoftmaxCrossEntropyIgnoreLabelEntry = name:"batch_axis" ":" value:IntegerValue;
     IgnoreIndicesEntry implements SoftmaxCrossEntropyIgnoreIndicesEntry = name:"ignore_indices" ":" value:IntegerValue;
+    IgnoreLabelEntry implements SoftmaxCrossEntropyIgnoreLabelEntry = name:"loss_ignore_label" ":" value:IntegerValue;
     MarginEntry implements HingeEntry, SquaredHingeEntry = name:"margin" ":" value:NumberValue;
     LabelFormatEntry implements LogisticEntry = name:"label_format" ":" value:StringValue;
 

src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/ParameterAlgorithmMapping.java

@@ -38,10 +38,13 @@ class ParameterAlgorithmMapping {
         ASTBatchSizeEntry.class,
         ASTLoadCheckpointEntry.class,
         ASTCheckpointPeriodEntry.class,
+        ASTLoadPretrainedEntry.class,
         ASTLogPeriodEntry.class,
         ASTEvalMetricEntry.class,
         ASTEvalTrainEntry.class,
         ASTExcludeBleuEntry.class,
+        ASTAxisAccIgnoreLabelEntry.class,
+        ASTIgnoreLabelAccIgnoreLabelEntry.class,
         ASTNormalizeEntry.class,
         ASTNumEpochEntry.class,
         ASTLossEntry.class,
@@ -51,6 +54,7 @@ class ParameterAlgorithmMapping {
         ASTBatchAxisEntry.class,
         ASTFromLogitsEntry.class,
         ASTIgnoreIndicesEntry.class,
+        ASTIgnoreLabelEntry.class,
         ASTMarginEntry.class,
         ASTLabelFormatEntry.class,
         ASTRhoEntry.class,

src/main/java/de/monticore/lang/monticar/cnntrain/_symboltable/CNNTrainSymbolTableCreator.java

@@ -54,7 +54,7 @@ public class CNNTrainSymbolTableCreator extends CNNTrainSymbolTableCreatorTOP {
         CNNTrainCompilationUnitSymbol compilationUnitSymbol = new CNNTrainCompilationUnitSymbol(compilationUnit.getName());
         addToScopeAndLinkWithNode(compilationUnitSymbol, compilationUnit);
     }
-    
+
 
     @Override
     public void endVisit(ASTCNNTrainCompilationUnit ast) {
@@ -216,6 +216,14 @@ public class CNNTrainSymbolTableCreator extends CNNTrainSymbolTableCreatorTOP {
         configuration.getEntryMap().put(node.getName(), entry);
     }
 
+    @Override
+    public void endVisit(ASTLoadPretrainedEntry node) {
+        EntrySymbol entry = new EntrySymbol(node.getName());
+        entry.setValue(getValueSymbolForBoolean(node.getValue()));
+        addToScopeAndLinkWithNode(entry, node);
+        configuration.getEntryMap().put(node.getName(), entry);
+    }
+
     @Override
     public void endVisit(ASTLogPeriodEntry node) {
         EntrySymbol entry = new EntrySymbol(node.getName());
@@ -305,7 +313,7 @@ public class CNNTrainSymbolTableCreator extends CNNTrainSymbolTableCreatorTOP {
         EntrySymbol entry = new EntrySymbol(node.getName());
         entry.setValue(getValueSymbolForDoubleVector(node.getValue()));
         addToScopeAndLinkWithNode(entry, node);
-        configuration.getEntryMap().put(node.getName(), entry); 
+        configuration.getEntryMap().put(node.getName(), entry);
     }
 
     @Override
@@ -359,8 +367,8 @@ public class CNNTrainSymbolTableCreator extends CNNTrainSymbolTableCreatorTOP {
         }
         addToScopeAndLinkWithNode(value, node);
     }
-	
-	
+
+
     private ValueSymbol getValueSymbolForInteger(ASTIntegerValue astIntegerValue) {
         ValueSymbol value = new ValueSymbol();
         Integer value_as_int = getIntegerFromNumber(astIntegerValue);
@@ -395,7 +403,7 @@ public class CNNTrainSymbolTableCreator extends CNNTrainSymbolTableCreatorTOP {
         value.setValue(value_as_double_list);
         return value;
     }
-    
+
     private ValueSymbol getValueSymbolForComponentName(ASTComponentNameValue astComponentNameValue) {
         ValueSymbol value = new ValueSymbol();
         List<String> valueAsList = astComponentNameValue.getNameList();
@@ -455,7 +463,7 @@ public class CNNTrainSymbolTableCreator extends CNNTrainSymbolTableCreatorTOP {
         addToScopeAndLinkWithNode(entry, node);
         configuration.getEntryMap().put(node.getName(), entry);
     }
-    
+
     @Override
     public void visit(ASTLearningMethodEntry node) {
         EntrySymbol entry = new EntrySymbol(node.getName());

src/test/java/de/monticore/lang/monticar/cnntrain/SymtabTest.java

@@ -31,6 +31,7 @@ public class SymtabTest extends AbstractSymtabTest {
         CNNTrainCompilationUnitSymbol a = symTab.<CNNTrainCompilationUnitSymbol>resolve(
                 "SimpleConfig2",
                 CNNTrainCompilationUnitSymbol.KIND).orElse(null);
+
         assertNotNull(a);
 
     }

src/test/resources/valid_tests/AccuracyIgnoreLabel.cnnt

+/* (c) https://github.com/MontiCore/monticore */
+configuration FullConfig{
+    num_epoch : 5
+    batch_size : 100
+    load_pretrained : true
+    eval_metric : accuracy_ignore_label{
+        axis : 1
+        ignore_label : 255
+    }
+    loss: dice_loss{
+    sparse_label: true
+    from_logits: true
+    loss_axis : -1
+    batch_axis : 0
+    }
+    context : gpu
+    normalize : true
+    optimizer : rmsprop{
+        learning_rate : 0.001
+        learning_rate_minimum : 0.00001
+        weight_decay : 0.01
+        learning_rate_decay : 0.9
+        learning_rate_policy : step
+        step_size : 1000
+        rescale_grad : 1.1
+        clip_gradient : 10
+        gamma1 : 0.9
+        gamma2 : 0.9
+        epsilon : 0.000001
+        centered : true
+        clip_weights : 10
+    }
+}

src/test/resources/valid_tests/FullConfig3.cnnt

+/* (c) https://github.com/MontiCore/monticore */
+configuration FullConfig{
+     num_epoch : 5
+     batch_size : 100
+     load_checkpoint : true
+     eval_metric : mse
+     loss: softmax_cross_entropy{
+        sparse_label: true
+        from_logits: true
+     }
+     context : gpu
+     normalize : true
+     optimizer : rmsprop{
+         learning_rate : 0.001
+         learning_rate_minimum : 0.00001
+         weight_decay : 0.01
+         learning_rate_decay : 0.9
+         learning_rate_policy : step
+         step_size : 1000
+         rescale_grad : 1.1
+         clip_gradient : 10
+         gamma1 : 0.9
+         gamma2 : 0.9
+         epsilon : 0.000001
+         centered : true
+         clip_weights : 10
+     }
+}

src/test/resources/valid_tests/FullConfig4.cnnt

+/* (c) https://github.com/MontiCore/monticore */
+configuration FullConfig{
+     num_epoch : 5
+     batch_size : 100
+     load_pretrained : true
+     eval_metric : mse
+     loss: dice_loss{
+        sparse_label: true
+        from_logits: true
+        loss_axis : -1
+        batch_axis : 0
+     }
+     context : gpu
+     normalize : true
+     optimizer : rmsprop{
+         learning_rate : 0.001
+         learning_rate_minimum : 0.00001
+         weight_decay : 0.01
+         learning_rate_decay : 0.9
+         learning_rate_policy : step
+         step_size : 1000
+         rescale_grad : 1.1
+         clip_gradient : 10
+         gamma1 : 0.9
+         gamma2 : 0.9
+         epsilon : 0.000001
+         centered : true
+         clip_weights : 10
+     }
+}