Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
monticore
EmbeddedMontiArc
generators
EMADL2CPP
Commits
7111056a
Commit
7111056a
authored
Aug 30, 2018
by
Evgeny Kusmenko
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'cmake_support' into 'master'
Cmake support See merge request
!6
parents
7f278cce
5d772a9c
Pipeline
#71129
passed with stage
in 2 minutes and 22 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
pom.xml
pom.xml
+2
-2
src/main/java/de/monticore/lang/monticar/emadl/generator/EMADLGenerator.java
...nticore/lang/monticar/emadl/generator/EMADLGenerator.java
+11
-1
No files found.
pom.xml
View file @
7111056a
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<groupId>
de.monticore.lang.monticar
</groupId>
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
embedded-montiarc-emadl-generator
</artifactId>
<artifactId>
embedded-montiarc-emadl-generator
</artifactId>
<version>
0.2.
2
-SNAPSHOT
</version>
<version>
0.2.
3
-SNAPSHOT
</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
<!-- == PROJECT DEPENDENCIES ============================================= -->
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
<!-- .. SE-Libraries .................................................. -->
<!-- .. SE-Libraries .................................................. -->
<emadl.version>
0.2.2-SNAPSHOT
</emadl.version>
<emadl.version>
0.2.2-SNAPSHOT
</emadl.version>
<CNNTrain.version>
0.2.4-SNAPSHOT
</CNNTrain.version>
<CNNTrain.version>
0.2.4-SNAPSHOT
</CNNTrain.version>
<cnnarch-mxnet-generator.version>
0.2.
3
-SNAPSHOT
</cnnarch-mxnet-generator.version>
<cnnarch-mxnet-generator.version>
0.2.
4
-SNAPSHOT
</cnnarch-mxnet-generator.version>
<cnnarch-caffe2-generator.version>
0.2.2-SNAPSHOT
</cnnarch-caffe2-generator.version>
<cnnarch-caffe2-generator.version>
0.2.2-SNAPSHOT
</cnnarch-caffe2-generator.version>
<embedded-montiarc-math-generator>
0.0.25-SNAPSHOT
</embedded-montiarc-math-generator>
<embedded-montiarc-math-generator>
0.0.25-SNAPSHOT
</embedded-montiarc-math-generator>
...
...
src/main/java/de/monticore/lang/monticar/emadl/generator/EMADLGenerator.java
View file @
7111056a
...
@@ -134,11 +134,21 @@ public class EMADLGenerator {
...
@@ -134,11 +134,21 @@ public class EMADLGenerator {
generateComponent
(
fileContents
,
allInstances
,
taggingResolver
,
componentInstanceSymbol
,
symtab
);
generateComponent
(
fileContents
,
allInstances
,
taggingResolver
,
componentInstanceSymbol
,
symtab
);
fileContents
.
addAll
(
generateCNNTrainer
(
allInstances
,
componentInstanceSymbol
.
getComponentType
().
getFullName
().
replaceAll
(
"\\."
,
"_"
)));
String
instanceName
=
componentInstanceSymbol
.
getComponentType
().
getFullName
().
replaceAll
(
"\\."
,
"_"
);
fileContents
.
addAll
(
generateCNNTrainer
(
allInstances
,
instanceName
));
fileContents
.
add
(
ArmadilloHelper
.
getArmadilloHelperFileContent
());
fileContents
.
add
(
ArmadilloHelper
.
getArmadilloHelperFileContent
());
TypesGeneratorCPP
tg
=
new
TypesGeneratorCPP
();
TypesGeneratorCPP
tg
=
new
TypesGeneratorCPP
();
fileContents
.
addAll
(
tg
.
generateTypes
(
TypeConverter
.
getTypeSymbols
()));
fileContents
.
addAll
(
tg
.
generateTypes
(
TypeConverter
.
getTypeSymbols
()));
if
(
cnnArchGenerator
.
isCMakeRequired
())
{
cnnArchGenerator
.
setGenerationTargetPath
(
getGenerationTargetPath
());
Map
<
String
,
String
>
cmakeContentsMap
=
cnnArchGenerator
.
generateCMakeContent
(
componentInstanceSymbol
.
getFullName
());
for
(
String
fileName
:
cmakeContentsMap
.
keySet
()){
fileContents
.
add
(
new
FileContent
(
cmakeContentsMap
.
get
(
fileName
),
fileName
));
}
}
if
(
emamGen
.
shouldGenerateMainClass
())
{
if
(
emamGen
.
shouldGenerateMainClass
())
{
//fileContents.add(emamGen.getMainClassFileContent(componentInstanceSymbol, fileContents.get(0)));
//fileContents.add(emamGen.getMainClassFileContent(componentInstanceSymbol, fileContents.get(0)));
}
else
if
(
emamGen
.
shouldGenerateSimulatorInterface
())
{
}
else
if
(
emamGen
.
shouldGenerateSimulatorInterface
())
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment