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

[CONFORMANCE][IE TESTS] Remove w/a with using Convert (#19748)

Browse Source
This commit is contained in:
Irina Efode 2023-09-14 19:01:17 +04:00 committed by GitHub
parent 7445a9c77b
commit c979ece791
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/src/read_ir/read_ir_tests.cpp
View File

@ -45,8 +45,8 @@ TEST_P(ReadIRTest, ImportExport) {
INSTANTIATE_TEST_SUITE_P(conformance_subgraph,
ReadIRTest,
::testing::Combine(::testing::ValuesIn(getModelPaths(IRFolderPaths)),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
::testing::Values(targetDevice),
::testing::Values(pluginConfig)),
ReadIRTest::getTestCaseName);
} // namespace

7
src/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp
View File

@ -233,13 +233,6 @@ void SubgraphBaseTest::generate_inputs(const std::vector<ov::Shape>& targetInput
for (size_t i = 0; i < param->get_output_size(); i++) {
for (const auto &node : param->get_output_target_inputs(i)) {
std::shared_ptr<ov::Node> nodePtr = node.get_node()->shared_from_this();
if (std::dynamic_pointer_cast<ov::op::v0::Convert>(nodePtr)) {
std::shared_ptr<ov::Node> nextNodePtr = nodePtr->get_output_target_inputs(0).begin()->get_node()->shared_from_this();
if (!ngraph::is_type<ov::op::v0::Result>(nextNodePtr)) {
inputNode = nodePtr;
nodePtr = nextNodePtr;
}
}
auto it = inputMap.find(nodePtr->get_type_info());
ASSERT_NE(it, inputMap.end());
for (size_t port = 0; port < nodePtr->get_input_size(); ++port) {

4
src/tests/test_utils/functional_test_utils/layer_tests_summary/rename_conformance_ir.py
View File

@ -8,7 +8,7 @@ from dataclasses import dataclass
from pathlib import Path
from hashlib import sha256
from utils.conformance_utils import get_logger, set_env_variable
from utils.constants import PY_OPENVINO, LD_LIB_PATH_NAME, PYTHON_NAME, REL_WEIGHTS_FILENAME, REL_WEIGHTS_REPLACE_STR, CONVERT_OP_NAME
from utils.constants import PY_OPENVINO, LD_LIB_PATH_NAME, PYTHON_NAME, REL_WEIGHTS_FILENAME, REL_WEIGHTS_REPLACE_STR
from utils.file_utils import get_ov_path, find_latest_dir
import defusedxml.ElementTree as ET
@ -91,7 +91,7 @@ def update_rel_weight(meta_info_file:Path, additional_value: float):
logger.error(f"Meta info {meta_info_file} is incorrect!")
def is_report_op(op_name:str):
if "Parameter-1" == op_name or "Result-1" == op_name or "Constant-1" == op_name or CONVERT_OP_NAME == op_name:
if "Parameter-1" == op_name or "Result-1" == op_name or "Constant-1" == op_name:
return False
return True

2
src/tests/test_utils/functional_test_utils/layer_tests_summary/utils/constants.py
View File

@ -51,8 +51,6 @@ NOT_EXIST_DEVICE = "NOT_EXIST_DEVICE"
MEM_USAGE = "MEM_USAGE="
CONVERT_OP_NAME = "Convert-1"
META_EXTENSION = ".meta"
XML_EXTENSION = ".xml"
BIN_EXTENSION = ".bin"

19
src/tests/test_utils/functional_test_utils/src/summary/op_summary.cpp
View File

@ -139,19 +139,14 @@ void OpSummary::updateOPsStats(const std::shared_ptr<ov::Model>& model, const Pa
if (model->get_parameters().empty()) {
return;
}
bool isFunctionalGraph = false, isReportConvert = true;
for (const auto& op : model->get_ordered_ops()) {
bool isFunctionalGraph = false;
for (const auto &op : model->get_ordered_ops()) {
if (!std::dynamic_pointer_cast<ov::op::v0::Parameter>(op) &&
!std::dynamic_pointer_cast<ov::op::v0::Constant>(op) &&
!std::dynamic_pointer_cast<ov::op::v0::Result>(op)) {
// find all features
if (!std::dynamic_pointer_cast<ov::op::v0::Convert>(op)) {
isReportConvert = false;
}
isFunctionalGraph = true;
if (!isReportConvert && isFunctionalGraph) {
break;
}
break;
}
}
@ -162,14 +157,6 @@ void OpSummary::updateOPsStats(const std::shared_ptr<ov::Model>& model, const Pa
isFunctionalGraph) {
continue;
}
// todo: remove w/a to provide correct convert reporting after merge CVS-110714
if (std::dynamic_pointer_cast<ov::op::v0::Convert>(op)) {
if (!isReportConvert) {
continue;
} else {
isReportConvert = false;
}
}
if (extractBody) {
if (std::dynamic_pointer_cast<ov::op::v0::TensorIterator>(op)) {
updateOPsStats(op->get_type_info(), status, k);