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
5196adbc
Commit
5196adbc
authored
Jun 05, 2019
by
Sebastian Nickels
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bumped version numbers and prepared test for multiple outputs
parent
bd3b512b
Pipeline
#147141
failed with stages
in 5 minutes and 30 seconds
Changes
16
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
88 additions
and
41 deletions
+88
-41
pom.xml
pom.xml
+5
-5
src/test/java/de/monticore/lang/monticar/emadl/IntegrationGluonTest.java
...e/monticore/lang/monticar/emadl/IntegrationGluonTest.java
+20
-3
src/test/resources/models/MultipleOutputs.cnnt
src/test/resources/models/MultipleOutputs.cnnt
+9
-9
src/test/resources/models/MultipleOutputs.emadl
src/test/resources/models/MultipleOutputs.emadl
+7
-16
src/test/resources/models/MultipleOutputsOld.cnnt
src/test/resources/models/MultipleOutputsOld.cnnt
+11
-0
src/test/resources/models/MultipleOutputsOld.emadl
src/test/resources/models/MultipleOutputsOld.emadl
+29
-0
src/test/resources/models/data_paths.txt
src/test/resources/models/data_paths.txt
+6
-7
src/test/resources/target_code/CNNCreator_cifar10_cifar10Classifier_net.py
...s/target_code/CNNCreator_cifar10_cifar10Classifier_net.py
+1
-1
src/test/resources/training_data/Cifar/test.h5
src/test/resources/training_data/Cifar/test.h5
+0
-0
src/test/resources/training_data/Cifar/test_lmdb/data.mdb
src/test/resources/training_data/Cifar/test_lmdb/data.mdb
+0
-0
src/test/resources/training_data/Cifar/test_lmdb/lock.mdb
src/test/resources/training_data/Cifar/test_lmdb/lock.mdb
+0
-0
src/test/resources/training_data/Cifar/train.h5
src/test/resources/training_data/Cifar/train.h5
+0
-0
src/test/resources/training_data/Cifar/train_lmdb/data.mdb
src/test/resources/training_data/Cifar/train_lmdb/data.mdb
+0
-0
src/test/resources/training_data/Cifar/train_lmdb/lock.mdb
src/test/resources/training_data/Cifar/train_lmdb/lock.mdb
+0
-0
src/test/resources/training_data/MultipleOutputs/test.h5
src/test/resources/training_data/MultipleOutputs/test.h5
+0
-0
src/test/resources/training_data/MultipleOutputs/train.h5
src/test/resources/training_data/MultipleOutputs/train.h5
+0
-0
No files found.
pom.xml
View file @
5196adbc
...
...
@@ -8,18 +8,18 @@
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
embedded-montiarc-emadl-generator
</artifactId>
<version>
0.3.
0
-SNAPSHOT
</version>
<version>
0.3.
1
-SNAPSHOT
</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
<properties>
<!-- .. SE-Libraries .................................................. -->
<emadl.version>
0.2.
7
-SNAPSHOT
</emadl.version>
<emadl.version>
0.2.
8
-SNAPSHOT
</emadl.version>
<CNNTrain.version>
0.3.0-SNAPSHOT
</CNNTrain.version>
<cnnarch-mxnet-generator.version>
0.2.1
4
-SNAPSHOT
</cnnarch-mxnet-generator.version>
<cnnarch-caffe2-generator.version>
0.2.1
1
-SNAPSHOT
</cnnarch-caffe2-generator.version>
<cnnarch-gluon-generator.version>
0.2.
0
-SNAPSHOT
</cnnarch-gluon-generator.version>
<cnnarch-mxnet-generator.version>
0.2.1
6
-SNAPSHOT
</cnnarch-mxnet-generator.version>
<cnnarch-caffe2-generator.version>
0.2.1
2
-SNAPSHOT
</cnnarch-caffe2-generator.version>
<cnnarch-gluon-generator.version>
0.2.
1
-SNAPSHOT
</cnnarch-gluon-generator.version>
<embedded-montiarc-math-opt-generator>
0.1.4
</embedded-montiarc-math-opt-generator>
<!-- .. Libraries .................................................. -->
...
...
src/test/java/de/monticore/lang/monticar/emadl/IntegrationGluonTest.java
View file @
5196adbc
...
...
@@ -25,6 +25,7 @@ import de.se_rwth.commons.logging.Log;
import
org.junit.Test
;
import
java.nio.file.Files
;
import
java.nio.file.NoSuchFileException
;
import
java.nio.file.Path
;
import
java.nio.file.Paths
;
...
...
@@ -34,6 +35,7 @@ import static org.junit.Assert.assertFalse;
public
class
IntegrationGluonTest
extends
IntegrationTest
{
private
Path
multipleInputsHashFile
=
Paths
.
get
(
"./target/generated-sources-emadl/MultipleInputs.training_hash"
);
private
Path
multipleOutputsHashFile
=
Paths
.
get
(
"./target/generated-sources-emadl/MultipleOutputs.training_hash"
);
public
IntegrationGluonTest
()
{
super
(
"GLUON"
,
"39253EC049D4A4E5FA0536AD34874B9D#1DBAEE1B1BD83FB7CB5F70AE91B29638#C4C23549E737A759721D6694C75D9771#5AF0CE68E408E8C1F000E49D72AC214A"
);
...
...
@@ -43,7 +45,7 @@ public class IntegrationGluonTest extends IntegrationTest {
public
void
testMultipleInputs
()
{
Log
.
getFindings
().
clear
();
delete
M
ultipleInputsHashFile
(
);
delete
HashFile
(
m
ultipleInputsHashFile
);
String
[]
args
=
{
"-m"
,
"src/test/resources/models/"
,
"-r"
,
"MultipleInputs"
,
"-b"
,
"GLUON"
};
EMADLGeneratorCli
.
main
(
args
);
...
...
@@ -51,9 +53,24 @@ public class IntegrationGluonTest extends IntegrationTest {
assertTrue
(
Log
.
getFindings
().
isEmpty
());
}
private
void
deleteMultipleInputsHashFile
()
{
/*@Test
public void testMultipleOutputs() {
Log.getFindings().clear();
deleteHashFile(multipleOutputsHashFile);
String[] args = {"-m", "src/test/resources/models/", "-r", "MultipleOutputs", "-b", "GLUON"};
EMADLGeneratorCli.main(args);
assertTrue(Log.getFindings().isEmpty());
}*/
private
void
deleteHashFile
(
Path
hashFile
)
{
try
{
Files
.
delete
(
multipleInputsHashFile
);
Files
.
delete
(
hashFile
);
}
catch
(
NoSuchFileException
e
)
{
}
catch
(
Exception
e
)
{
assertFalse
(
"Could not delete hash file"
,
true
);
...
...
src/test/resources/models/MultipleOutputs.cnnt
View file @
5196adbc
configuration MultipleOutputs{
num_epoch:10
batch_size:
64
normalize:true
load_checkpoint:false
optimizer:adam{
learning_rate:0.
01
learning_rate_decay:0.8
step_size:1
000
}
num_epoch:10
batch_size:
5
context:cpu
optimizer:adam{
learning_rate:0.01
learning_rate
_decay
:0.
8
step_size:1000
weight_decay:0.
000
1
}
}
src/test/resources/models/MultipleOutputs.emadl
View file @
5196adbc
component MultipleOutputs{
ports in
Q(-oo:+oo)^{10,1,1
} data,
out Q(0:1)^{
4
} pred[2];
ports in
Z(0:255)^{3, 32, 32
} data,
out Q(0:1)^{
10
} pred[2];
implementation CNN {
data ->
FullyConnected(units=128, no_bias=true) ->
Tanh() ->
(
FullyConnected(units=16, no_bias=true) ->
Tanh() ->
FullyConnected(units=4, no_bias=true)
|
FullyConnected(units=16, no_bias=true) ->
Tanh() ->
FullyConnected(units=4, no_bias=true)
) ->
Convolution(kernel=(5,5), channels=8, padding="valid") ->
Convolution(kernel=(5,5), channels=8, padding="valid") ->
FullyConnected(units=128) ->
Dropout() ->
FullyConnected(units=10) ->
(
[0] ->
Softmax() ->
pred[0]
|
[1] ->
Softmax() ->
pred[1]
);
...
...
src/test/resources/models/MultipleOutputsOld.cnnt
0 → 100644
View file @
5196adbc
configuration MultipleOutputs{
num_epoch:10
batch_size:64
normalize:true
load_checkpoint:false
optimizer:adam{
learning_rate:0.01
learning_rate_decay:0.8
step_size:1000
}
}
src/test/resources/models/MultipleOutputsOld.emadl
0 → 100644
View file @
5196adbc
component MultipleOutputs{
ports in Q(-oo:+oo)^{10,1,1} data,
out Q(0:1)^{4} pred[2];
implementation CNN {
data ->
FullyConnected(units=128, no_bias=true) ->
Tanh() ->
(
FullyConnected(units=16, no_bias=true) ->
Tanh() ->
FullyConnected(units=4, no_bias=true)
|
FullyConnected(units=16, no_bias=true) ->
Tanh() ->
FullyConnected(units=4, no_bias=true)
) ->
(
[0] ->
Softmax() ->
pred[0]
|
[1] ->
Softmax() ->
pred[1]
);
}
}
\ No newline at end of file
src/test/resources/models/data_paths.txt
View file @
5196adbc
cifar10.CifarNetwork src/test/resources/training_data
simpleCifar10.CifarNetwork src/test/resources/training_data
cNNCalculator.Network src/test/resources/training_data
MultipleOutputs data/MultipleOutputs
cifar10.CifarNetwork src/test/resources/training_data/Cifar
simpleCifar10.CifarNetwork src/test/resources/training_data/Cifar
cNNCalculator.Network src/test/resources/training_data/Cifar
InstanceTest.NetworkB data/InstanceTest.NetworkB
Alexnet data/Alexnet
ThreeInputCNN_M14 data/ThreeInputCNN_M14
VGG16 data/VGG16
ResNeXt50 data/ResNeXt50
instanceTestCifar.CifarNetwork src/test/resources/training_data
instanceTestCifar.CifarNetwork src/test/resources/training_data
/Cifar
mnist.LeNetNetwork data/mnist.LeNetNetwork
MultipleInputs src/test/resources/training_data/MultipleInputs
\ No newline at end of file
MultipleInputs src/test/resources/training_data/MultipleInputs
MultipleOutputs src/test/resources/training_data/MultipleOutputs
\ No newline at end of file
src/test/resources/target_code/CNNCreator_cifar10_cifar10Classifier_net.py
View file @
5196adbc
...
...
@@ -18,7 +18,7 @@ class MyConstant(mx.init.Initializer):
class
CNNCreator_cifar10_cifar10Classifier_net
:
module
=
None
_data_dir_
=
"src/test/resources/training_data/"
_data_dir_
=
"src/test/resources/training_data/
Cifar/
"
_model_dir_
=
"model/cifar10.CifarNetwork/"
_model_prefix_
=
"model"
_input_names_
=
[
'data'
]
...
...
src/test/resources/training_data/test.h5
→
src/test/resources/training_data/
Cifar/
test.h5
View file @
5196adbc
File moved
src/test/resources/training_data/test_lmdb/data.mdb
→
src/test/resources/training_data/
Cifar/
test_lmdb/data.mdb
View file @
5196adbc
File moved
src/test/resources/training_data/test_lmdb/lock.mdb
→
src/test/resources/training_data/
Cifar/
test_lmdb/lock.mdb
View file @
5196adbc
File moved
src/test/resources/training_data/train.h5
→
src/test/resources/training_data/
Cifar/
train.h5
View file @
5196adbc
File moved
src/test/resources/training_data/train_lmdb/data.mdb
→
src/test/resources/training_data/
Cifar/
train_lmdb/data.mdb
View file @
5196adbc
File moved
src/test/resources/training_data/train_lmdb/lock.mdb
→
src/test/resources/training_data/
Cifar/
train_lmdb/lock.mdb
View file @
5196adbc
File moved
src/test/resources/training_data/MultipleOutputs/test.h5
0 → 100644
View file @
5196adbc
File added
src/test/resources/training_data/MultipleOutputs/train.h5
0 → 100644
View file @
5196adbc
File added
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