Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
C
CNNArch2MXNet
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
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
CNNArch2MXNet
Commits
6bf25ee8
Commit
6bf25ee8
authored
Feb 25, 2019
by
Evgeny Kusmenko
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'oneclick_nn_training' into 'master'
Oneclick nn training See merge request
!24
parents
7db86343
48cedc75
Pipeline
#125341
canceled with stages
Changes
15
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
44 additions
and
18 deletions
+44
-18
pom.xml
pom.xml
+2
-2
settings.xml
settings.xml
+1
-1
src/main/java/de/monticore/lang/monticar/cnnarch/mxnetgenerator/CNNArch2MxNet.java
...e/lang/monticar/cnnarch/mxnetgenerator/CNNArch2MxNet.java
+9
-0
src/main/java/de/monticore/lang/monticar/cnnarch/mxnetgenerator/CNNArchTemplateController.java
...car/cnnarch/mxnetgenerator/CNNArchTemplateController.java
+9
-1
src/main/resources/templates/mxnet/CNNCreator.ftl
src/main/resources/templates/mxnet/CNNCreator.ftl
+3
-3
src/main/resources/templates/mxnet/CNNPredictor.ftl
src/main/resources/templates/mxnet/CNNPredictor.ftl
+2
-2
src/test/resources/architectures/data_paths.txt
src/test/resources/architectures/data_paths.txt
+4
-0
src/test/resources/invalid_tests/data_paths.txt
src/test/resources/invalid_tests/data_paths.txt
+3
-0
src/test/resources/target_code/CNNCreator_Alexnet.py
src/test/resources/target_code/CNNCreator_Alexnet.py
+1
-1
src/test/resources/target_code/CNNCreator_CifarClassifierNetwork.py
...esources/target_code/CNNCreator_CifarClassifierNetwork.py
+1
-1
src/test/resources/target_code/CNNCreator_VGG16.py
src/test/resources/target_code/CNNCreator_VGG16.py
+1
-1
src/test/resources/target_code/CNNPredictor_Alexnet.h
src/test/resources/target_code/CNNPredictor_Alexnet.h
+2
-2
src/test/resources/target_code/CNNPredictor_CifarClassifierNetwork.h
...sources/target_code/CNNPredictor_CifarClassifierNetwork.h
+2
-2
src/test/resources/target_code/CNNPredictor_VGG16.h
src/test/resources/target_code/CNNPredictor_VGG16.h
+2
-2
src/test/resources/valid_tests/data_paths.txt
src/test/resources/valid_tests/data_paths.txt
+2
-0
No files found.
pom.xml
View file @
6bf25ee8
...
...
@@ -8,14 +8,14 @@
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
cnnarch-mxnet-generator
</artifactId>
<version>
0.2.1
3
-SNAPSHOT
</version>
<version>
0.2.1
4
-SNAPSHOT
</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
<properties>
<!-- .. SE-Libraries .................................................. -->
<CNNArch.version>
0.
2.9
</CNNArch.version>
<CNNArch.version>
0.
3.0-SNAPSHOT
</CNNArch.version>
<CNNTrain.version>
0.2.6
</CNNTrain.version>
<embedded-montiarc-math-opt-generator>
0.1.4
</embedded-montiarc-math-opt-generator>
...
...
settings.xml
View file @
6bf25ee8
...
...
@@ -100,4 +100,4 @@
<activeProfiles>
<activeProfile>
se-nexus
</activeProfile>
</activeProfiles>
</settings>
\ No newline at end of file
</settings>
src/main/java/de/monticore/lang/monticar/cnnarch/mxnetgenerator/CNNArch2MxNet.java
View file @
6bf25ee8
...
...
@@ -26,6 +26,8 @@ import de.monticore.lang.monticar.cnnarch._symboltable.ArchitectureSymbol;
import
de.monticore.lang.monticar.cnnarch._symboltable.ArchitectureElementSymbol
;
import
de.monticore.lang.monticar.cnnarch._symboltable.CompositeElementSymbol
;
import
de.monticore.lang.monticar.cnnarch._symboltable.CNNArchCompilationUnitSymbol
;
import
de.monticore.lang.monticar.cnnarch._symboltable.CNNArchLanguage
;
import
de.monticore.lang.monticar.cnnarch.DataPathConfigParser
;
import
de.monticore.lang.monticar.generator.FileContent
;
import
de.monticore.lang.monticar.generator.cmake.CMakeConfig
;
import
de.monticore.lang.monticar.generator.cmake.CMakeFindModule
;
...
...
@@ -34,6 +36,8 @@ import de.monticore.symboltable.Scope;
import
de.se_rwth.commons.logging.Log
;
import
java.io.IOException
;
import
java.lang.System
;
import
java.nio.file.Path
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Optional
;
...
...
@@ -87,6 +91,11 @@ public class CNNArch2MxNet extends CNNArchGenerator {
}
try
{
String
confPath
=
getModelsDirPath
()
+
"/data_paths.txt"
;
DataPathConfigParser
newParserConfig
=
new
DataPathConfigParser
(
confPath
);
String
dataPath
=
newParserConfig
.
getDataPath
(
rootModelName
);
compilationUnit
.
get
().
getArchitecture
().
setDataPath
(
dataPath
);
compilationUnit
.
get
().
getArchitecture
().
setComponentName
(
rootModelName
);
generateFiles
(
compilationUnit
.
get
().
getArchitecture
());
}
catch
(
IOException
e
){
Log
.
error
(
e
.
toString
());
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/mxnetgenerator/CNNArchTemplateController.java
View file @
6bf25ee8
...
...
@@ -132,6 +132,10 @@ public abstract class CNNArchTemplateController {
return
getArchitecture
().
getEnclosingScope
().
getSpanningSymbol
().
get
().
getFullName
().
replaceAll
(
"\\."
,
"_"
);
}
public
String
getDataPath
(){
return
getArchitecture
().
getDataPath
();
}
public
List
<
String
>
getLayerInputs
(
ArchitectureElementSymbol
layer
){
List
<
String
>
inputNames
=
new
ArrayList
<>();
...
...
@@ -168,7 +172,11 @@ public abstract class CNNArchTemplateController {
return
list
;
}
public
void
include
(
String
relativePath
,
String
templateWithoutFileEnding
,
Writer
writer
)
{
public
String
getComponentName
(){
return
getArchitecture
().
getComponentName
();
}
public
void
include
(
String
relativePath
,
String
templateWithoutFileEnding
,
Writer
writer
){
String
templatePath
=
relativePath
+
templateWithoutFileEnding
+
FTL_FILE_ENDING
;
Map
<
String
,
Object
>
ftlContext
=
new
HashMap
<>();
ftlContext
.
put
(
TEMPLATE_CONTROLLER_KEY
,
this
);
...
...
src/main/resources/templates/mxnet/CNNCreator.ftl
View file @
6bf25ee8
...
...
@@ -18,9 +18,9 @@ class MyConstant(mx.init.Initializer):
class ${tc.fileNameWithoutEnding}:
module = None
_data_dir_ = "
data/${tc.fullArchitectureName
}/"
_model_dir_ = "model/${tc.
fullArchitecture
Name}/"
_model_prefix_ = "
${tc.architectureName}
"
_data_dir_ = "
${tc.dataPath
}/"
_model_dir_ = "model/${tc.
component
Name}/"
_model_prefix_ = "
model
"
_input_names_ = [${tc.join(tc.architectureInputs, ",", "'", "'")}]
_input_shapes_ = [<#list tc.architecture.inputs as input>(${tc.join(input.definition.type.dimensions, ",")})</#list>]
_output_names_ = [${tc.join(tc.architectureOutputs, ",", "'", "_label'")}]
...
...
src/main/resources/templates/mxnet/CNNPredictor.ftl
View file @
6bf25ee8
...
...
@@ -11,8 +11,8 @@
class ${tc.fileNameWithoutEnding}{
public:
const std::string json_file = "model/${tc.
fullArchitectureName}/${tc.architectureName}
_newest-symbol.json";
const std::string param_file = "model/${tc.
fullArchitectureName}/${tc.architectureName}
_newest-0000.params";
const std::string json_file = "model/${tc.
componentName}/model
_newest-symbol.json";
const std::string param_file = "model/${tc.
componentName}/model
_newest-0000.params";
//const std::vector<std::string> input_keys = {"data"};
const std::vector<std::string> input_keys = {${tc.join(tc.architectureInputs, ",", "\"", "\"")}};
const std::vector<std::vector<mx_uint>> input_shapes = {<#list tc.architecture.inputs as input>{1,${tc.join(input.definition.type.dimensions, ",")}}<#if input?has_next>,</#if></#list>};
...
...
src/test/resources/architectures/data_paths.txt
0 → 100644
View file @
6bf25ee8
Alexnet data/Alexnet
VGG16 data/VGG16
ThreeInputCNN_M14 data/ThreeInputCNN_M14
ResNeXt50 data/ResNeXt50
\ No newline at end of file
src/test/resources/invalid_tests/data_paths.txt
0 → 100644
View file @
6bf25ee8
Alexnet data/Alexnet
CifarClassifierNetwork data/CifarClassifierNetwork
VGG16 data/VGG16
\ No newline at end of file
src/test/resources/target_code/CNNCreator_Alexnet.py
View file @
6bf25ee8
...
...
@@ -20,7 +20,7 @@ class CNNCreator_Alexnet:
module
=
None
_data_dir_
=
"data/Alexnet/"
_model_dir_
=
"model/Alexnet/"
_model_prefix_
=
"
Alexnet
"
_model_prefix_
=
"
model
"
_input_names_
=
[
'data'
]
_input_shapes_
=
[(
3
,
224
,
224
)]
_output_names_
=
[
'predictions_label'
]
...
...
src/test/resources/target_code/CNNCreator_CifarClassifierNetwork.py
View file @
6bf25ee8
...
...
@@ -20,7 +20,7 @@ class CNNCreator_CifarClassifierNetwork:
module
=
None
_data_dir_
=
"data/CifarClassifierNetwork/"
_model_dir_
=
"model/CifarClassifierNetwork/"
_model_prefix_
=
"
CifarClassifierNetwork
"
_model_prefix_
=
"
model
"
_input_names_
=
[
'data'
]
_input_shapes_
=
[(
3
,
32
,
32
)]
_output_names_
=
[
'softmax_label'
]
...
...
src/test/resources/target_code/CNNCreator_VGG16.py
View file @
6bf25ee8
...
...
@@ -20,7 +20,7 @@ class CNNCreator_VGG16:
module
=
None
_data_dir_
=
"data/VGG16/"
_model_dir_
=
"model/VGG16/"
_model_prefix_
=
"
VGG16
"
_model_prefix_
=
"
model
"
_input_names_
=
[
'data'
]
_input_shapes_
=
[(
3
,
224
,
224
)]
_output_names_
=
[
'predictions_label'
]
...
...
src/test/resources/target_code/CNNPredictor_Alexnet.h
View file @
6bf25ee8
...
...
@@ -11,8 +11,8 @@
class
CNNPredictor_Alexnet
{
public:
const
std
::
string
json_file
=
"model/Alexnet/
Alexnet
_newest-symbol.json"
;
const
std
::
string
param_file
=
"model/Alexnet/
Alexnet
_newest-0000.params"
;
const
std
::
string
json_file
=
"model/Alexnet/
model
_newest-symbol.json"
;
const
std
::
string
param_file
=
"model/Alexnet/
model
_newest-0000.params"
;
//const std::vector<std::string> input_keys = {"data"};
const
std
::
vector
<
std
::
string
>
input_keys
=
{
"data"
};
const
std
::
vector
<
std
::
vector
<
mx_uint
>>
input_shapes
=
{{
1
,
3
,
224
,
224
}};
...
...
src/test/resources/target_code/CNNPredictor_CifarClassifierNetwork.h
View file @
6bf25ee8
...
...
@@ -11,8 +11,8 @@
class
CNNPredictor_CifarClassifierNetwork
{
public:
const
std
::
string
json_file
=
"model/CifarClassifierNetwork/
CifarClassifierNetwork
_newest-symbol.json"
;
const
std
::
string
param_file
=
"model/CifarClassifierNetwork/
CifarClassifierNetwork
_newest-0000.params"
;
const
std
::
string
json_file
=
"model/CifarClassifierNetwork/
model
_newest-symbol.json"
;
const
std
::
string
param_file
=
"model/CifarClassifierNetwork/
model
_newest-0000.params"
;
//const std::vector<std::string> input_keys = {"data"};
const
std
::
vector
<
std
::
string
>
input_keys
=
{
"data"
};
const
std
::
vector
<
std
::
vector
<
mx_uint
>>
input_shapes
=
{{
1
,
3
,
32
,
32
}};
...
...
src/test/resources/target_code/CNNPredictor_VGG16.h
View file @
6bf25ee8
...
...
@@ -11,8 +11,8 @@
class
CNNPredictor_VGG16
{
public:
const
std
::
string
json_file
=
"model/VGG16/
VGG16
_newest-symbol.json"
;
const
std
::
string
param_file
=
"model/VGG16/
VGG16
_newest-0000.params"
;
const
std
::
string
json_file
=
"model/VGG16/
model
_newest-symbol.json"
;
const
std
::
string
param_file
=
"model/VGG16/
model
_newest-0000.params"
;
//const std::vector<std::string> input_keys = {"data"};
const
std
::
vector
<
std
::
string
>
input_keys
=
{
"data"
};
const
std
::
vector
<
std
::
vector
<
mx_uint
>>
input_shapes
=
{{
1
,
3
,
224
,
224
}};
...
...
src/test/resources/valid_tests/data_paths.txt
0 → 100644
View file @
6bf25ee8
CifarClassifierNetwork data/CifarClassifierNetwork
MultipleOutputs data/MultipleOutputs
\ No newline at end of file
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