diff --git a/pom.xml b/pom.xml index 8cf0f649174290ea9a04583104fabf6e544cb623..2e4bc4f3a7bd5d7a6f1f083bd5e3fadad00af0c8 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ 0.2.8-SNAPSHOT 0.3.2-SNAPSHOT + 0.0.1-SNAPSHOT 0.2.16-SNAPSHOT 0.2.12-SNAPSHOT 0.2.1-SNAPSHOT @@ -68,6 +69,12 @@ ${embedded-montiarc-math-opt-generator} + + de.monticore.lang.monticar + cnnarch-generator + ${cnnarch-generator.version} + + de.monticore.lang.monticar cnnarch-mxnet-generator diff --git a/src/main/java/de/monticore/lang/monticar/emadl/generator/Backend.java b/src/main/java/de/monticore/lang/monticar/emadl/generator/Backend.java index 9675093ce52031beba539c49cbad1cc55e57f230..4f867a83250b6c3da6495734674e5f9b34d5e23c 100644 --- a/src/main/java/de/monticore/lang/monticar/emadl/generator/Backend.java +++ b/src/main/java/de/monticore/lang/monticar/emadl/generator/Backend.java @@ -1,14 +1,14 @@ package de.monticore.lang.monticar.emadl.generator; -import de.monticore.lang.monticar.cnnarch.CNNArchGenerator; +import de.monticore.lang.monticar.cnnarch.generator.CNNArchGenerator; +import de.monticore.lang.monticar.cnnarch.generator.CNNTrainGenerator; import de.monticore.lang.monticar.cnnarch.gluongenerator.CNNArch2Gluon; import de.monticore.lang.monticar.cnnarch.gluongenerator.CNNTrain2Gluon; import de.monticore.lang.monticar.cnnarch.mxnetgenerator.CNNArch2MxNet; import de.monticore.lang.monticar.cnnarch.caffe2generator.CNNArch2Caffe2; import de.monticore.lang.monticar.cnnarch.mxnetgenerator.CNNTrain2MxNet; import de.monticore.lang.monticar.cnnarch.caffe2generator.CNNTrain2Caffe2; -import de.monticore.lang.monticar.cnntrain.CNNTrainGenerator; import java.util.Optional; diff --git a/src/main/java/de/monticore/lang/monticar/emadl/generator/EMADLGenerator.java b/src/main/java/de/monticore/lang/monticar/emadl/generator/EMADLGenerator.java index 2140ff704fc892d30098d51433a7ae5e1f1745ef..e9344e2f77e9f1a88094941103bb498f40710d45 100644 --- a/src/main/java/de/monticore/lang/monticar/emadl/generator/EMADLGenerator.java +++ b/src/main/java/de/monticore/lang/monticar/emadl/generator/EMADLGenerator.java @@ -27,13 +27,13 @@ import com.google.common.io.Resources; import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAComponentSymbol; import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstanceSymbol; import de.monticore.lang.math._symboltable.MathStatementsSymbol; -import de.monticore.lang.monticar.cnnarch.CNNArchGenerator; -import de.monticore.lang.monticar.cnnarch.DataPathConfigParser; +import de.monticore.lang.monticar.cnnarch.generator.CNNArchGenerator; +import de.monticore.lang.monticar.cnnarch.generator.DataPathConfigParser; +import de.monticore.lang.monticar.cnnarch.generator.CNNTrainGenerator; import de.monticore.lang.monticar.cnnarch._symboltable.ArchitectureSymbol; import de.monticore.lang.monticar.cnnarch._symboltable.SerialCompositeElementSymbol; import de.monticore.lang.monticar.cnnarch.gluongenerator.CNNTrain2Gluon; import de.monticore.lang.monticar.cnnarch.gluongenerator.annotations.ArchitectureAdapter; -import de.monticore.lang.monticar.cnntrain.CNNTrainGenerator; import de.monticore.lang.monticar.cnntrain._symboltable.ConfigurationSymbol; import de.monticore.lang.monticar.emadl._cocos.EMADLCocos; import de.monticore.lang.monticar.generator.FileContent;