Commit d28d9e4e authored by Evgeny Kusmenko's avatar Evgeny Kusmenko

Merge branch 'develop' into 'master'

Develop

See merge request !29
parents 9f74da3c fe10fd90
Pipeline #324195 passed with stage
in 4 minutes and 24 seconds
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<groupId>de.monticore.lang.monticar</groupId> <groupId>de.monticore.lang.monticar</groupId>
<artifactId>cnn-train</artifactId> <artifactId>cnn-train</artifactId>
<version>0.3.11-SNAPSHOT</version> <version>0.3.12-SNAPSHOT</version>
<!-- == PROJECT DEPENDENCIES ============================================= --> <!-- == PROJECT DEPENDENCIES ============================================= -->
......
...@@ -73,6 +73,7 @@ grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.Number ...@@ -73,6 +73,7 @@ grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.Number
| inv:"inv" | inv:"inv"
| poly:"poly" | poly:"poly"
| sigmoid:"sigmoid"); | sigmoid:"sigmoid");
TrainContextValue implements ConfigValue = (cpu:"cpu" | gpu:"gpu"); TrainContextValue implements ConfigValue = (cpu:"cpu" | gpu:"gpu");
interface OptimizerParamEntry extends Entry; interface OptimizerParamEntry extends Entry;
...@@ -135,6 +136,8 @@ grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.Number ...@@ -135,6 +136,8 @@ grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.Number
interface AdamEntry extends OptimizerParamEntry; interface AdamEntry extends OptimizerParamEntry;
AdamOptimizer implements OptimizerValue = name:"adam" ("{" params:AdamEntry* "}")?; AdamOptimizer implements OptimizerValue = name:"adam" ("{" params:AdamEntry* "}")?;
AdamWOptimizer implements OptimizerValue = name:"adamw" ("{" params:AdamEntry* "}")?;
interface RmsPropEntry extends OptimizerParamEntry; interface RmsPropEntry extends OptimizerParamEntry;
RmsPropOptimizer implements OptimizerValue = name:"rmsprop" ("{" params:RmsPropEntry* "}")?; RmsPropOptimizer implements OptimizerValue = name:"rmsprop" ("{" params:RmsPropEntry* "}")?;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment