Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
C
CNNArch2Gluon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
1
Issues
1
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
CNNArch2Gluon
Commits
68ee368d
Commit
68ee368d
authored
Aug 29, 2020
by
Evgeny Kusmenko
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into 'master'
Develop See merge request
!30
parents
6c1c21bd
d157159f
Pipeline
#325057
passed with stage
in 4 minutes and 4 seconds
Changes
83
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
83 changed files
with
11802 additions
and
726 deletions
+11802
-726
pom.xml
pom.xml
+4
-4
src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNArch2Gluon.java
...e/lang/monticar/cnnarch/gluongenerator/CNNArch2Gluon.java
+5
-2
src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNArch2GluonLayerSupportChecker.java
...arch/gluongenerator/CNNArch2GluonLayerSupportChecker.java
+4
-0
src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNArch2GluonTemplateController.java
...narch/gluongenerator/CNNArch2GluonTemplateController.java
+83
-0
src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNTrain2Gluon.java
.../lang/monticar/cnnarch/gluongenerator/CNNTrain2Gluon.java
+20
-3
src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/NetDefinitionMode.java
...ng/monticar/cnnarch/gluongenerator/NetDefinitionMode.java
+3
-0
src/main/resources/templates/gluon/CNNBufferFile.ftl
src/main/resources/templates/gluon/CNNBufferFile.ftl
+0
-52
src/main/resources/templates/gluon/CNNCreator.ftl
src/main/resources/templates/gluon/CNNCreator.ftl
+99
-10
src/main/resources/templates/gluon/CNNGanTrainer.ftl
src/main/resources/templates/gluon/CNNGanTrainer.ftl
+13
-13
src/main/resources/templates/gluon/CNNLAOptimizer.ftl
src/main/resources/templates/gluon/CNNLAOptimizer.ftl
+78
-0
src/main/resources/templates/gluon/CNNModelLoader.ftl
src/main/resources/templates/gluon/CNNModelLoader.ftl
+141
-0
src/main/resources/templates/gluon/CNNNet.ftl
src/main/resources/templates/gluon/CNNNet.ftl
+481
-4
src/main/resources/templates/gluon/CNNPredictor.ftl
src/main/resources/templates/gluon/CNNPredictor.ftl
+463
-68
src/main/resources/templates/gluon/CNNSupervisedTrainer.ftl
src/main/resources/templates/gluon/CNNSupervisedTrainer.ftl
+100
-20
src/main/resources/templates/gluon/Optimizer/AdamW.ftl
src/main/resources/templates/gluon/Optimizer/AdamW.ftl
+101
-0
src/main/resources/templates/gluon/elements/DotProductSelfAttention.ftl
...rces/templates/gluon/elements/DotProductSelfAttention.ftl
+24
-0
src/main/resources/templates/gluon/elements/EpisodicMemory.ftl
...ain/resources/templates/gluon/elements/EpisodicMemory.ftl
+45
-0
src/main/resources/templates/gluon/elements/LargeMemory.ftl
src/main/resources/templates/gluon/elements/LargeMemory.ftl
+16
-0
src/main/resources/templates/gluon/elements/LoadNetwork.ftl
src/main/resources/templates/gluon/elements/LoadNetwork.ftl
+48
-0
src/main/resources/templates/gluon/pythonEpisodicExecuteTrain.ftl
.../resources/templates/gluon/pythonEpisodicExecuteTrain.ftl
+58
-0
src/main/resources/templates/gluon/pythonExecuteTest.ftl
src/main/resources/templates/gluon/pythonExecuteTest.ftl
+22
-14
src/main/resources/templates/gluon/pythonExecuteTrain.ftl
src/main/resources/templates/gluon/pythonExecuteTrain.ftl
+38
-21
src/test/java/de/monticore/lang/monticar/cnnarch/gluongenerator/GenerationTest.java
.../lang/monticar/cnnarch/gluongenerator/GenerationTest.java
+63
-8
src/test/resources/architectures/data_paths.txt
src/test/resources/architectures/data_paths.txt
+0
-1
src/test/resources/target_code/CNNBufferFile.h
src/test/resources/target_code/CNNBufferFile.h
+0
-51
src/test/resources/target_code/CNNCreator_Alexnet.py
src/test/resources/target_code/CNNCreator_Alexnet.py
+96
-10
src/test/resources/target_code/CNNCreator_CifarClassifierNetwork.py
...esources/target_code/CNNCreator_CifarClassifierNetwork.py
+96
-10
src/test/resources/target_code/CNNCreator_EpisodicMemoryNetwork.py
...resources/target_code/CNNCreator_EpisodicMemoryNetwork.py
+186
-0
src/test/resources/target_code/CNNCreator_LoadNetworkTest.py
src/test/resources/target_code/CNNCreator_LoadNetworkTest.py
+185
-0
src/test/resources/target_code/CNNCreator_VGG16.py
src/test/resources/target_code/CNNCreator_VGG16.py
+96
-10
src/test/resources/target_code/CNNDataLoader_EpisodicMemoryNetwork.py
...ources/target_code/CNNDataLoader_EpisodicMemoryNetwork.py
+213
-0
src/test/resources/target_code/CNNDataLoader_LoadNetworkTest.py
...st/resources/target_code/CNNDataLoader_LoadNetworkTest.py
+213
-0
src/test/resources/target_code/CNNLAOptimizer_emptyConfig.h
src/test/resources/target_code/CNNLAOptimizer_emptyConfig.h
+38
-0
src/test/resources/target_code/CNNLAOptimizer_fullConfig.h
src/test/resources/target_code/CNNLAOptimizer_fullConfig.h
+49
-0
src/test/resources/target_code/CNNLAOptimizer_simpleConfig.h
src/test/resources/target_code/CNNLAOptimizer_simpleConfig.h
+38
-0
src/test/resources/target_code/CNNModelLoader.h
src/test/resources/target_code/CNNModelLoader.h
+141
-0
src/test/resources/target_code/CNNNet_Alexnet.py
src/test/resources/target_code/CNNNet_Alexnet.py
+419
-3
src/test/resources/target_code/CNNNet_CifarClassifierNetwork.py
...st/resources/target_code/CNNNet_CifarClassifierNetwork.py
+419
-3
src/test/resources/target_code/CNNNet_EpisodicMemoryNetwork.py
...est/resources/target_code/CNNNet_EpisodicMemoryNetwork.py
+649
-0
src/test/resources/target_code/CNNNet_LoadNetworkTest.py
src/test/resources/target_code/CNNNet_LoadNetworkTest.py
+558
-0
src/test/resources/target_code/CNNNet_VGG16.py
src/test/resources/target_code/CNNNet_VGG16.py
+419
-3
src/test/resources/target_code/CNNPredictor_Alexnet.h
src/test/resources/target_code/CNNPredictor_Alexnet.h
+114
-72
src/test/resources/target_code/CNNPredictor_CifarClassifierNetwork.h
...sources/target_code/CNNPredictor_CifarClassifierNetwork.h
+114
-72
src/test/resources/target_code/CNNPredictor_EpisodicMemoryNetwork.h
...esources/target_code/CNNPredictor_EpisodicMemoryNetwork.h
+487
-0
src/test/resources/target_code/CNNPredictor_LoadNetworkTest.h
...test/resources/target_code/CNNPredictor_LoadNetworkTest.h
+149
-0
src/test/resources/target_code/CNNPredictor_VGG16.h
src/test/resources/target_code/CNNPredictor_VGG16.h
+114
-72
src/test/resources/target_code/CNNSupervisedTrainer_Alexnet.py
...est/resources/target_code/CNNSupervisedTrainer_Alexnet.py
+86
-38
src/test/resources/target_code/CNNSupervisedTrainer_CifarClassifierNetwork.py
...arget_code/CNNSupervisedTrainer_CifarClassifierNetwork.py
+86
-38
src/test/resources/target_code/CNNSupervisedTrainer_EpisodicMemoryNetwork.py
...target_code/CNNSupervisedTrainer_EpisodicMemoryNetwork.py
+751
-0
src/test/resources/target_code/CNNSupervisedTrainer_LoadNetworkTest.py
...urces/target_code/CNNSupervisedTrainer_LoadNetworkTest.py
+667
-0
src/test/resources/target_code/CNNSupervisedTrainer_VGG16.py
src/test/resources/target_code/CNNSupervisedTrainer_VGG16.py
+86
-38
src/test/resources/target_code/ReinforcementConfig2/CNNLAOptimizer_reinforcementConfig2.h
...einforcementConfig2/CNNLAOptimizer_reinforcementConfig2.h
+49
-0
src/test/resources/target_code/ReinforcementConfig3/CNNLAOptimizer_reinforcementConfig3.h
...einforcementConfig3/CNNLAOptimizer_reinforcementConfig3.h
+38
-0
src/test/resources/target_code/ddpg/CNNLAOptimizer_actorNetwork.h
.../resources/target_code/ddpg/CNNLAOptimizer_actorNetwork.h
+38
-0
src/test/resources/target_code/ddpg/CNNTrainer_actorNetwork.py
...est/resources/target_code/ddpg/CNNTrainer_actorNetwork.py
+1
-0
src/test/resources/target_code/ddpg/reinforcement_learning/CNNCreator_CriticNetwork.py
...e/ddpg/reinforcement_learning/CNNCreator_CriticNetwork.py
+96
-10
src/test/resources/target_code/ddpg/reinforcement_learning/CNNNet_CriticNetwork.py
..._code/ddpg/reinforcement_learning/CNNNet_CriticNetwork.py
+419
-3
src/test/resources/target_code/default-gan/CNNLAOptimizer_defaultGAN.h
...urces/target_code/default-gan/CNNLAOptimizer_defaultGAN.h
+39
-0
src/test/resources/target_code/default-gan/CNNTrainer_defaultGAN.py
...esources/target_code/default-gan/CNNTrainer_defaultGAN.py
+0
-2
src/test/resources/target_code/default-gan/gan/CNNCreator_Discriminator.py
...s/target_code/default-gan/gan/CNNCreator_Discriminator.py
+96
-10
src/test/resources/target_code/default-gan/gan/CNNNet_Discriminator.py
...urces/target_code/default-gan/gan/CNNNet_Discriminator.py
+419
-3
src/test/resources/target_code/execute_Alexnet
src/test/resources/target_code/execute_Alexnet
+2
-1
src/test/resources/target_code/execute_CifarClassifierNetwork
...test/resources/target_code/execute_CifarClassifierNetwork
+2
-1
src/test/resources/target_code/execute_EpisodicMemoryNetwork
src/test/resources/target_code/execute_EpisodicMemoryNetwork
+8
-0
src/test/resources/target_code/execute_LoadNetworkTest
src/test/resources/target_code/execute_LoadNetworkTest
+8
-0
src/test/resources/target_code/execute_VGG16
src/test/resources/target_code/execute_VGG16
+2
-1
src/test/resources/target_code/info-gan/CNNLAOptimizer_infoGAN.h
...t/resources/target_code/info-gan/CNNLAOptimizer_infoGAN.h
+39
-0
src/test/resources/target_code/info-gan/CNNTrainer_infoGAN.py
...test/resources/target_code/info-gan/CNNTrainer_infoGAN.py
+0
-2
src/test/resources/target_code/info-gan/gan/CNNCreator_InfoDiscriminator.py
.../target_code/info-gan/gan/CNNCreator_InfoDiscriminator.py
+96
-10
src/test/resources/target_code/info-gan/gan/CNNCreator_InfoQNetwork.py
...urces/target_code/info-gan/gan/CNNCreator_InfoQNetwork.py
+96
-10
src/test/resources/target_code/info-gan/gan/CNNNet_InfoDiscriminator.py
...rces/target_code/info-gan/gan/CNNNet_InfoDiscriminator.py
+419
-3
src/test/resources/target_code/info-gan/gan/CNNNet_InfoQNetwork.py
...resources/target_code/info-gan/gan/CNNNet_InfoQNetwork.py
+419
-3
src/test/resources/target_code/ros-ddpg/CNNLAOptimizer_rosActorNetwork.h
...ces/target_code/ros-ddpg/CNNLAOptimizer_rosActorNetwork.h
+38
-0
src/test/resources/target_code/ros-ddpg/CNNTrainer_rosActorNetwork.py
...ources/target_code/ros-ddpg/CNNTrainer_rosActorNetwork.py
+1
-0
src/test/resources/target_code/ros-ddpg/reinforcement_learning/CNNCreator_RosCriticNetwork.py
...dpg/reinforcement_learning/CNNCreator_RosCriticNetwork.py
+96
-10
src/test/resources/target_code/ros-ddpg/reinforcement_learning/CNNNet_RosCriticNetwork.py
...os-ddpg/reinforcement_learning/CNNNet_RosCriticNetwork.py
+419
-3
src/test/resources/target_code/td3/CNNLAOptimizer_tD3Config.h
...test/resources/target_code/td3/CNNLAOptimizer_tD3Config.h
+39
-0
src/test/resources/target_code/td3/CNNTrainer_tD3Config.py
src/test/resources/target_code/td3/CNNTrainer_tD3Config.py
+1
-0
src/test/resources/target_code/td3/reinforcement_learning/CNNCreator_CriticNetwork.py
...de/td3/reinforcement_learning/CNNCreator_CriticNetwork.py
+96
-10
src/test/resources/target_code/td3/reinforcement_learning/CNNNet_CriticNetwork.py
...t_code/td3/reinforcement_learning/CNNNet_CriticNetwork.py
+419
-3
src/test/resources/valid_tests/EpisodicMemoryNetwork.cnna
src/test/resources/valid_tests/EpisodicMemoryNetwork.cnna
+15
-0
src/test/resources/valid_tests/LoadNetworkTest.cnna
src/test/resources/valid_tests/LoadNetworkTest.cnna
+11
-0
src/test/resources/valid_tests/data_paths.txt
src/test/resources/valid_tests/data_paths.txt
+3
-1
No files found.
pom.xml
View file @
68ee368d
...
...
@@ -9,7 +9,7 @@
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
cnnarch-gluon-generator
</artifactId>
<version>
0.2.1
1
-SNAPSHOT
</version>
<version>
0.2.1
2
-SNAPSHOT
</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
...
...
@@ -17,9 +17,9 @@
<!-- .. SE-Libraries .................................................. -->
<CNNArch.version>
0.3.
5
-SNAPSHOT
</CNNArch.version>
<CNNTrain.version>
0.3.1
0
-SNAPSHOT
</CNNTrain.version>
<CNNArch2X.version>
0.0.
6
-SNAPSHOT
</CNNArch2X.version>
<CNNArch.version>
0.3.
7
-SNAPSHOT
</CNNArch.version>
<CNNTrain.version>
0.3.1
2
-SNAPSHOT
</CNNTrain.version>
<CNNArch2X.version>
0.0.
7
-SNAPSHOT
</CNNArch2X.version>
<embedded-montiarc-math-opt-generator>
0.1.6
</embedded-montiarc-math-opt-generator>
<EMADL2PythonWrapper.version>
0.0.2-SNAPSHOT
</EMADL2PythonWrapper.version>
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNArch2Gluon.java
View file @
68ee368d
...
...
@@ -71,15 +71,18 @@ public class CNNArch2Gluon extends CNNArchGenerator {
temp
=
controller
.
process
(
"execute"
,
Target
.
CPP
);
fileContentMap
.
put
(
temp
.
getKey
().
replace
(
".h"
,
""
),
temp
.
getValue
());
temp
=
controller
.
process
(
"CNN
BufferFile
"
,
Target
.
CPP
);
fileContentMap
.
put
(
"CNN
BufferFile
.h"
,
temp
.
getValue
());
temp
=
controller
.
process
(
"CNN
ModelLoader
"
,
Target
.
CPP
);
fileContentMap
.
put
(
"CNN
ModelLoader
.h"
,
temp
.
getValue
());
return
fileContentMap
;
}
private
Map
<
String
,
String
>
compileFileContentMap
(
ArchitectureSymbol
architecture
)
{
TemplateConfiguration
templateConfiguration
=
new
GluonTemplateConfiguration
();
architecture
.
processForEpisodicReplayMemory
();
Map
<
String
,
String
>
fileContentMap
=
new
HashMap
<>();
CNNArch2GluonTemplateController
archTc
=
new
CNNArch2GluonTemplateController
(
architecture
,
templateConfiguration
);
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNArch2GluonLayerSupportChecker.java
View file @
68ee368d
...
...
@@ -41,6 +41,10 @@ public class CNNArch2GluonLayerSupportChecker extends LayerSupportChecker {
supportedLayerList
.
add
(
AllPredefinedLayers
.
BROADCAST_ADD_NAME
);
supportedLayerList
.
add
(
AllPredefinedLayers
.
RESHAPE_NAME
);
// supportedLayerList.add(AllPredefinedLayers.CROP_NAME);
supportedLayerList
.
add
(
AllPredefinedLayers
.
LARGE_MEMORY_NAME
);
supportedLayerList
.
add
(
AllPredefinedLayers
.
EPISODIC_MEMORY_NAME
);
supportedLayerList
.
add
(
AllPredefinedLayers
.
DOT_PRODUCT_SELF_ATTENTION_NAME
);
supportedLayerList
.
add
(
AllPredefinedLayers
.
LOAD_NETWORK_NAME
);
}
}
src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNArch2GluonTemplateController.java
View file @
68ee368d
...
...
@@ -87,6 +87,17 @@ public class CNNArch2GluonTemplateController extends CNNArchTemplateController {
setCurrentElement
(
previousElement
);
}
public
void
include
(
SerialCompositeElementSymbol
compositeElement
,
Integer
episodicSubNetIndex
,
Writer
writer
,
NetDefinitionMode
netDefinitionMode
){
ArchitectureElementData
previousElement
=
getCurrentElement
();
setCurrentElement
(
compositeElement
);
for
(
ArchitectureElementSymbol
element
:
compositeElement
.
getEpisodicSubNetworks
().
get
(
episodicSubNetIndex
)){
include
(
element
,
writer
,
netDefinitionMode
);
}
setCurrentElement
(
previousElement
);
}
public
void
include
(
ArchitectureElementSymbol
architectureElement
,
Writer
writer
,
NetDefinitionMode
netDefinitionMode
){
if
(
architectureElement
instanceof
CompositeElementSymbol
){
include
((
CompositeElementSymbol
)
architectureElement
,
writer
,
netDefinitionMode
);
...
...
@@ -106,6 +117,10 @@ public class CNNArch2GluonTemplateController extends CNNArchTemplateController {
include
(
architectureElementSymbol
,
NetDefinitionMode
.
fromString
(
netDefinitionMode
));
}
public
void
include
(
ArchitectureElementSymbol
architectureElementSymbol
,
Integer
episodicSubNetIndex
,
String
netDefinitionMode
)
{
include
(
architectureElementSymbol
,
episodicSubNetIndex
,
NetDefinitionMode
.
fromString
(
netDefinitionMode
));
}
public
void
include
(
ArchitectureElementSymbol
architectureElement
,
NetDefinitionMode
netDefinitionMode
){
if
(
getWriter
()
==
null
){
throw
new
IllegalStateException
(
"missing writer"
);
...
...
@@ -113,10 +128,21 @@ public class CNNArch2GluonTemplateController extends CNNArchTemplateController {
include
(
architectureElement
,
getWriter
(),
netDefinitionMode
);
}
public
void
include
(
ArchitectureElementSymbol
architectureElement
,
Integer
episodicSubNetIndex
,
NetDefinitionMode
netDefinitionMode
){
if
(
getWriter
()
==
null
){
throw
new
IllegalStateException
(
"missing writer"
);
}
include
((
SerialCompositeElementSymbol
)
architectureElement
,
episodicSubNetIndex
,
getWriter
(),
netDefinitionMode
);
}
public
Set
<
String
>
getStreamInputNames
(
SerialCompositeElementSymbol
stream
,
boolean
outputAsArray
)
{
return
getStreamInputs
(
stream
,
outputAsArray
).
keySet
();
}
public
Set
<
String
>
getSubnetInputNames
(
List
<
ArchitectureElementSymbol
>
subNet
)
{
return
getSubnetInputs
(
subNet
).
keySet
();
}
public
ArrayList
<
String
>
getStreamInputVariableNames
(
SerialCompositeElementSymbol
stream
,
boolean
outputAsArray
)
{
ArrayList
<
String
>
inputVariableNames
=
new
ArrayList
<
String
>();
for
(
ArchitectureElementSymbol
element
:
stream
.
getFirstAtomicElements
())
{
...
...
@@ -226,6 +252,29 @@ public class CNNArch2GluonTemplateController extends CNNArchTemplateController {
return
outputNames
;
}
public
Set
<
String
>
getSubnetOutputNames
(
List
<
ArchitectureElementSymbol
>
subNet
){
Set
<
String
>
outputNames
=
new
LinkedHashSet
<>();
for
(
ArchitectureElementSymbol
element
:
subNet
.
get
(
subNet
.
size
()-
1
).
getLastAtomicElements
())
{
String
name
=
getName
(
element
);
outputNames
.
add
(
name
);
}
return
outputNames
;
}
public
int
getSubnetOutputSize
(
List
<
ArchitectureElementSymbol
>
subNet
){
int
outputSize
=
0
;
for
(
ArchitectureElementSymbol
element
:
subNet
.
get
(
subNet
.
size
()-
1
).
getLastAtomicElements
())
{
outputSize
+=
element
.
getOutputTypes
().
size
();
}
if
(
outputSize
==
0
){
outputSize
=
1
;
}
return
outputSize
;
}
public
List
<
String
>
getUnrollOutputNames
(
UnrollInstructionSymbol
unroll
,
String
variable
)
{
List
<
String
>
outputNames
=
new
LinkedList
<>(
getStreamOutputNames
(
unroll
.
getBody
(),
true
));
Map
<
String
,
String
>
pairs
=
getUnrollPairs
(
unroll
.
getBody
(),
unroll
.
getResolvedBodies
().
get
(
0
),
variable
);
...
...
@@ -403,6 +452,31 @@ public class CNNArch2GluonTemplateController extends CNNArchTemplateController {
return
inputs
;
}
public
Map
<
String
,
List
<
String
>>
getSubnetInputs
(
List
<
ArchitectureElementSymbol
>
subNet
)
{
Map
<
String
,
List
<
String
>>
inputs
=
new
LinkedHashMap
<>();
for
(
ArchitectureElementSymbol
element
:
subNet
.
get
(
0
).
getFirstAtomicElements
())
{
if
(
element
instanceof
ConstantSymbol
)
{
inputs
.
put
(
getName
(
element
),
Arrays
.
asList
(
"1"
));
}
else
{
List
<
Integer
>
intDimensions
=
element
.
getOutputTypes
().
get
(
0
).
getDimensions
();
List
<
String
>
dimensions
=
new
ArrayList
<>();
for
(
Integer
intDimension
:
intDimensions
)
{
dimensions
.
add
(
intDimension
.
toString
());
}
String
name
=
getName
(
element
);
inputs
.
put
(
name
,
dimensions
);
}
}
return
inputs
;
}
public
Map
<
String
,
List
<
String
>>
getStreamOutputs
(
SerialCompositeElementSymbol
stream
,
boolean
outputAsArray
)
{
Map
<
String
,
List
<
String
>>
outputs
=
new
LinkedHashMap
<>();
...
...
@@ -519,6 +593,15 @@ public class CNNArch2GluonTemplateController extends CNNArchTemplateController {
return
dimensions
;
}
public
List
<
Integer
>
cutDimensionsInteger
(
List
<
Integer
>
dimensions
)
{
while
(
dimensions
.
size
()
>
1
&&
dimensions
.
get
(
dimensions
.
size
()
-
1
).
equals
(
1
))
{
dimensions
.
remove
(
dimensions
.
size
()
-
1
);
}
return
dimensions
;
}
public
boolean
hasUnrollInstructions
()
{
for
(
NetworkInstructionSymbol
networkInstruction
:
getArchitecture
().
getNetworkInstructions
())
{
if
(
networkInstruction
.
isUnroll
())
{
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/CNNTrain2Gluon.java
View file @
68ee368d
...
...
@@ -130,9 +130,27 @@ public class CNNTrain2Gluon extends CNNTrainGenerator {
Map
<
String
,
String
>
fileContentMap
=
new
HashMap
<>();
//Context Information and Optimizer for local adaption during prediction for replay memory layer (the second only applicaple for supervised learning)
String
cnnTrainLAOptimizerTemplateContent
=
templateConfiguration
.
processTemplate
(
ftlContext
,
"CNNLAOptimizer.ftl"
);
fileContentMap
.
put
(
"CNNLAOptimizer_"
+
getInstanceName
()
+
".h"
,
cnnTrainLAOptimizerTemplateContent
);
//AdamW optimizer if used for training
if
(
configuration
.
getOptimizer
()
!=
null
)
{
String
optimizerName
=
configuration
.
getOptimizer
().
getName
();
Optional
<
OptimizerSymbol
>
criticOptimizer
=
configuration
.
getCriticOptimizer
();
String
criticOptimizerName
=
""
;
if
(
criticOptimizer
.
isPresent
())
{
criticOptimizerName
=
criticOptimizer
.
get
().
getName
();
}
if
(
optimizerName
.
equals
(
"adamw"
)
||
criticOptimizerName
.
equals
(
"adamw"
))
{
String
adamWContent
=
templateConfiguration
.
processTemplate
(
ftlContext
,
"Optimizer/AdamW.ftl"
);
fileContentMap
.
put
(
"AdamW.py"
,
adamWContent
);
}
}
if
(
configData
.
isSupervisedLearning
())
{
String
cnnTrainTemplateContent
=
templateConfiguration
.
processTemplate
(
ftlContext
,
"CNNTrainer.ftl"
);
fileContentMap
.
put
(
"CNNTrainer_"
+
getInstanceName
()
+
".py"
,
cnnTrainTemplateContent
);
String
cnnTrainT
rainerT
emplateContent
=
templateConfiguration
.
processTemplate
(
ftlContext
,
"CNNTrainer.ftl"
);
fileContentMap
.
put
(
"CNNTrainer_"
+
getInstanceName
()
+
".py"
,
cnnTrainT
rainerT
emplateContent
);
}
else
if
(
configData
.
isGan
())
{
final
String
trainerName
=
"CNNTrainer_"
+
getInstanceName
();
if
(!
configuration
.
getDiscriminatorNetwork
().
isPresent
())
{
...
...
@@ -189,7 +207,6 @@ public class CNNTrain2Gluon extends CNNTrainGenerator {
final
String
ganTrainerContent
=
templateConfiguration
.
processTemplate
(
ftlContext
,
"gan/Trainer.ftl"
);
fileContentMap
.
put
(
trainerName
+
".py"
,
ganTrainerContent
);
}
else
if
(
configData
.
isReinforcementLearning
())
{
final
String
trainerName
=
"CNNTrainer_"
+
getInstanceName
();
final
RLAlgorithm
rlAlgorithm
=
configData
.
getRlAlgorithm
();
...
...
src/main/java/de/monticore/lang/monticar/cnnarch/gluongenerator/NetDefinitionMode.java
View file @
68ee368d
...
...
@@ -6,6 +6,7 @@ package de.monticore.lang.monticar.cnnarch.gluongenerator;
*/
public
enum
NetDefinitionMode
{
ARCHITECTURE_DEFINITION
,
PREDICTION_PARAMETER
,
FORWARD_FUNCTION
;
public
static
NetDefinitionMode
fromString
(
final
String
netDefinitionMode
)
{
...
...
@@ -14,6 +15,8 @@ public enum NetDefinitionMode {
return
ARCHITECTURE_DEFINITION
;
case
"FORWARD_FUNCTION"
:
return
FORWARD_FUNCTION
;
case
"PREDICTION_PARAMETER"
:
return
PREDICTION_PARAMETER
;
default
:
throw
new
IllegalArgumentException
(
"Unknown Net Definition Mode"
);
}
...
...
src/main/resources/templates/gluon/CNNBufferFile.ftl
deleted
100644 → 0
View file @
6c1c21bd
<#-- (c) https://github.com/MontiCore/monticore -->
#ifndef CNNBUFFERFILE_H
#define CNNBUFFERFILE_H
#include <stdio.h>
#include <iostream>
#include <fstream>
// Read file to buffer
class BufferFile {
public :
std::string file_path_;
int length_;
char* buffer_;
explicit BufferFile(std::string file_path)
:file_path_(file_path) {
std::ifstream ifs(file_path.c_str(), std::ios::in | std::ios::binary);
if (!ifs) {
std::cerr << "Can't open the file. Please check " << file_path << ". \n";
length_ = 0;
buffer_ = NULL;
return;
}
ifs.seekg(0, std::ios::end);
length_ = ifs.tellg();
ifs.seekg(0, std::ios::beg);
std::cout << file_path.c_str() << " ... "<< length_ << " bytes\n";
buffer_ = new char[sizeof(char) * length_];
ifs.read(buffer_, length_);
ifs.close();
}
int GetLength() {
return length_;
}
char* GetBuffer() {
return buffer_;
}
~BufferFile() {
if (buffer_) {
delete[] buffer_;
buffer_ = NULL;
}
}
};
#endif // CNNBUFFERFILE_H
src/main/resources/templates/gluon/CNNCreator.ftl
View file @
68ee368d
...
...
@@ -3,6 +3,8 @@ import mxnet as mx
import logging
import os
import shutil
import warnings
import inspect
<#list tc.architecture.networkInstructions as networkInstruction>
from CNNNet_${tc.fullArchitectureName} import Net_${networkInstruction?index}
...
...
@@ -27,6 +29,10 @@ class ${tc.fileNameWithoutEnding}:
for i, network in self.networks.items():
lastEpoch = 0
param_file = None
if hasattr(network, 'episodic_sub_nets'):
num_episodic_sub_nets = len(network.episodic_sub_nets)
lastMemEpoch = [0]*num_episodic_sub_nets
mem_files = [None]*num_episodic_sub_nets
try:
os.remove(self._model_dir_ + self._model_prefix_ + "_" + str(i) + "_newest-0000.params")
...
...
@@ -37,22 +43,77 @@ class ${tc.fileNameWithoutEnding}:
except OSError:
pass
if hasattr(network, 'episodic_sub_nets'):
try:
os.remove(self._model_dir_ + self._model_prefix_ + "_" + str(i) + '_newest_episodic_sub_net_' + str(0) + "-0000.params")
except OSError:
pass
try:
os.remove(self._model_dir_ + self._model_prefix_ + "_" + str(i) + '_newest_episodic_sub_net_' + str(0) + "-symbol.json")
except OSError:
pass
for j in range(len(network.episodic_sub_nets)):
try:
os.remove(self._model_dir_ + self._model_prefix_ + "_" + str(i) + '_newest_episodic_sub_net_' + str(j+1) + "-0000.params")
except OSError:
pass
try:
os.remove(self._model_dir_ + self._model_prefix_ + "_" + str(i) + '_newest_episodic_sub_net_' + str(j+1) + "-symbol.json")
except OSError:
pass
try:
os.remove(self._model_dir_ + self._model_prefix_ + "_" + str(i) + '_newest_episodic_query_net_' + str(j+1) + "-0000.params")
except OSError:
pass
try:
os.remove(self._model_dir_ + self._model_prefix_ + "_" + str(i) + '_newest_episodic_query_net_' + str(j+1) + "-symbol.json")
except OSError:
pass
try:
os.remove(self._model_dir_ + self._model_prefix_ + "_" + str(i) + '_newest_loss' + "-0000.params")
except OSError:
pass
try:
os.remove(self._model_dir_ + self._model_prefix_ + "_" + str(i) + '_newest_loss' + "-symbol.json")
except OSError:
pass
try:
os.remove(self._model_dir_ + self._model_prefix_ + "_" + str(i) + "_newest_episodic_memory_sub_net_" + str(j + 1) + "-0000")
except OSError:
pass
if os.path.isdir(self._model_dir_):
for file in os.listdir(self._model_dir_):
if ".params" in file and self._model_prefix_ + "_" + str(i) in file:
epochStr = file.replace(".params",
"").replace(self._model_prefix_ + "_" + str(i) + "-",
"")
if ".params" in file and self._model_prefix_ + "_" + str(i) in file
and not "loss" in file
:
epochStr = file.replace(".params",
"").replace(self._model_prefix_ + "_" + str(i) + "-",
"")
epoch = int(epochStr)
if epoch > lastEpoch:
if epoch >
=
lastEpoch:
lastEpoch = epoch
param_file = file
elif hasattr(network, 'episodic_sub_nets') and self._model_prefix_ + "_" + str(i) + "_episodic_memory_sub_net_" in file:
relMemPathInfo = file.replace(self._model_prefix_ + "_" + str(i) + "_episodic_memory_sub_net_", "").split("-")
memSubNet = int(relMemPathInfo[0])
memEpochStr = relMemPathInfo[1]
memEpoch = int(memEpochStr)
if memEpoch >= lastMemEpoch[memSubNet-1]:
lastMemEpoch[memSubNet-1] = memEpoch
mem_files[memSubNet-1] = file
if param_file is None:
earliestLastEpoch = 0
else:
logging.info("Loading checkpoint: " + param_file)
network.load_parameters(self._model_dir_ + param_file)
if hasattr(network, 'episodic_sub_nets'):
for j, sub_net in enumerate(network.episodic_sub_nets):
if mem_files[j] != None:
logging.info("Loading Replay Memory: " + mem_files[j])
mem_layer = [param for param in inspect.getmembers(sub_net, lambda x: not(inspect.isroutine(x))) if param[0].startswith("memory")][0][1]
mem_layer.load_memory(self._model_dir_ + mem_files[j])
if earliestLastEpoch == None or lastEpoch < earliestLastEpoch:
earliestLastEpoch = lastEpoch
if earliestLastEpoch == None or lastEpoch
+ 1
< earliestLastEpoch:
earliestLastEpoch = lastEpoch
+ 1
return earliestLastEpoch
...
...
@@ -63,28 +124,56 @@ class ${tc.fileNameWithoutEnding}:
for i, network in self.networks.items():
# param_file = self._model_prefix_ + "_" + str(i) + "_newest-0000.params"
param_file = None
if hasattr(network, 'episodic_sub_nets'):
num_episodic_sub_nets = len(network.episodic_sub_nets)
lastMemEpoch = [0] * num_episodic_sub_nets
mem_files = [None] * num_episodic_sub_nets
if os.path.isdir(self._weights_dir_):
lastEpoch = 0
for file in os.listdir(self._weights_dir_):
if ".params" in file and self._model_prefix_ + "_" + str(i) in file:
if ".params" in file and self._model_prefix_ + "_" + str(i) in file
and not "loss" in file
:
epochStr = file.replace(".params","").replace(self._model_prefix_ + "_" + str(i) + "-","")
epoch = int(epochStr)
if epoch > lastEpoch:
if epoch >
=
lastEpoch:
lastEpoch = epoch
param_file = file
elif hasattr(network, 'episodic_sub_nets') and self._model_prefix_ + "_" + str(i) + "_episodic_memory_sub_net_" in file:
relMemPathInfo = file.replace(self._model_prefix_ + "_" + str(i) + "_episodic_memory_sub_net_").split("-")
memSubNet = int(relMemPathInfo[0])
memEpochStr = relMemPathInfo[1]
memEpoch = int(memEpochStr)
if memEpoch >= lastMemEpoch[memSubNet-1]:
lastMemEpoch[memSubNet-1] = memEpoch
mem_files[memSubNet-1] = file
logging.info("Loading pretrained weights: " + self._weights_dir_ + param_file)
network.load_parameters(self._weights_dir_ + param_file, allow_missing=True, ignore_extra=True)
if hasattr(network, 'episodic_sub_nets'):
assert lastEpoch == lastMemEpoch
for j, sub_net in enumerate(network.episodic_sub_nets):
if mem_files[j] != None:
logging.info("Loading pretrained Replay Memory: " + mem_files[j])
mem_layer = \
[param for param in inspect.getmembers(sub_net, lambda x: not (inspect.isroutine(x))) if
param[0].startswith("memory")][0][1]
mem_layer.load_memory(self._model_dir_ + mem_files[j])
else:
logging.info("No pretrained weights available at: " + self._weights_dir_ + param_file)
def construct(self, context, data_mean=None, data_std=None):
<#list tc.architecture.networkInstructions as networkInstruction>
self.networks[${networkInstruction?index}] = Net_${networkInstruction?index}(data_mean=data_mean, data_std=data_std)
self.networks[${networkInstruction?index}].collect_params().initialize(self.weight_initializer, ctx=context)
self.networks[${networkInstruction?index}] = Net_${networkInstruction?index}(data_mean=data_mean, data_std=data_std, mx_context=context, prefix="")
with warnings.catch_warnings():
warnings.simplefilter("ignore")
self.networks[${networkInstruction?index}].collect_params().initialize(self.weight_initializer, force_reinit=False, ctx=context)
self.networks[${networkInstruction?index}].hybridize()
self.networks[${networkInstruction?index}](<#list tc.getStreamInputDimensions(networkInstruction.body) as dimensions>mx.nd.zeros((1, ${tc.join(tc.cutDimensions(dimensions), ",")},), ctx=context)<#sep>, </#list>)
self.networks[${networkInstruction?index}](<#list tc.getStreamInputDimensions(networkInstruction.body) as dimensions><#if tc.cutDimensions(dimensions)[tc.cutDimensions(dimensions)?size-1] == "1" && tc.cutDimensions(dimensions)?size != 1>mx.nd.zeros((${tc.join(tc.cutDimensions(dimensions), ",")},), ctx=context[0])<#else>mx.nd.zeros((1, ${tc.join(tc.cutDimensions(dimensions), ",")},), ctx=context[0])</#if><#sep>, </#list>)
<#if networkInstruction.body.episodicSubNetworks?has_content>
self.networks[0].episodicsubnet0_(<#list tc.getStreamInputDimensions(networkInstruction.body) as dimensions><#if tc.cutDimensions(dimensions)[tc.cutDimensions(dimensions)?size-1] == "1" && tc.cutDimensions(dimensions)?size != 1>mx.nd.zeros((${tc.join(tc.cutDimensions(dimensions), ",")},), ctx=context[0])<#else>mx.nd.zeros((1, ${tc.join(tc.cutDimensions(dimensions), ",")},), ctx=context[0])</#if><#sep>, </#list>)
</#if>
</#list>
if not os.path.exists(self._model_dir_):
...
...
src/main/resources/templates/gluon/CNNGanTrainer.ftl
View file @
68ee368d
...
...
@@ -184,16 +184,16 @@ class ${tc.fileNameWithoutEnding}:
del discriminator_optimizer_params['learning_rate_decay']
if normalize:
self._net_creator_dis.construct(
mx_context
, data_mean=data_mean, data_std=data_std)
self._net_creator_dis.construct(
[mx_context]
, data_mean=data_mean, data_std=data_std)
else:
self._net_creator_dis.construct(
mx_context
)
self._net_creator_dis.construct(
[mx_context]
)
self._net_creator_gen.construct(
mx_context
)
self._net_creator_gen.construct(
[mx_context]
)
if self.use_qnet:
self._net_creator_qnet.construct(
mx_context
)
self._net_creator_qnet.construct(
[mx_context]
)
if load_checkpoint:
self._net_creator_qnet.load(
mx_context
)
self._net_creator_qnet.load(
[mx_context]
)
else:
if os.path.isdir(self._net_creator_qnet._model_dir_):
shutil.rmtree(self._net_creator_qnet._model_dir_)
...
...
@@ -206,8 +206,8 @@ class ${tc.fileNameWithoutEnding}:
begin_epoch = 0
if load_checkpoint:
begin_epoch = self._net_creator_dis.load(
mx_context
)
self._net_creator_gen.load(
mx_context
)
begin_epoch = self._net_creator_dis.load(
[mx_context]
)
self._net_creator_gen.load(
[mx_context]
)
else:
if os.path.isdir(self._net_creator_dis._model_dir_):
shutil.rmtree(self._net_creator_dis._model_dir_)
...
...
@@ -255,9 +255,9 @@ class ${tc.fileNameWithoutEnding}:
gen_input, exp_qnet_output = create_generator_input(batch)
with autograd.record():
fake_data = gen_net(*gen_input)
fake_data = gen_net(*gen_input)
[0][0]
fake_data.detach()
discriminated_fake_dis = dis_net(fake_data, *dis_conditional_input)
discriminated_fake_dis = dis_net(fake_data, *dis_conditional_input)
[0][0]
if self.use_qnet:
discriminated_fake_dis, _ = discriminated_fake_dis
...
...
@@ -265,7 +265,7 @@ class ${tc.fileNameWithoutEnding}:
real_labels = mx.nd.ones(discriminated_fake_dis.shape, ctx=mx_context)
loss_resultF = dis_loss(discriminated_fake_dis, fake_labels)
discriminated_real_dis = dis_net(real_data, *dis_conditional_input)
discriminated_real_dis = dis_net(real_data, *dis_conditional_input)
[0][0]
if self.use_qnet:
discriminated_real_dis, _ = discriminated_real_dis
loss_resultR = dis_loss(discriminated_real_dis, real_labels)
...
...
@@ -276,8 +276,8 @@ class ${tc.fileNameWithoutEnding}:
if batch_i % k_value == 0:
with autograd.record():
fake_data = gen_net(*gen_input)
discriminated_fake_gen = dis_net(fake_data, *dis_conditional_input)
fake_data = gen_net(*gen_input)
[0][0]
discriminated_fake_gen = dis_net(fake_data, *dis_conditional_input)
[0][0]
if self.use_qnet:
discriminated_fake_gen, features = discriminated_fake_gen
loss_resultG = dis_loss(discriminated_fake_gen, real_labels)
...
...
@@ -285,7 +285,7 @@ class ${tc.fileNameWithoutEnding}:
condition = batch.data[traindata_to_index[generator_target_name + "_"]]
loss_resultG = loss_resultG + gen_loss_weight * generator_loss_func(fake_data, condition)
if self.use_qnet:
qnet_discriminated = [q_net(features)]
qnet_discriminated = [q_net(features)
[0][0]
]
for i, qnet_out in enumerate(qnet_discriminated):
loss_resultG = loss_resultG + qnet_losses[i](qnet_out, exp_qnet_output[i])
loss_resultG.backward()
...
...
src/main/resources/templates/gluon/CNNLAOptimizer.ftl
0 → 100644
View file @
68ee368d
<#-- (c) https://github.com/MontiCore/monticore -->
<#list configurations as config>
#ifndef CNNLAOPTIMIZER_${config.instanceName?upper_case}
#define CNNLAOPTIMIZER_${config.instanceName?upper_case}
#include <mxnet-cpp/MxNetCpp.h>
#include <string>
#include <vector>
#include <memory>
using namespace mxnet::cpp;
class CNNLAOptimizer_${config.instanceName}{
private:
Optimizer *optimizerHandle;
<#if (config.context)??>
std::string context_name = "${config.context}";
<#else>
std::string context_name = "cpu";
</#if>
public:
explicit CNNLAOptimizer_${config.instanceName}(){
<#if (config.configuration.optimizer)??>
<#if config.optimizerName == "adamw">
optimizerHandle = OptimizerRegistry::Find("adam");
<#else>
optimizerHandle = OptimizerRegistry::Find("${config.optimizerName}");
</#if>
<#list config.optimizerParams?keys as param>
<#if param == "learning_rate">
optimizerHandle->SetParam("lr", ${config.optimizerParams[param]});
<#elseif param == "weight_decay">
optimizerHandle->SetParam("wd", ${config.optimizerParams[param]});
<#elseif param == "learning_rate_decay">
<#assign learningRateDecay = config.optimizerParams[param]>
<#elseif param == "learning_rate_minimum">
<#assign minLearningRate = config.optimizerParams[param]>
<#elseif param == "step_size">
<#assign stepSize = config.optimizerParams[param]>
<#else>
optimizerHandle->SetParam("${param}", ${config.optimizerParams[param]});
</#if>
</#list>
<#if (learningRateDecay)?? && (stepSize)??>
<#if !(minLearningRate)??>
<#assign minLearningRate = "1e-08">
</#if>