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

[IE][VPU][TESTS]: Fix myriad tests on MacOS (#3681)

Browse Source 
* fix sorting ref for myriadTestsTopK_smoke on macOS and chenged dynamic_pointer_cast to ngraph::is_type at dynamic_to_static_shape_squeeze.cpp
* disable accuracy/myriadLayersTestsExpGenerateProposals_smoke.ExpGenerateProposals tests for macOS
This commit is contained in:
Polina Brzezinskaya 2020-12-30 12:37:07 +03:00 committed by GitHub
parent 4fa7575d2e
commit 0850479b54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inference-engine/src/vpu/common/src/ngraph/transformations/dynamic_to_static_shape_squeeze.cpp
View File

@ -24,7 +24,7 @@ void dynamicToStaticShapeSqueeze(std::shared_ptr<ngraph::Node> target) {
target, ngraph::opset3::Squeeze::type_info); target, ngraph::opset3::Squeeze::type_info);
const auto dsr = target->input_value(0).get_node_shared_ptr(); const auto dsr = target->input_value(0).get_node_shared_ptr();
VPU_THROW_UNLESS(std::dynamic_pointer_cast<ngraph::vpu::op::DynamicShapeResolver>(dsr), VPU_THROW_UNLESS(ngraph::is_type<ngraph::vpu::op::DynamicShapeResolver>(dsr),
"DynamicToStaticShape transformation for {} of type {} expects {} as input with index {}", "DynamicToStaticShape transformation for {} of type {} expects {} as input with index {}",
target->get_friendly_name(), target->get_type_info(), ngraph::vpu::op::DynamicShapeResolver::type_info, 0); target->get_friendly_name(), target->get_type_info(), ngraph::vpu::op::DynamicShapeResolver::type_info, 0);

4
inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_generateproposals_test.hpp
View File

@ -140,7 +140,11 @@ static void genInputs(InferenceEngine::BlobMap inputMap,
inputIMinfo[1] = PrecisionUtils::f32tof16( (float) imgW ); inputIMinfo[1] = PrecisionUtils::f32tof16( (float) imgW );
} }
#ifdef __APPLE__
TEST_P(myriadLayersTestsExpGenerateProposals_smoke, DISABLED_ExpGenerateProposals) {
#else
TEST_P(myriadLayersTestsExpGenerateProposals_smoke, ExpGenerateProposals) { TEST_P(myriadLayersTestsExpGenerateProposals_smoke, ExpGenerateProposals) {
#endif
tensor_test_params scoresDims = std::get<0>(GetParam()); tensor_test_params scoresDims = std::get<0>(GetParam());
std::vector<int> im_info = std::get<1>(GetParam()); std::vector<int> im_info = std::get<1>(GetParam());
GenerateProposalsParam opParams = std::get<2>(GetParam()); GenerateProposalsParam opParams = std::get<2>(GetParam());

5
inference-engine/tests_deprecated/functional/vpu/vpu_base/myriad_layers_reference_functions.cpp
View File

@ -1255,10 +1255,7 @@ namespace topk_impl {
typedef std::function<bool(const Pair&, const Pair&)> CompareFunction; typedef std::function<bool(const Pair&, const Pair&)> CompareFunction;
bool compareIndices(const Pair& a, const Pair& b) { bool compareIndices(const Pair& a, const Pair& b) {
if (a.second < b.second) return true; return (a.second < b.second);
if (a.second > b.second) return false;
return true; // shouldn't occur since all indices are different
} }
bool compareValuesMax(const Pair& a, const Pair& b) { bool compareValuesMax(const Pair& a, const Pair& b) {