Commit efcd6240 authored by Sebastian Nickels's avatar Sebastian Nickels
Browse files

Updated for multiple instructions change

parent 16023357
Pipeline #142941 failed with stages
in 42 seconds
...@@ -8,18 +8,18 @@ ...@@ -8,18 +8,18 @@
<groupId>de.monticore.lang.monticar</groupId> <groupId>de.monticore.lang.monticar</groupId>
<artifactId>embedded-montiarc-emadl-generator</artifactId> <artifactId>embedded-montiarc-emadl-generator</artifactId>
<version>0.3.0</version> <version>0.3.0-SNAPSHOT</version>
<!-- == PROJECT DEPENDENCIES ============================================= --> <!-- == PROJECT DEPENDENCIES ============================================= -->
<properties> <properties>
<!-- .. SE-Libraries .................................................. --> <!-- .. SE-Libraries .................................................. -->
<emadl.version>0.2.6</emadl.version> <emadl.version>0.2.7-SNAPSHOT</emadl.version>
<CNNTrain.version>0.2.6</CNNTrain.version> <CNNTrain.version>0.3.0-SNAPSHOT</CNNTrain.version>
<cnnarch-mxnet-generator.version>0.2.14-SNAPSHOT</cnnarch-mxnet-generator.version> <cnnarch-mxnet-generator.version>0.2.14-SNAPSHOT</cnnarch-mxnet-generator.version>
<cnnarch-caffe2-generator.version>0.2.11-SNAPSHOT</cnnarch-caffe2-generator.version> <cnnarch-caffe2-generator.version>0.2.11-SNAPSHOT</cnnarch-caffe2-generator.version>
<cnnarch-gluon-generator.version>0.1.6</cnnarch-gluon-generator.version> <cnnarch-gluon-generator.version>0.2.0-SNAPSHOT</cnnarch-gluon-generator.version>
<embedded-montiarc-math-opt-generator>0.1.4</embedded-montiarc-math-opt-generator> <embedded-montiarc-math-opt-generator>0.1.4</embedded-montiarc-math-opt-generator>
<!-- .. Libraries .................................................. --> <!-- .. Libraries .................................................. -->
......
...@@ -41,7 +41,7 @@ component Alexnet{ ...@@ -41,7 +41,7 @@ component Alexnet{
fc(->=2) -> fc(->=2) ->
FullyConnected(units=1000) -> FullyConnected(units=1000) ->
Softmax() -> Softmax() ->
predictions predictions;
} }
} }
\ No newline at end of file
...@@ -18,7 +18,7 @@ component NetworkB<Z classes = 10> (Z convChannels){ ...@@ -18,7 +18,7 @@ component NetworkB<Z classes = 10> (Z convChannels){
Dropout() -> Dropout() ->
FullyConnected(units=classes) -> FullyConnected(units=classes) ->
Softmax() -> Softmax() ->
predictions predictions;
} }
} }
\ No newline at end of file
...@@ -27,6 +27,6 @@ component InvalidLayerInput{ ...@@ -27,6 +27,6 @@ component InvalidLayerInput{
fc() -> fc() ->
FullyConnected(units=1000) -> FullyConnected(units=1000) ->
Softmax() -> Softmax() ->
predictions predictions;
} }
} }
\ No newline at end of file
...@@ -24,6 +24,6 @@ component MultipleOutputs{ ...@@ -24,6 +24,6 @@ component MultipleOutputs{
[1] -> [1] ->
Softmax() -> Softmax() ->
pred[1] pred[1]
) );
} }
} }
\ No newline at end of file
...@@ -40,6 +40,6 @@ component ResNeXt50{ ...@@ -40,6 +40,6 @@ component ResNeXt50{
GlobalPooling(pool_type="avg") -> GlobalPooling(pool_type="avg") ->
FullyConnected(units=1000) -> FullyConnected(units=1000) ->
Softmax() -> Softmax() ->
predictions predictions;
} }
} }
\ No newline at end of file
...@@ -34,6 +34,6 @@ component ResNet152{ ...@@ -34,6 +34,6 @@ component ResNet152{
GlobalPooling(pool_type="avg") -> GlobalPooling(pool_type="avg") ->
FullyConnected(units=1000) -> FullyConnected(units=1000) ->
Softmax() -> Softmax() ->
predictions predictions;
} }
} }
\ No newline at end of file
...@@ -32,6 +32,6 @@ component ResNet34{ ...@@ -32,6 +32,6 @@ component ResNet34{
GlobalPooling(pool_type="avg") -> GlobalPooling(pool_type="avg") ->
FullyConnected(units=1000) -> FullyConnected(units=1000) ->
Softmax() -> Softmax() ->
predictions predictions;
} }
} }
\ No newline at end of file
...@@ -24,7 +24,7 @@ component ThreeInputCNN_M14{ ...@@ -24,7 +24,7 @@ component ThreeInputCNN_M14{
Relu() -> Relu() ->
FullyConnected(units=10) -> FullyConnected(units=10) ->
Softmax() -> Softmax() ->
predictions predictions;
} }
} }
\ No newline at end of file
...@@ -29,6 +29,6 @@ component VGG16{ ...@@ -29,6 +29,6 @@ component VGG16{
fc() -> fc() ->
FullyConnected(units=1000) -> FullyConnected(units=1000) ->
Softmax() -> Softmax() ->
predictions predictions;
} }
} }
\ No newline at end of file
...@@ -14,7 +14,7 @@ component Network{ ...@@ -14,7 +14,7 @@ component Network{
Relu() -> Relu() ->
FullyConnected(units=10) -> FullyConnected(units=10) ->
Softmax() -> Softmax() ->
predictions predictions;
} }
} }
...@@ -34,7 +34,7 @@ component CifarNetwork<Z(2:oo) classes = 10>{ ...@@ -34,7 +34,7 @@ component CifarNetwork<Z(2:oo) classes = 10>{
Dropout()-> Dropout()->
FullyConnected(units=classes) -> FullyConnected(units=classes) ->
Softmax() -> Softmax() ->
softmax softmax;
} }
} }
\ No newline at end of file
...@@ -12,7 +12,7 @@ component CifarNetwork<Z(2:oo) classes = 10>{ ...@@ -12,7 +12,7 @@ component CifarNetwork<Z(2:oo) classes = 10>{
Dropout()-> Dropout()->
FullyConnected(units=classes) -> FullyConnected(units=classes) ->
Softmax() -> Softmax() ->
softmax softmax;
} }
} }
\ No newline at end of file
...@@ -14,7 +14,7 @@ component LeNetNetwork<Z(2:oo) classes = 10>{ ...@@ -14,7 +14,7 @@ component LeNetNetwork<Z(2:oo) classes = 10>{
Relu() -> Relu() ->
FullyConnected(units=classes) -> FullyConnected(units=classes) ->
Softmax() -> Softmax() ->
predictions predictions;
} }
} }
...@@ -12,7 +12,7 @@ component CifarNetwork<Z(2:oo) classes = 10>{ ...@@ -12,7 +12,7 @@ component CifarNetwork<Z(2:oo) classes = 10>{
Dropout()-> Dropout()->
FullyConnected(units=classes) -> FullyConnected(units=classes) ->
Softmax() -> Softmax() ->
softmax softmax;
} }
} }
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment