Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
E
EMADL2CPP
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
10
Issues
10
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
monticore
EmbeddedMontiArc
generators
EMADL2CPP
Commits
eea32300
Commit
eea32300
authored
Oct 28, 2018
by
Svetlana Pavlitskaya
1
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'use_emamopt2cpp' into 'master'
Use EMAMOpt2CPP instead of EMAM2CPP See merge request
!13
parents
61929cc6
fad962c5
Pipeline
#81293
passed with stages
in 6 minutes and 49 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
pom.xml
pom.xml
+3
-3
src/main/java/de/monticore/lang/monticar/emadl/generator/EMADLGenerator.java
...nticore/lang/monticar/emadl/generator/EMADLGenerator.java
+4
-4
No files found.
pom.xml
View file @
eea32300
...
...
@@ -19,7 +19,7 @@
<CNNTrain.version>
0.2.5-SNAPSHOT
</CNNTrain.version>
<cnnarch-mxnet-generator.version>
0.2.5-SNAPSHOT
</cnnarch-mxnet-generator.version>
<cnnarch-caffe2-generator.version>
0.2.5-SNAPSHOT
</cnnarch-caffe2-generator.version>
<embedded-montiarc-math-
generator>
0.0.25-SNAPSHOT
</embedded-montiarc-math
-generator>
<embedded-montiarc-math-
opt-generator>
0.1.0
</embedded-montiarc-math-opt
-generator>
<!-- .. Libraries .................................................. -->
<guava.version>
18.0
</guava.version>
...
...
@@ -63,8 +63,8 @@
<dependency>
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
embedded-montiarc-math-generator
</artifactId>
<version>
${embedded-montiarc-math-generator}
</version>
<artifactId>
embedded-montiarc-math-
opt-
generator
</artifactId>
<version>
${embedded-montiarc-math-
opt-
generator}
</version>
</dependency>
<dependency>
...
...
src/main/java/de/monticore/lang/monticar/emadl/generator/EMADLGenerator.java
View file @
eea32300
...
...
@@ -34,7 +34,7 @@ import de.monticore.lang.monticar.cnntrain._symboltable.ConfigurationSymbol;
import
de.monticore.lang.monticar.emadl._cocos.EMADLCocos
;
import
de.monticore.lang.monticar.generator.FileContent
;
import
de.monticore.lang.monticar.generator.cpp.ArmadilloHelper
;
import
de.monticore.lang.monticar.generator.cpp.GeneratorCPP
;
import
de.monticore.lang.monticar.generator.cpp.Generator
EMAMOpt2
CPP
;
import
de.monticore.lang.monticar.generator.cpp.SimulatorIntegrationHelper
;
import
de.monticore.lang.monticar.generator.cpp.TypesGeneratorCPP
;
import
de.monticore.lang.monticar.generator.cpp.converter.TypeConverter
;
...
...
@@ -54,7 +54,7 @@ import java.util.*;
public
class
EMADLGenerator
{
private
GeneratorCPP
emamGen
;
private
Generator
EMAMOpt2
CPP
emamGen
;
private
CNNArchGenerator
cnnArchGenerator
;
private
CNNTrainGenerator
cnnTrainGenerator
;
...
...
@@ -62,7 +62,7 @@ public class EMADLGenerator {
public
EMADLGenerator
(
Backend
backend
)
{
emamGen
=
new
GeneratorCPP
();
emamGen
=
new
Generator
EMAMOpt2
CPP
();
emamGen
.
useArmadilloBackend
();
emamGen
.
setGenerationTargetPath
(
"./target/generated-sources-emadl/"
);
cnnArchGenerator
=
backend
.
getCNNArchGenerator
();
...
...
@@ -95,7 +95,7 @@ public class EMADLGenerator {
return
getEmamGen
().
getGenerationTargetPath
();
}
public
GeneratorCPP
getEmamGen
()
{
public
Generator
EMAMOpt2
CPP
getEmamGen
()
{
return
emamGen
;
}
...
...
Svetlana Pavlitskaya
@svetlana.pavlitskaya
mentioned in issue
#3 (closed)
·
Oct 28, 2018
mentioned in issue
#3 (closed)
mentioned in issue #3
Toggle commit list
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