diff --git a/src/tests/functional/plugin/shared/include/single_layer_tests/op_impl_check/single_op_graph.hpp b/src/tests/functional/plugin/shared/include/single_layer_tests/op_impl_check/single_op_graph.hpp index d74c88fe6ff..e9ed04a7cfb 100644 --- a/src/tests/functional/plugin/shared/include/single_layer_tests/op_impl_check/single_op_graph.hpp +++ b/src/tests/functional/plugin/shared/include/single_layer_tests/op_impl_check/single_op_graph.hpp @@ -16,10 +16,12 @@ OpGenerator getOpGeneratorMap(); static const std::vector>> createFunctions() { std::vector>> res; - auto opsets = ov::test::utils::OpSummary::getInstance().getOpSets(); + auto opsets = ov::get_available_opsets(); auto opGenerator = getOpGeneratorMap(); std::set opsInfo; - for (const auto& opset : opsets) { + for (const auto& opset_pair : opsets) { + std::string opset_version = opset_pair.first; + const ov::OpSet& opset = opset_pair.second(); const auto &type_info_set = opset.get_type_info_set(); opsInfo.insert(type_info_set.begin(), type_info_set.end()); } diff --git a/src/tests/functional/plugin/shared/src/behavior/ov_plugin/caching_tests.cpp b/src/tests/functional/plugin/shared/src/behavior/ov_plugin/caching_tests.cpp index bc66ffe3887..5611d449d30 100644 --- a/src/tests/functional/plugin/shared/src/behavior/ov_plugin/caching_tests.cpp +++ b/src/tests/functional/plugin/shared/src/behavior/ov_plugin/caching_tests.cpp @@ -8,6 +8,8 @@ #include "behavior/ov_plugin/caching_tests.hpp" +#include "openvino/pass/manager.hpp" + #include "common_test_utils/file_utils.hpp" #include "functional_test_utils/skip_tests_config.hpp" #include "functional_test_utils/summary/api_summary.hpp" @@ -289,7 +291,7 @@ void CompileModelLoadFromFileTestBase::SetUp() { } m_cacheFolderName = ss.str(); core->set_property(ov::cache_dir()); - ngraph::pass::Manager manager; + ov::pass::Manager manager; manager.register_pass(m_modelName, m_weightsName); manager.run_passes(ngraph::builder::subgraph::makeConvPoolRelu( {1, 3, 227, 227}, InferenceEngine::details::convertPrecision(InferenceEngine::Precision::FP32))); @@ -372,7 +374,7 @@ void CompileModelLoadFromMemoryTestBase::SetUp() { } m_cacheFolderName = ss.str(); core->set_property(ov::cache_dir()); - ngraph::pass::Manager manager; + ov::pass::Manager manager; manager.register_pass(m_modelName, m_weightsName); manager.run_passes(ngraph::builder::subgraph::makeConvPoolRelu( {1, 3, 227, 227}, @@ -455,7 +457,7 @@ TEST_P(CompileModelLoadFromMemoryTestBase, CanLoadFromMemoryWithoutExecption) { } TEST_P(CompileModelLoadFromMemoryTestBase, CanLoadFromMemoryWithoutWeightsANdExecption) { - ngraph::pass::Manager manager; + ov::pass::Manager manager; std::shared_ptr model; { auto data = std::make_shared(ov::element::f32, ov::Shape{3, 1, 2}); diff --git a/src/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp b/src/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp index 6dff6e80e9b..32097c93e5b 100644 --- a/src/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp +++ b/src/tests/functional/shared_test_classes/src/base/ov_subgraph.cpp @@ -13,6 +13,7 @@ #include #endif +#include "openvino/pass/manager.hpp" #include "openvino/core/preprocess/pre_post_process.hpp" #include "openvino/pass/serialize.hpp" #include "transformations/convert_precision.hpp" diff --git a/src/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/summary/op_summary.hpp b/src/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/summary/op_summary.hpp index 5999f4cd566..065875b5b2e 100644 --- a/src/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/summary/op_summary.hpp +++ b/src/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/summary/op_summary.hpp @@ -6,6 +6,10 @@ #include "summary.hpp" +#include "openvino/opsets/opset.hpp" +#include "openvino/openvino.hpp" +#include "openvino/opsets/opset10.hpp" + namespace ov { namespace test { namespace utils { @@ -25,10 +29,9 @@ class OpSummary : public virtual Summary { private: static OpSummary *p_instance; static bool extractBody; - std::vector opsets; - std::map opsStats = {}; + std::map opsStats = {}; - std::string getOpVersion(const ngraph::NodeTypeInfo &type_info); + std::string getOpVersion(const ov::NodeTypeInfo &type_info); protected: OpSummary(); @@ -38,11 +41,7 @@ protected: public: static OpSummary &getInstance(); - std::map getOPsStats() { return opsStats; } - - std::vector getOpSets() { - return opsets; - } + std::map getOPsStats() { return opsStats; } static void setExtractBody(bool val) { extractBody = val; } static bool getExtractBody() { return extractBody; } @@ -50,11 +49,11 @@ public: std::map getStatisticFromReport(); void saveReport() override; - void updateOPsStats(const std::shared_ptr &function, const PassRate::Statuses &status); - void updateOPsImplStatus(const std::shared_ptr &function, const bool implStatus); + void updateOPsStats(const std::shared_ptr &model, const PassRate::Statuses &status); + void updateOPsImplStatus(const std::shared_ptr &model, const bool implStatus); - void updateOPsStats(const ngraph::NodeTypeInfo &op, const PassRate::Statuses &status); - void updateOPsImplStatus(const ngraph::NodeTypeInfo &op, const bool implStatus); + void updateOPsStats(const ov::NodeTypeInfo &op, const PassRate::Statuses &status); + void updateOPsImplStatus(const ov::NodeTypeInfo &op, const bool implStatus); }; } // namespace utils diff --git a/src/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/summary/summary.hpp b/src/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/summary/summary.hpp index 11757fbdd71..76eddf3ad0c 100644 --- a/src/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/summary/summary.hpp +++ b/src/tests/ie_test_utils/functional_test_utils/include/functional_test_utils/summary/summary.hpp @@ -7,7 +7,7 @@ #include #include -#include "ngraph/ngraph.hpp" +#include "openvino/openvino.hpp" #include "common_test_utils/test_constants.hpp" #include "common_test_utils/common_utils.hpp" diff --git a/src/tests/ie_test_utils/functional_test_utils/src/summary/op_summary.cpp b/src/tests/ie_test_utils/functional_test_utils/src/summary/op_summary.cpp index 6bd37942cd4..380a45188f1 100644 --- a/src/tests/ie_test_utils/functional_test_utils/src/summary/op_summary.cpp +++ b/src/tests/ie_test_utils/functional_test_utils/src/summary/op_summary.cpp @@ -2,8 +2,11 @@ // SPDX-License-Identifier: Apache-2.0 // +#include + #include + #include "functional_test_utils/summary/op_summary.hpp" #include "common_test_utils/file_utils.hpp" @@ -27,17 +30,6 @@ void OpSummaryDestroyer::initialize(OpSummary *p) { OpSummary::OpSummary() { reportFilename = CommonTestUtils::OP_REPORT_FILENAME; - // TODO: replace to get_available_opsets() - opsets.push_back(ngraph::get_opset1()); - opsets.push_back(ngraph::get_opset2()); - opsets.push_back(ngraph::get_opset3()); - opsets.push_back(ngraph::get_opset4()); - opsets.push_back(ngraph::get_opset5()); - opsets.push_back(ngraph::get_opset6()); - opsets.push_back(ngraph::get_opset7()); - opsets.push_back(ngraph::get_opset8()); - opsets.push_back(ngraph::get_opset9()); - opsets.push_back(ngraph::get_opset10()); } OpSummary &OpSummary::getInstance() { @@ -48,7 +40,7 @@ OpSummary &OpSummary::getInstance() { return *p_instance; } -void OpSummary::updateOPsStats(const ngraph::NodeTypeInfo &op, const PassRate::Statuses &status) { +void OpSummary::updateOPsStats(const ov::NodeTypeInfo &op, const PassRate::Statuses &status) { auto it = opsStats.find(op); if (opsStats.find(op) == opsStats.end()) { opsStats.insert({op, PassRate()}); @@ -89,7 +81,7 @@ void OpSummary::updateOPsStats(const ngraph::NodeTypeInfo &op, const PassRate::S } } -void OpSummary::updateOPsImplStatus(const ngraph::NodeTypeInfo &op, const bool implStatus) { +void OpSummary::updateOPsImplStatus(const ov::NodeTypeInfo &op, const bool implStatus) { auto it = opsStats.find(op); if (it != opsStats.end()) { if (!it->second.isImplemented && implStatus) { @@ -101,13 +93,14 @@ void OpSummary::updateOPsImplStatus(const ngraph::NodeTypeInfo &op, const bool i } } -std::string OpSummary::getOpVersion(const ngraph::NodeTypeInfo &type_info) { - for (size_t i = 0; i < opsets.size(); i++) { - if (opsets[i].contains_type(type_info)) { - return std::to_string(i+1); - } +std::string OpSummary::getOpVersion(const ov::NodeTypeInfo &type_info) { + std::string opset_name = "opset", version = type_info.get_version(); + auto pos = version.find(opset_name); + if (pos == std::string::npos) { + return "undefined"; + } else { + return version.substr(pos + opset_name.size()); } - return "undefined"; } std::map OpSummary::getStatisticFromReport() { @@ -136,41 +129,41 @@ std::map OpSummary::getStatisticFromReport() { return oldOpsStat; } -void OpSummary::updateOPsStats(const std::shared_ptr &function, const PassRate::Statuses &status) { - if (function->get_parameters().empty()) { +void OpSummary::updateOPsStats(const std::shared_ptr &model, const PassRate::Statuses &status) { + if (model->get_parameters().empty()) { return; } bool isFunctionalGraph = false; - for (const auto &op : function->get_ordered_ops()) { - if (!ngraph::is_type(op) && - !ngraph::is_type(op) && - !ngraph::is_type(op)) { + for (const auto &op : model->get_ordered_ops()) { + if (!std::dynamic_pointer_cast(op) && + !std::dynamic_pointer_cast(op) && + !std::dynamic_pointer_cast(op)) { isFunctionalGraph = true; break; } } - for (const auto &op : function->get_ordered_ops()) { - if ((ngraph::is_type(op) || - ngraph::is_type(op) || - ngraph::is_type(op)) && isFunctionalGraph) { + for (const auto &op : model->get_ordered_ops()) { + if (std::dynamic_pointer_cast(op) || + std::dynamic_pointer_cast(op) || + std::dynamic_pointer_cast(op) || isFunctionalGraph) { continue; } if (extractBody) { - if (ngraph::is_type(op)) { + if (std::dynamic_pointer_cast(op)) { updateOPsStats(op->get_type_info(), status); - auto ti = ngraph::as_type_ptr(op); + auto ti = ov::as_type_ptr(op); auto ti_body = ti->get_function(); updateOPsStats(ti_body, status); - } else if (ngraph::is_type(op)) { + } else if (std::dynamic_pointer_cast(op)) { updateOPsStats(op->get_type_info(), status); - auto loop = ngraph::as_type_ptr(op); + auto loop = ov::as_type_ptr(op); auto loop_body = loop->get_function(); updateOPsStats(loop_body, status); - } else if (ngraph::is_type(op)) { + } else if (std::dynamic_pointer_cast(op)) { updateOPsStats(op->get_type_info(), status); - auto if_op = ngraph::as_type_ptr(op); - std::vector> bodies; + auto if_op = ov::as_type_ptr(op); + std::vector> bodies; for (size_t i = 0; i < if_op->get_internal_subgraphs_size(); i++) { auto if_body = if_op->get_function(i); updateOPsStats(if_body, status); @@ -181,33 +174,33 @@ void OpSummary::updateOPsStats(const std::shared_ptr &function } } -void OpSummary::updateOPsImplStatus(const std::shared_ptr &function, const bool implStatus) { - if (function->get_parameters().empty()) { +void OpSummary::updateOPsImplStatus(const std::shared_ptr &model, const bool implStatus) { + if (model->get_parameters().empty()) { return; } bool isFunctionalGraph = false; - for (const auto &op : function->get_ordered_ops()) { - if (!ngraph::is_type(op) && - !ngraph::is_type(op) && - !ngraph::is_type(op)) { + for (const auto &op : model->get_ordered_ops()) { + if (!std::dynamic_pointer_cast(op) && + !std::dynamic_pointer_cast(op) && + !std::dynamic_pointer_cast(op)) { isFunctionalGraph = true; break; } } - for (const auto &op : function->get_ordered_ops()) { - if ((ngraph::is_type(op) || - ngraph::is_type(op) || - ngraph::is_type(op)) && isFunctionalGraph) { + for (const auto &op : model->get_ordered_ops()) { + if ((std::dynamic_pointer_cast(op) || + std::dynamic_pointer_cast(op) || + std::dynamic_pointer_cast(op)) && isFunctionalGraph) { continue; - } else if (ngraph::is_type(op)) { + } else if (std::dynamic_pointer_cast(op)) { updateOPsImplStatus(op->get_type_info(), implStatus); - auto ti = ngraph::as_type_ptr(op); + auto ti = ov::as_type_ptr(op); auto ti_body = ti->get_function(); updateOPsImplStatus(ti_body, implStatus); - } else if (ngraph::is_type(op)) { + } else if (std::dynamic_pointer_cast(op)) { updateOPsImplStatus(op->get_type_info(), implStatus); - auto loop = ngraph::as_type_ptr(op); + auto loop = ov::as_type_ptr(op); auto loop_body = loop->get_function(); updateOPsImplStatus(loop_body, implStatus); } else { @@ -249,8 +242,10 @@ void OpSummary::saveReport() { std::string outputFilePath = outputFolder + std::string(CommonTestUtils::FileSeparator) + filename; - std::set opsInfo; - for (const auto &opset : opsets) { + std::set opsInfo; + for (const auto &opset_pair : get_available_opsets()) { + std::string opset_version = opset_pair.first; + const ov::OpSet& opset = opset_pair.second(); const auto &type_info_set = opset.get_type_info_set(); opsInfo.insert(type_info_set.begin(), type_info_set.end()); }