Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check disabled tests #3441

Merged
merged 21 commits into from
Dec 23, 2020
Merged

Check disabled tests #3441

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c5b8135
add 4 tests for operators based on model zoo
bszmelcz Nov 17, 2020
f4d1578
fix wrong names of the models
bszmelcz Nov 18, 2020
c6523fe
Merge remote-tracking branch 'upstream/master' into modelZooOps
bszmelcz Nov 18, 2020
7360f0b
add functional tests for equal, lstm_cell and psroi_pooling operators
bszmelcz Nov 23, 2020
f5554f3
Merge remote-tracking branch 'upstream/master' into EqualPSRO
bszmelcz Nov 23, 2020
45b1091
add functional tests for ConverLike and Mod operators
bszmelcz Nov 26, 2020
22c942d
Merge remote-tracking branch 'upstream/master' into FunctionalOpsHand
bszmelcz Nov 26, 2020
c743989
add funtional tests which were disabled, and add a minor change in co…
bszmelcz Dec 1, 2020
ea4948e
Merge remote-tracking branch 'upstream/master' into checkDisabledTests
bszmelcz Dec 1, 2020
e12a58e
back to the previous .xml model
bszmelcz Dec 2, 2020
4966f6c
Merge remote-tracking branch 'upstream/master' into checkDisabledTests
bszmelcz Dec 2, 2020
cb72af0
made a changes in ir_layer_parsers.cpp in order to make logicalNot pa…
bszmelcz Dec 4, 2020
b599780
Merge remote-tracking branch 'upstream/master' into checkDisabledTests
bszmelcz Dec 4, 2020
df7e2c2
minor fixes to LogicalNot operator in ie_layers_parsers.cpp
bszmelcz Dec 7, 2020
3bdd81f
cahnge friendly name to "not"
bszmelcz Dec 7, 2020
e029ff0
rename friendly name to "not"
bszmelcz Dec 7, 2020
ab27908
add if statement for Activation type
bszmelcz Dec 11, 2020
7a1e7ef
resolve conflicts
bszmelcz Dec 11, 2020
5991797
Merge remote-tracking branch 'upstream/master' into checkDisabledTests
bszmelcz Dec 16, 2020
0349ce7
Merge remote-tracking branch 'upstream/master' into checkDisabledTests
bszmelcz Dec 17, 2020
6c1b03a
fix style
bszmelcz Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion inference-engine/src/legacy_api/src/convert_function_to_cnn_network.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ InferenceEngine::details::CNNLayerCreator::CNNLayerCreator(const std::shared_ptr
LayerParams attrs = {node->get_friendly_name(), "Activation",
details::convertPrecision(node->get_output_element_type(0))};
auto res = std::make_shared<InferenceEngine::CNNLayer>(attrs);
res->params["type"] = "not";
res->type = "not";
ilyachur marked this conversation as resolved.
Show resolved Hide resolved
return res;
});

Expand Down
2 changes: 1 addition & 1 deletion inference-engine/tests/functional/inference_engine/ngraph_reader/greater_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ TEST_F(NGraphReaderTests, DISABLED_ReadGreaterNetwork) {
compareIRs(model, modelV5, 3211264);
}

TEST_F(NGraphReaderTests, DISABLED_ReadGreaterEqualNetwork) {
TEST_F(NGraphReaderTests, ReadGreaterEqualNetwork) {
std::string model = R"V0G0N(
<net name="Network" version="10">
<layers>
Expand Down
2 changes: 1 addition & 1 deletion inference-engine/tests/functional/inference_engine/ngraph_reader/less_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ TEST_F(NGraphReaderTests, DISABLED_ReadLessNetwork) {
compareIRs(model, modelV5, 3211264);
}

TEST_F(NGraphReaderTests, DISABLED_ReadLessEqualNetwork) {
TEST_F(NGraphReaderTests, ReadLessEqualNetwork) {
std::string model = R"V0G0N(
<net name="Network" version="10">
<layers>
Expand Down
2 changes: 1 addition & 1 deletion inference-engine/tests/functional/inference_engine/ngraph_reader/logical_and_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <string>
#include "ngraph_reader_tests.hpp"
TEST_F(NGraphReaderTests, DISABLED_ReadLogicalAndNetwork) {
TEST_F(NGraphReaderTests, ReadLogicalAndNetwork) {
std::string model = R"V0G0N(
<net name="Network" version="10">
<layers>
Expand Down
154 changes: 70 additions & 84 deletions inference-engine/tests/functional/inference_engine/ngraph_reader/logical_not_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,94 +4,80 @@

#include <string>
#include "ngraph_reader_tests.hpp"
TEST_F(NGraphReaderTests, DISABLED_ReadLogicalNotNetwork) {
TEST_F(NGraphReaderTests, ReadLogicalNotNetwork) {
std::string model = R"V0G0N(
<net name="Network" version="10">
bszmelcz marked this conversation as resolved.
Show resolved Hide resolved
<layers>
<layer name="in1" type="Parameter" id="0" version="opset1">
<data element_type="boolean" shape="1,3,22,22"/>
<output>
<port id="0" precision="BOOL">
<dim>1</dim>
<dim>3</dim>
<dim>22</dim>
<dim>22</dim>
</port>
</output>
</layer>
<layer name="LogicalNot" id="1" type="LogicalNot" version="opset1">
<input>
<port id="0" precision="BOOL">
<dim>1</dim>
<dim>3</dim>
<dim>22</dim>
<dim>22</dim>
</port>
</input>
<output>
<port id="2" precision="BOOL">
<dim>1</dim>
<dim>3</dim>
<dim>22</dim>
<dim>22</dim>
</port>
</output>
</layer>
<layer name="output" type="Result" id="2" version="opset1">
<input>
<port id="0" precision="BOOL">
<dim>1</dim>
<dim>3</dim>
<dim>22</dim>
<dim>22</dim>
</port>
</input>
</layer>
</layers>
<edges>
<edge from-layer="0" from-port="0" to-layer="1" to-port="0"/>
<edge from-layer="1" from-port="2" to-layer="2" to-port="0"/>
</edges>
<net name="LogicalNot" version="10">
<layers>
<layer id="0" name="input_a" type="Parameter" version="opset1">
<data shape="256,56" element_type="boolean"/>
<output>
<port id="0" precision="BOOL">
<dim>256</dim>
<dim>56</dim>
</port>
</output>
</layer>
<layer id="1" name="LogicalNot" type="LogicalNot" version="opset1">
<input>
<port id="0">
<dim>256</dim>
<dim>56</dim>
</port>
</input>
<output>
<port id="1" precision="BOOL">
<dim>256</dim>
<dim>56</dim>
</port>
</output>
</layer>
<layer id="2" name="Identity/sink_port_0" type="Result" version="opset1">
<input>
<port id="0">
<dim>256</dim>
<dim>56</dim>
</port>
</input>
</layer>
</layers>
<edges>
<edge from-layer="0" from-port="0" to-layer="1" to-port="0"/>
<edge from-layer="1" from-port="1" to-layer="2" to-port="0"/>
</edges>
</net>
)V0G0N";
std::string modelV5 = R"V0G0N(
<net name="Network" version="5" precision="BOOL" batch="1">
<layers>
<layer name="in1" type="Input" precision="BOOL" id="0">
<output>
<port id="0">
<dim>1</dim>
<dim>3</dim>
<dim>22</dim>
<dim>22</dim>
</port>
</output>
</layer>
<layer name="LogicalNot" id="1" type="Activation" precision="BOOL">
<data type="not"/>
<input>
<port id="0">
<dim>1</dim>
<dim>3</dim>
<dim>22</dim>
<dim>22</dim>
</port>
</input>
<output>
<port id="2">
<dim>1</dim>
<dim>3</dim>
<dim>22</dim>
<dim>22</dim>
</port>
</output>
</layer>
</layers>
<edges>
<edge from-layer="0" from-port="0" to-layer="1" to-port="0"/>
</edges>
std::string modelV7 = R"V0G0N(
<net name="LogicalNot" version="7">
<layers>
<layer id="0" name="input_a" type="Input" version="opset1">
<output>
<port id="0" precision="BOOL">
<dim>256</dim>
<dim>56</dim>
</port>
</output>
</layer>
<layer id="1" name="LogicalNot" type="Activation" version="opset1">
<data type="not"/>
<input>
<port id="0">
<dim>256</dim>
<dim>56</dim>
</port>
</input>
<output>
<port id="1" precision="BOOL">
<dim>256</dim>
<dim>56</dim>
</port>
</output>
</layer>
</layers>
<edges>
<edge from-layer="0" from-port="0" to-layer="1" to-port="0"/>
</edges>
</net>
)V0G0N";

compareIRs(model, modelV5, 0);
compareIRs(model, modelV7);
}
2 changes: 1 addition & 1 deletion inference-engine/tests/functional/inference_engine/ngraph_reader/logical_or_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <string>
#include "ngraph_reader_tests.hpp"
TEST_F(NGraphReaderTests, DISABLED_ReadLogicalOrNetwork) {
TEST_F(NGraphReaderTests, ReadLogicalOrNetwork) {
std::string model = R"V0G0N(
<net name="Network" version="10">
<layers>
Expand Down
2 changes: 1 addition & 1 deletion inference-engine/tests/functional/inference_engine/ngraph_reader/logical_xor_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <string>
#include "ngraph_reader_tests.hpp"
TEST_F(NGraphReaderTests, DISABLED_ReadLogicalXorNetwork) {
TEST_F(NGraphReaderTests, ReadLogicalXorNetwork) {
std::string model = R"V0G0N(
<net name="Network" version="10">
<layers>
Expand Down
2 changes: 1 addition & 1 deletion ...rence-engine/tests/functional/inference_engine/ngraph_reader/reduce_logical_and_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <string>
#include "ngraph_reader_tests.hpp"
TEST_F(NGraphReaderTests, DISABLED_ReadReduceLogicalAndNetwork) {
TEST_F(NGraphReaderTests, ReadReduceLogicalAndNetwork) {
std::string model = R"V0G0N(
<net name="Network" version="10">
<layers>
Expand Down
2 changes: 1 addition & 1 deletion inference-engine/tests/functional/inference_engine/ngraph_reader/reduce_logical_or_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <string>
#include "ngraph_reader_tests.hpp"
TEST_F(NGraphReaderTests, DISABLED_ReadReduceLogicalOrNetwork) {
TEST_F(NGraphReaderTests, ReadReduceLogicalOrNetwork) {
std::string model = R"V0G0N(
<net name="Network" version="10">
<layers>
Expand Down