Aufgrund einer Wartung wird GitLab am 18.01. zwischen 8:00 und 9:00 Uhr kurzzeitig nicht zur Verfügung stehen. / Due to maintenance, GitLab will be temporarily unavailable on 18.01. between 8:00 and 9:00 am.

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

Updated tests for multiple instructions

parent 8ed744e6
Pipeline #142938 failed with stages
in 5 minutes and 37 seconds
......@@ -44,7 +44,7 @@
<Embedded-MontiArc.version>0.1.9-SNAPSHOT</Embedded-MontiArc.version>
<Embedded-MontiArc-Math.version>0.1.9-SNAPSHOT</Embedded-MontiArc-Math.version>
<Embedded-MontiArc-Behaviour.version>0.0.16-SNAPSHOT</Embedded-MontiArc-Behaviour.version>
<CNNArch.version>0.2.9</CNNArch.version>
<CNNArch.version>0.3.0-SNAPSHOT</CNNArch.version>
<Math.version>0.0.19-SNAPSHOT</Math.version>
<MathOpt.version>0.1.1-SNAPSHOT</MathOpt.version>
<embedded-montiarc-dynamics.version>0.0.4-SNAPSHOT</embedded-montiarc-dynamics.version>
......
......@@ -63,8 +63,8 @@ public class InstanceTest extends AbstractSymtabTest {
arch1.resolve();
arch2.resolve();
int convChannels1 = ((LayerSymbol)((CompositeElementSymbol)arch1.getBody()).getElements().get(1)).getArgument("channels").get().getRhs().getIntValue().get();
int convChannels2 = ((LayerSymbol)((CompositeElementSymbol)arch2.getBody()).getElements().get(1)).getArgument("channels").get().getRhs().getIntValue().get();
int convChannels1 = ((LayerSymbol)arch1.getStreams().get(0).getElements().get(1)).getArgument("channels").get().getRhs().getIntValue().get();
int convChannels2 = ((LayerSymbol)arch2.getStreams().get(0).getElements().get(1)).getArgument("channels").get().getRhs().getIntValue().get();
assertEquals(20, convChannels1);
assertEquals(40, convChannels2);
......
......@@ -41,7 +41,7 @@ component Alexnet{
fc(->=2) ->
FullyConnected(units=1000) ->
Softmax() ->
predictions
predictions;
}
}
\ No newline at end of file
......@@ -18,7 +18,7 @@ component NetworkB<Z classes = 10> (Z convChannels){
Dropout() ->
FullyConnected(units=classes) ->
Softmax() ->
predictions
predictions;
}
}
\ No newline at end of file
......@@ -27,6 +27,6 @@ component InvalidLayerInput{
fc() ->
FullyConnected(units=1000) ->
Softmax() ->
predictions
predictions;
}
}
\ No newline at end of file
......@@ -24,6 +24,6 @@ component MultipleOutputs{
[1] ->
Softmax() ->
pred[1]
)
);
}
}
\ No newline at end of file
......@@ -40,6 +40,6 @@ component ResNeXt50{
GlobalPooling(pool_type="avg") ->
FullyConnected(units=1000) ->
Softmax() ->
predictions
predictions;
}
}
\ No newline at end of file
......@@ -34,6 +34,6 @@ component ResNet152{
GlobalPooling(pool_type="avg") ->
FullyConnected(units=1000) ->
Softmax() ->
predictions
predictions;
}
}
\ No newline at end of file
......@@ -32,6 +32,6 @@ component ResNet34{
GlobalPooling(pool_type="avg") ->
FullyConnected(units=1000) ->
Softmax() ->
predictions
predictions;
}
}
\ No newline at end of file
......@@ -24,7 +24,7 @@ component ThreeInputCNN_M14{
Relu() ->
FullyConnected(units=10) ->
Softmax() ->
predictions
predictions;
}
}
\ No newline at end of file
......@@ -29,6 +29,6 @@ component VGG16{
fc() ->
FullyConnected(units=1000) ->
Softmax() ->
predictions
predictions;
}
}
\ No newline at end of file
......@@ -34,7 +34,7 @@ component CifarNetwork<Z(2:oo) classes = 10>{
Dropout()->
FullyConnected(units=classes) ->
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