natas_hw
/
openvino
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added additional check for friendly names (#5586) 

* Added additional check for friendly names

* Fixed Functional tests
This commit is contained in:
Ilya Churaev 2021-05-13 23:20:53 +03:00 committed by GitHub
parent 4bc98766ed
commit 6e6e4b7c3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 140 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
inference-engine/src/inference_engine/cnn_network_ngraph_impl.cpp
View File

@ -94,6 +94,28 @@ void CNNNetworkNGraphImpl::createDataForResult(const ::ngraph::Output<::ngraph::
}
}
void CNNNetworkNGraphImpl::validateFunctionNames() const {
// nGraph function parameters and pre-Results operations should have unique names
std::unordered_set<std::string> unique_names;
for (const auto& param : _ngraph_function->get_parameters()) {
if (unique_names.count(param->get_friendly_name())) {
IE_THROW() << "Function contains several inputs with one friendly name!";
}
unique_names.insert(param->get_friendly_name());
}
for (const auto& result : _ngraph_function->get_results()) {
const auto& parent = result->get_input_node_shared_ptr(0);
auto name = parent->get_friendly_name();
if (parent->get_output_size() > 1) {
name += "." + std::to_string(result->get_input_source_output(0).get_index());
}
if (unique_names.count(name) && !ngraph::op::is_parameter(parent)) {
IE_THROW() << "Function contains several inputs and outputs with one friendly name!";
}
unique_names.insert(name);
}
}
CNNNetworkNGraphImpl::CNNNetworkNGraphImpl(
const std::shared_ptr<Function>& nGraph,
const std::vector<IExtensionPtr>& exts)
@ -113,6 +135,8 @@ CNNNetworkNGraphImpl::CNNNetworkNGraphImpl(
network.setInputInfo(info);
};
validateFunctionNames();
reshape();
for (const auto& layer : _ngraph_function->get_parameters()) {
std::string outName = layer->get_friendly_name();
@ -148,6 +172,7 @@ CNNNetworkNGraphImpl::CNNNetworkNGraphImpl(const CNNNetwork& network) {
}
_ngraph_function = copyFunction(network.getFunction(), false);
validateFunctionNames();
InputsDataMap inputs = network.getInputsInfo();
OutputsDataMap outputs = network.getOutputsInfo();
@ -231,6 +256,13 @@ StatusCode CNNNetworkNGraphImpl::addOutput(const std::string& layerName, size_t
auto result = make_shared<::ngraph::op::Result>(layer->output(outputIndex));
result->set_friendly_name(outputName);
_ngraph_function->add_results({result});
// Check that we cannot add Result to layer with non unique friendly name
try {
validateFunctionNames();
} catch (...) {
_ngraph_function->remove_result(result);
throw;
}
if (_outputData.count(outputName) == 0) {
reshape();

1
inference-engine/src/inference_engine/cnn_network_ngraph_impl.hpp
View File

@ -105,6 +105,7 @@ private:
*/
void reshape();
void reshape(const std::map<std::string, std::vector<size_t>>& inputShapes);
void validateFunctionNames() const;
};
} // namespace details
} // namespace InferenceEngine

106
inference-engine/tests/functional/inference_engine/cnn_network/cnn_ngraph_impl_tests.cpp
View File

@ -1678,4 +1678,110 @@ TEST(CNNNGraphImplTests, SaveOriginalResultNameForMultiOutputOpOpset6) {
ASSERT_NE(outputs.find("text_features"), outputs.end());
}
}
TEST(CNNNGraphImplTests, CheckUniqueNames) {
std::shared_ptr<ngraph::Function> f;
{
auto boxes = std::make_shared<ngraph::opset5::Parameter>(ngraph::element::f32, ngraph::Shape{1, 1000, 4});
boxes->set_friendly_name("boxes");
auto scores = std::make_shared<ngraph::opset5::Parameter>(ngraph::element::f32, ngraph::Shape{1, 1, 1000});
scores->set_friendly_name("scores");
auto max_output_boxes_per_class = ngraph::opset5::Constant::create(ngraph::element::i64, ngraph::Shape{}, {10});
auto iou_threshold = ngraph::opset5::Constant::create(ngraph::element::f32, ngraph::Shape{}, {0.75});
auto score_threshold = ngraph::opset5::Constant::create(ngraph::element::f32, ngraph::Shape{}, {0.7});
auto nms = std::make_shared<ngraph::opset5::NonMaxSuppression>(boxes, scores, max_output_boxes_per_class, iou_threshold, score_threshold,
ngraph::opset5::NonMaxSuppression::BoxEncodingType::CORNER, true);
auto result1 = std::make_shared<ngraph::opset5::Result>(nms->output(0));
result1->set_friendly_name("result1");
auto result2 = std::make_shared<ngraph::opset5::Result>(nms->output(1));
result2->set_friendly_name("result2");
auto result3 = std::make_shared<ngraph::opset5::Result>(nms->output(2));
result3->set_friendly_name("result3");
nms->set_friendly_name("nms");
f = std::make_shared<ngraph::Function>(ngraph::ResultVector{result1, result2, result3}, ngraph::ParameterVector{boxes, scores});
}
ASSERT_NO_THROW(InferenceEngine::CNNNetwork{f});
}
TEST(CNNNGraphImplTests, CheckNonUniqueParameterName) {
std::shared_ptr<ngraph::Function> f;
{
auto boxes = std::make_shared<ngraph::opset5::Parameter>(ngraph::element::f32, ngraph::Shape{1, 1000, 4});
boxes->set_friendly_name("boxes");
auto scores = std::make_shared<ngraph::opset5::Parameter>(ngraph::element::f32, ngraph::Shape{1, 1, 1000});
scores->set_friendly_name("boxes");
auto max_output_boxes_per_class = ngraph::opset5::Constant::create(ngraph::element::i64, ngraph::Shape{}, {10});
auto iou_threshold = ngraph::opset5::Constant::create(ngraph::element::f32, ngraph::Shape{}, {0.75});
auto score_threshold = ngraph::opset5::Constant::create(ngraph::element::f32, ngraph::Shape{}, {0.7});
auto nms = std::make_shared<ngraph::opset5::NonMaxSuppression>(boxes, scores, max_output_boxes_per_class, iou_threshold, score_threshold,
ngraph::opset5::NonMaxSuppression::BoxEncodingType::CORNER, true);
auto result1 = std::make_shared<ngraph::opset5::Result>(nms->output(0));
result1->set_friendly_name("result1");
auto result2 = std::make_shared<ngraph::opset5::Result>(nms->output(1));
result2->set_friendly_name("result2");
auto result3 = std::make_shared<ngraph::opset5::Result>(nms->output(2));
result3->set_friendly_name("result3");
nms->set_friendly_name("nms");
f = std::make_shared<ngraph::Function>(ngraph::ResultVector{result1, result2, result3}, ngraph::ParameterVector{boxes, scores});
}
ASSERT_THROW(InferenceEngine::CNNNetwork{f}, InferenceEngine::Exception);
}
TEST(CNNNGraphImplTests, CheckNonUniqueResultName) {
std::shared_ptr<ngraph::Function> f;
{
auto boxes = std::make_shared<ngraph::opset5::Parameter>(ngraph::element::f32, ngraph::Shape{1, 1000, 4});
boxes->set_friendly_name("nms.1");
auto scores = std::make_shared<ngraph::opset5::Parameter>(ngraph::element::f32, ngraph::Shape{1, 1, 1000});
scores->set_friendly_name("scores");
auto max_output_boxes_per_class = ngraph::opset5::Constant::create(ngraph::element::i64, ngraph::Shape{}, {10});
auto iou_threshold = ngraph::opset5::Constant::create(ngraph::element::f32, ngraph::Shape{}, {0.75});
auto score_threshold = ngraph::opset5::Constant::create(ngraph::element::f32, ngraph::Shape{}, {0.7});
auto nms = std::make_shared<ngraph::opset5::NonMaxSuppression>(boxes, scores, max_output_boxes_per_class, iou_threshold, score_threshold,
ngraph::opset5::NonMaxSuppression::BoxEncodingType::CORNER, true);
auto result1 = std::make_shared<ngraph::opset5::Result>(nms->output(0));
result1->set_friendly_name("result1");
auto result2 = std::make_shared<ngraph::opset5::Result>(nms->output(1));
result2->set_friendly_name("result2");
auto result3 = std::make_shared<ngraph::opset5::Result>(nms->output(2));
result3->set_friendly_name("result3");
nms->set_friendly_name("nms");
f = std::make_shared<ngraph::Function>(ngraph::ResultVector{result1, result2, result3}, ngraph::ParameterVector{boxes, scores});
}
ASSERT_THROW(InferenceEngine::CNNNetwork{f}, InferenceEngine::Exception);
}
TEST(CNNNGraphImplTests, CheckNonUniqueNewResultName) {
std::shared_ptr<ngraph::Function> f;
{
auto boxes = std::make_shared<ngraph::opset5::Parameter>(ngraph::element::f32, ngraph::Shape{1, 1000, 4});
boxes->set_friendly_name("nms.1");
auto scores = std::make_shared<ngraph::opset5::Parameter>(ngraph::element::f32, ngraph::Shape{1, 1, 1000});
scores->set_friendly_name("scores");
auto max_output_boxes_per_class = ngraph::opset5::Constant::create(ngraph::element::i64, ngraph::Shape{}, {10});
auto iou_threshold = ngraph::opset5::Constant::create(ngraph::element::f32, ngraph::Shape{}, {0.75});
auto score_threshold = ngraph::opset5::Constant::create(ngraph::element::f32, ngraph::Shape{}, {0.7});
auto nms = std::make_shared<ngraph::opset5::NonMaxSuppression>(boxes, scores, max_output_boxes_per_class, iou_threshold, score_threshold,
ngraph::opset5::NonMaxSuppression::BoxEncodingType::CORNER, true);
auto result1 = std::make_shared<ngraph::opset5::Result>(nms->output(0));
result1->set_friendly_name("result1");
auto result3 = std::make_shared<ngraph::opset5::Result>(nms->output(2));
result3->set_friendly_name("result3");
nms->set_friendly_name("nms");
f = std::make_shared<ngraph::Function>(ngraph::ResultVector{result1, result3}, ngraph::ParameterVector{boxes, scores});
}
CNNNetwork cnnNet;
ASSERT_NO_THROW(cnnNet = InferenceEngine::CNNNetwork{f});
ASSERT_THROW(cnnNet.addOutput("nms", 1), InferenceEngine::Exception);
}
IE_SUPPRESS_DEPRECATED_END

8
inference-engine/tests/functional/inference_engine/cnn_network/convert_ngraph_to_cnn_network_tests.cpp
View File

@ -355,13 +355,7 @@ TEST(ConvertFunctionToCNNNetworkTests, NonUniqueNamesNegative) {
f = std::make_shared<ngraph::Function>(ngraph::NodeVector{ss, begin, end}, ngraph::ParameterVector{input});
}
InferenceEngine::CNNNetwork nGraphImpl(f);
try {
InferenceEngine::details::convertFunctionToICNNNetwork(f, nGraphImpl);
FAIL() << "InferenceEngine::Exception must be thrown";
} catch(InferenceEngine::Exception & e) {
EXPECT_THAT(e.what(), testing::HasSubstr(std::string("Detected two output operations with the same name:")));
}
ASSERT_THROW(InferenceEngine::CNNNetwork{f}, InferenceEngine::Exception);
}
TEST(ConvertFunctionToCNNNetworkTests, NonUniqueNamesParametersNegative) {