From c0f3254ac95cc9a190b6edc22e9b2f25ccd31247 Mon Sep 17 00:00:00 2001
From: "julian.treiber" <julian.treiber@rwth-aachen.de>
Date: Thu, 30 Jan 2020 15:13:51 +0100
Subject: [PATCH] added parameter loss axis for CrossEntropy losses

---
 src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4        | 1 +
 .../lang/monticar/cnntrain/_cocos/ParameterAlgorithmMapping.java | 1 +
 src/test/resources/valid_tests/FullConfig.cnnt                   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4 b/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4
index b5dd4c6..fe4a894 100644
--- a/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4
+++ b/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4
@@ -107,6 +107,7 @@ grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.Number
 
     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;
     IgnoreIndicesEntry implements SoftmaxCrossEntropyIgnoreIndicesEntry = name:"ignore_indices" ":" value:IntegerValue;
     MarginEntry implements HingeEntry, SquaredHingeEntry = name:"margin" ":" value:NumberValue;
     LabelFormatEntry implements LogisticEntry = name:"label_format" ":" value:StringValue;
diff --git a/src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/ParameterAlgorithmMapping.java b/src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/ParameterAlgorithmMapping.java
index 2614fb0..8f5c60b 100644
--- a/src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/ParameterAlgorithmMapping.java
+++ b/src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/ParameterAlgorithmMapping.java
@@ -47,6 +47,7 @@ class ParameterAlgorithmMapping {
         ASTLossEntry.class,
 		ASTLossWeightsEntry.class,
         ASTSparseLabelEntry.class,
+        ASTLossAxisEntry.class,
         ASTFromLogitsEntry.class,
         ASTIgnoreIndicesEntry.class,
         ASTMarginEntry.class,
diff --git a/src/test/resources/valid_tests/FullConfig.cnnt b/src/test/resources/valid_tests/FullConfig.cnnt
index 1d054f6..07893b4 100644
--- a/src/test/resources/valid_tests/FullConfig.cnnt
+++ b/src/test/resources/valid_tests/FullConfig.cnnt
@@ -7,6 +7,7 @@ configuration FullConfig{
      loss: softmax_cross_entropy{
         sparse_label: true
         from_logits: true
+        loss_axis : -1
      }
      context : gpu
      normalize : true
-- 
GitLab