Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
C
CNNArch2X
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
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
Package Registry
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
CNNArch2X
Commits
5ea62176
Commit
5ea62176
authored
Oct 26, 2020
by
Evgeny Kusmenko
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'develop'
Master See merge request
!13
parents
b2dda75a
340e16fd
Pipeline
#348594
passed with stage
in 2 minutes and 33 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
80 additions
and
32 deletions
+80
-32
.gitlab-ci.yml
.gitlab-ci.yml
+27
-0
pom.xml
pom.xml
+8
-8
src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNArchGenerator.java
...ore/lang/monticar/cnnarch/generator/CNNArchGenerator.java
+36
-21
src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNArchTemplateController.java
...monticar/cnnarch/generator/CNNArchTemplateController.java
+4
-2
src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNTrainGenerator.java
...re/lang/monticar/cnnarch/generator/CNNTrainGenerator.java
+1
-1
src/main/java/de/monticore/lang/monticar/cnnarch/generator/TemplateConfiguration.java
...ang/monticar/cnnarch/generator/TemplateConfiguration.java
+4
-0
No files found.
.gitlab-ci.yml
View file @
5ea62176
...
...
@@ -4,6 +4,28 @@ stages:
#- windows
-
linux
githubjob
:
image
:
maven:3-jdk-8
stage
:
linux
before_script
:
-
'
which
ssh-agent
||
(
apt-get
update
-y
&&
apt-get
install
openssh-client
-y
)'
-
eval $(ssh-agent -s)
-
ssh-add <(echo "$GITHUB_SSH_PRIV_KEY")
-
echo "$GITHUB_SSH_PRIV_KEY" | tr -d '\r' | ssh-add -
-
git config --global user.email "kusmenko@se-rwth.de"
-
git config --global user.name "EMA CI Robot"
-
mkdir -p ~/.ssh
# - cat gitlab-known-hosts >> ~/.ssh/known_hosts
-
echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
script
:
-
git clone git@github.com:MontiCore/EmbeddedMontiArc.git
-
cd EmbeddedMontiArc
-
git subtree pull --prefix $PRJ_NAME https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/${PRJ_NAME}.git master --squash
-
git push --force
only
:
-
master
masterJobLinux
:
stage
:
linux
image
:
maven:3-jdk-8
...
...
@@ -13,6 +35,11 @@ masterJobLinux:
-
mvn package sonar:sonar -s settings.xml
only
:
-
master
except
:
changes
:
-
.gitlab-ci.yml
-
.gitignore
-
README.md
#masterJobWindows:
# stage: windows
...
...
pom.xml
View file @
5ea62176
...
...
@@ -9,7 +9,7 @@
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
cnnarch-generator
</artifactId>
<version>
0.
0.7
-SNAPSHOT
</version>
<version>
0.
4.0
-SNAPSHOT
</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
...
...
@@ -17,13 +17,13 @@
<!-- .. SE-Libraries .................................................. -->
<CNNArch.version>
0.
3.7
-SNAPSHOT
</CNNArch.version>
<CNNTrain.version>
0.
3.12
-SNAPSHOT
</CNNTrain.version>
<embedded-montiarc-math-
opt-generator>
0.1.6
</embedded-montiarc-math-opt
-generator>
<CNNArch.version>
0.
4.0
-SNAPSHOT
</CNNArch.version>
<CNNTrain.version>
0.
4.0
-SNAPSHOT
</CNNTrain.version>
<embedded-montiarc-math-
generator>
0.4.0-SNAPSHOT
</embedded-montiarc-math
-generator>
<!-- .. Libraries .................................................. -->
<guava.version>
18.0
</guava.version>
<junit.version>
4.1
2
</junit.version>
<guava.version>
25.1-jre
</guava.version>
<junit.version>
4.1
3.1
</junit.version>
<logback.version>
1.1.2
</logback.version>
<jscience.version>
4.3.1
</jscience.version>
...
...
@@ -91,8 +91,8 @@
<dependency>
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
embedded-montiarc-math-
opt-
generator
</artifactId>
<version>
${embedded-montiarc-math-
opt-
generator}
</version>
<artifactId>
embedded-montiarc-math-generator
</artifactId>
<version>
${embedded-montiarc-math-generator}
</version>
</dependency>
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNArchGenerator.java
View file @
5ea62176
...
...
@@ -4,21 +4,25 @@ package de.monticore.lang.monticar.cnnarch.generator;
import
de.monticore.io.paths.ModelPath
;
import
de.monticore.lang.monticar.cnnarch._symboltable.ArchitectureSymbol
;
import
de.monticore.lang.monticar.cnnarch._symboltable.CNNArchLanguage
;
import
de.monticore.lang.monticar.generator.cmake.CMakeConfig
;
import
de.monticore.lang.monticar.generator.cmake.CMakeFindModule
;
import
de.monticore.lang.monticar.generator.Generator
;
import
de.monticore.lang.monticar.generator.FileContent
;
import
de.monticore.lang.monticar.generator.cpp.GeneratorCPP
;
import
de.monticore.lang.tagging._symboltable.TaggingResolver
;
import
de.monticore.symboltable.GlobalScope
;
import
de.monticore.symboltable.Scope
;
import
de.se_rwth.commons.logging.Log
;
import
java.io.File
;
import
java.io.IOException
;
import
java.nio.file.Path
;
import
java.nio.file.Paths
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Arrays
;
import
java.util.LinkedList
;
import
java.util.List
;
public
abstract
class
CNNArchGenerator
{
public
abstract
class
CNNArchGenerator
implements
Generator
<
ArchitectureSymbol
>
{
private
boolean
generateCMake
=
false
;
protected
ArchitectureSupportChecker
architectureSupportChecker
;
protected
LayerSupportChecker
layerSupportChecker
;
...
...
@@ -35,8 +39,14 @@ public abstract class CNNArchGenerator {
System
.
exit
(
1
);
}
public
boolean
isCMakeRequired
()
{
return
true
;
@Override
public
boolean
isGenerateCMake
()
{
return
generateCMake
;
}
@Override
public
void
setGenerateCMake
(
boolean
generateCMake
)
{
this
.
generateCMake
=
generateCMake
;
}
public
String
getGenerationTargetPath
(){
...
...
@@ -58,7 +68,8 @@ public abstract class CNNArchGenerator {
this
.
modelsDirPath
=
modelsDirPath
.
toString
();
final
ModelPath
mp
=
new
ModelPath
(
modelsDirPath
);
GlobalScope
scope
=
new
GlobalScope
(
mp
,
new
CNNArchLanguage
());
generate
(
scope
,
rootModelName
);
TaggingResolver
tagging
=
new
TaggingResolver
(
scope
,
Arrays
.
asList
(
rootModelName
));
generate
(
tagging
,
rootModelName
);
}
// TODO: Rewrite so that CNNArchSymbolCompiler is used in EMADL2CPP instead of this method
...
...
@@ -66,9 +77,9 @@ public abstract class CNNArchGenerator {
return
architectureSupportChecker
.
check
(
architecture
)
&&
layerSupportChecker
.
check
(
architecture
);
}
public
void
generate
(
Scope
scope
,
String
rootModelName
){
public
void
generate
(
TaggingResolver
taggingResolver
,
String
rootModelName
){
CNNArchSymbolCompiler
symbolCompiler
=
new
CNNArchSymbolCompiler
(
architectureSupportChecker
,
layerSupportChecker
);
ArchitectureSymbol
architectureSymbol
=
symbolCompiler
.
compileArchitectureSymbol
(
scope
,
rootModelName
);
ArchitectureSymbol
architectureSymbol
=
symbolCompiler
.
compileArchitectureSymbol
(
taggingResolver
,
rootModelName
);
try
{
String
dataConfPath
=
getModelsDirPath
()
+
"/data_paths.txt"
;
...
...
@@ -86,37 +97,41 @@ public abstract class CNNArchGenerator {
}
architectureSymbol
.
setWeightsPath
(
weightsPath
);
architectureSymbol
.
setComponentName
(
rootModelName
);
generateFiles
(
architectureSymbol
);
generateFiles
(
taggingResolver
,
architectureSymbol
);
}
catch
(
IOException
e
){
Log
.
error
(
e
.
toString
());
}
}
//check cocos with CNNArchCocos.checkAll(architecture) before calling this method.
public
abstract
Map
<
String
,
String
>
generateStrings
(
ArchitectureSymbol
architecture
);
public
abstract
List
<
FileContent
>
generateStrings
(
TaggingResolver
taggingResolver
,
ArchitectureSymbol
architecture
);
//check cocos with CNNArchCocos.checkAll(architecture) before calling this method.
public
void
generateFiles
(
ArchitectureSymbol
architecture
)
throws
IOException
{
Map
<
String
,
String
>
fileContentMap
=
generateStrings
(
architecture
);
generateFromFilecontentsMap
(
fileContentMap
);
public
List
<
File
>
generateFiles
(
TaggingResolver
taggingResolver
,
ArchitectureSymbol
architecture
)
throws
IOException
{
List
<
FileContent
>
fileContents
=
generateStrings
(
taggingResolver
,
architecture
);
return
generateFromFilecontentsMap
(
fileContents
);
}
public
void
generateFromFilecontentsMap
(
Map
<
String
,
String
>
fileContentMap
)
throws
IOException
{
public
List
<
File
>
generateFromFilecontentsMap
(
List
<
FileContent
>
fileContents
)
throws
IOException
{
List
<
File
>
res
=
new
LinkedList
<>();
GeneratorCPP
genCPP
=
new
GeneratorCPP
();
genCPP
.
setGenerationTargetPath
(
getGenerationTargetPath
());
for
(
String
fileName
:
fileContentMap
.
keySet
())
{
genCPP
.
generateFile
(
new
FileContent
(
fileContentMap
.
get
(
fileName
),
fileName
));
for
(
FileContent
fileContent
:
fileContents
)
{
res
.
add
(
genCPP
.
generateFile
(
fileContent
));
}
return
res
;
}
public
void
generateCMake
(
String
rootModelName
){
Map
<
String
,
String
>
fileContentMap
=
generateCMakeContent
(
rootModelName
);
List
<
FileContent
>
fileContents
=
generateCMakeContent
(
rootModelName
);
try
{
generateFromFilecontentsMap
(
fileContent
Map
);
generateFromFilecontentsMap
(
fileContent
s
);
}
catch
(
IOException
e
)
{
Log
.
error
(
"CMake file could not be generated"
+
e
.
getMessage
());
}
}
public
abstract
Map
<
String
,
String
>
generateCMakeContent
(
String
rootModelName
);
public
abstract
List
<
FileContent
>
generateCMakeContent
(
String
rootModelName
);
}
src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNArchTemplateController.java
View file @
5ea62176
...
...
@@ -4,6 +4,8 @@ package de.monticore.lang.monticar.cnnarch.generator;
import
de.monticore.lang.monticar.cnnarch._symboltable.*
;
import
de.monticore.lang.monticar.cnnarch.predefined.Sigmoid
;
import
de.monticore.lang.monticar.cnnarch.predefined.Softmax
;
import
de.monticore.lang.monticar.generator.FileContent
;
import
org.apache.commons.io.monitor.FileEntry
;
import
java.io.StringWriter
;
import
java.io.Writer
;
...
...
@@ -198,7 +200,7 @@ public abstract class CNNArchTemplateController {
templateConfiguration
.
processTemplate
(
ftlContext
,
templatePath
,
writer
);
}
public
Map
.
Entry
<
String
,
String
>
process
(
String
templateNameWithoutEnding
,
Target
targetLanguage
){
public
FileContent
process
(
String
templateNameWithoutEnding
,
Target
targetLanguage
){
StringWriter
newWriter
=
new
StringWriter
();
this
.
mainTemplateNameWithoutEnding
=
templateNameWithoutEnding
;
this
.
targetLanguage
=
targetLanguage
;
...
...
@@ -207,7 +209,7 @@ public abstract class CNNArchTemplateController {
include
(
""
,
templateNameWithoutEnding
,
newWriter
);
String
fileEnding
=
targetLanguage
.
toString
();
String
fileName
=
getFileNameWithoutEnding
()
+
fileEnding
;
Map
.
Entry
<
String
,
String
>
fileContent
=
new
AbstractMap
.
SimpleEntry
<>(
fileName
,
newWriter
.
toString
()
);
FileContent
fileContent
=
new
FileContent
(
newWriter
.
toString
(),
fileName
);
this
.
mainTemplateNameWithoutEnding
=
null
;
this
.
targetLanguage
=
null
;
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/generator/CNNTrainGenerator.java
View file @
5ea62176
...
...
@@ -113,5 +113,5 @@ public abstract class CNNTrainGenerator {
public
abstract
void
generate
(
Path
modelsDirPath
,
String
rootModelNames
);
//check cocos with CNNTrainCocos.checkAll(configuration) before calling this method.
public
abstract
Map
<
String
,
String
>
generateStrings
(
ConfigurationSymbol
configuration
);
public
abstract
List
<
FileContent
>
generateStrings
(
ConfigurationSymbol
configuration
);
}
src/main/java/de/monticore/lang/monticar/cnnarch/generator/TemplateConfiguration.java
View file @
5ea62176
...
...
@@ -25,6 +25,10 @@ public abstract class TemplateConfiguration {
configuration
.
setClassForTemplateLoading
(
TemplateConfiguration
.
class
,
getBaseTemplatePackagePath
());
configuration
.
setDefaultEncoding
(
"UTF-8"
);
configuration
.
setTemplateExceptionHandler
(
TemplateExceptionHandler
.
RETHROW_HANDLER
);
// numbers in windows germany are formatted as '0,2' instead of '0.2'
configuration
.
setNumberFormat
(
"computer"
);
return
configuration
;
}
...
...
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