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

[IE TESTS][CONFORMANCE] Fix for IRs with dynamic shapes (#10880)

Browse Source
This commit is contained in:
Irina Efode 2022-03-11 19:17:53 +03:00 committed by GitHub
parent eebe8c70f9
commit 7790f2036f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/tests/functional/plugin/conformance/test_runner/conformance_infra/src/read_ir_test/read_ir.cpp
View File

@ -161,28 +161,55 @@ void ReadIRTest::SetUp() {
} }
} }
} }
bool hasDynamic = false;
for (const auto& param : function->get_parameters()) {
if (param->get_partial_shape().is_dynamic()) {
hasDynamic = true;
break;
}
}
if (hasDynamic && ov::test::subgraph::shapeMode == ov::test::subgraph::ShapeMode::STATIC) {
GTEST_SKIP() << "Dynamic cases are skipped according `shape_mode`";
} else if (!hasDynamic && ov::test::subgraph::shapeMode == ov::test::subgraph::ShapeMode::DYNAMIC) {
GTEST_SKIP() << "Static cases are skipped according `shape_mode`";
}
std::vector<InputShape> inputShapes; std::vector<InputShape> inputShapes;
for (const auto& param : function -> get_parameters()) { for (const auto& param : function -> get_parameters()) {
if (param->get_partial_shape().is_static()) { if (param->get_partial_shape().is_static()) {
if (ov::test::subgraph::shapeMode == ov::test::subgraph::ShapeMode::DYNAMIC) {
GTEST_SKIP() << "Static cases are skipped according `shape_mode`";
}
inputShapes.push_back(InputShape{{}, {param->get_shape()}}); inputShapes.push_back(InputShape{{}, {param->get_shape()}});
} else { } else {
if (ov::test::subgraph::shapeMode == ov::test::subgraph::ShapeMode::STATIC) { std::vector<ov::Shape> staticShapes = { param->get_partial_shape().get_min_shape(),
GTEST_SKIP() << "Dynamic cases are skipped according `shape_mode`"; param->get_partial_shape().get_min_shape(),
} param->get_partial_shape().get_max_shape() };
ov::Shape midShape; ov::Shape midShape;
for (const auto s : param->get_partial_shape()) { for (const auto s : param->get_partial_shape()) {
int dimValue = s.get_length(); int dimValue = 1;
if (s.is_dynamic()) { if (s.is_dynamic()) {
CommonTestUtils::fill_data_random(&dimValue, 1, s.get_max_length() - s.get_min_length(), s.get_min_length(), 1); size_t range = s.get_max_length() - s.get_min_length();
if (range > std::numeric_limits<char>::max()) {
CommonTestUtils::fill_data_random(&range, 1, std::numeric_limits<char>::max(), s.get_min_length(), 1);
}
CommonTestUtils::fill_data_random(&dimValue, 1, range, s.get_min_length(), 1);
} else {
dimValue = s.get_length();
} }
midShape.push_back(dimValue); midShape.push_back(dimValue);
} }
inputShapes.push_back(InputShape{param->get_partial_shape(), { param->get_partial_shape().get_min_shape(), staticShapes[1] = midShape;
param->get_partial_shape().get_max_shape(),
midShape }}); // Shape validation to avoid large values
for (auto& shape : staticShapes) {
for (auto& dim : shape) {
if (dim == 0) {
dim = 1;
} else if (dim > std::numeric_limits<char>::max()) {
dim = std::numeric_limits<char>::max();
}
}
}
inputShapes.push_back(InputShape{param->get_partial_shape(), staticShapes});
} }
} }
init_input_shapes(inputShapes); init_input_shapes(inputShapes);