diff --git a/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4 b/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4 index b5dd4c673948fa459be41c925b8b3e8b699b049d..fe4a89473404d99008f8761f7dc62d7146fe71dc 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 2614fb0efb785a73f6263adf6051f9210e4c4887..8f5c60b2cef1a49f67e73aaf354e80742efa0a14 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 1d054f6d9d81ed48eb49d910b7b8c109850ebbff..07893b4ca64266237bbe0e117698b7fa475d34f0 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