diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/read_ir/read_ir_query_model.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/read_ir/read_ir_query_model.cpp index 1688c1b42d1..ebb5a4b5c83 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/read_ir/read_ir_query_model.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/read_ir/read_ir_query_model.cpp @@ -13,12 +13,23 @@ namespace op { using namespace ov::test::subgraph; namespace { -INSTANTIATE_TEST_SUITE_P(conformance_query_model, +#define _OPENVINO_OP_REG(NAME, NAMESPACE) \ + INSTANTIATE_TEST_SUITE_P(conformance_query_model_##NAME, \ + ReadIRTest, \ + ::testing::Combine(::testing::ValuesIn(getModelPaths(IRFolderPaths, #NAME)), \ + ::testing::Values(targetDevice), \ + ::testing::Values(pluginConfig)), \ + ReadIRTest::getTestCaseName); \ + +// It should point on latest opset which contains biggest list of operations +#include +#undef _OPENVINO_OP_REG + +INSTANTIATE_TEST_SUITE_P(conformance_query_model_other, ReadIRTest, - ::testing::Combine( - ::testing::ValuesIn(getModelPaths(IRFolderPaths)), - ::testing::Values(targetDevice), - ::testing::Values(pluginConfig)), + ::testing::Combine(::testing::ValuesIn(getModelPaths(IRFolderPaths)), + ::testing::Values(targetDevice), + ::testing::Values(pluginConfig)), ReadIRTest::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/conformance/test_runner/conformance_infra/include/conformance.hpp b/src/tests/functional/plugin/conformance/test_runner/conformance_infra/include/conformance.hpp index 6658f918d6f..33c08cf658d 100644 --- a/src/tests/functional/plugin/conformance/test_runner/conformance_infra/include/conformance.hpp +++ b/src/tests/functional/plugin/conformance/test_runner/conformance_infra/include/conformance.hpp @@ -48,7 +48,7 @@ inline ov::AnyMap readPluginConfig(const std::string &configFilePath) { } inline std::vector getModelPaths(const std::vector& conformance_ir_paths, - const std::string opName = "") { + const std::string opName = CONFORMANCE_OTHER_OPS) { // This is required to prevent re-scan folders each call in case there is nothing found static bool listPrepared = false; if (!listPrepared) { diff --git a/src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/src/read_ir/read_ir_compare_with_refs.cpp b/src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/src/read_ir/read_ir_compare_with_refs.cpp index 7a1cbe3b0c8..a7b9bb2011f 100644 --- a/src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/src/read_ir/read_ir_compare_with_refs.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/src/read_ir/read_ir_compare_with_refs.cpp @@ -16,10 +16,8 @@ using namespace ov::test::subgraph; namespace { -#include - -#define NGRAPH_OP(NAME, NAMESPACE) \ - INSTANTIATE_TEST_SUITE_P(conformance##NAME, \ +#define _OPENVINO_OP_REG(NAME, NAMESPACE) \ + INSTANTIATE_TEST_SUITE_P(conformance_##NAME, \ ReadIRTest, \ ::testing::Combine(::testing::ValuesIn(getModelPaths(IRFolderPaths, #NAME)), \ ::testing::Values(targetDevice), \ @@ -27,12 +25,12 @@ namespace { ReadIRTest::getTestCaseName); \ // It should point on latest opset which contains biggest list of operations -#include -#undef NGRAPH_OP +#include "openvino/opsets/opset10_tbl.hpp" +#undef _OPENVINO_OP_REG -INSTANTIATE_TEST_SUITE_P(conformanceOther, +INSTANTIATE_TEST_SUITE_P(conformance_other, ReadIRTest, - ::testing::Combine(::testing::ValuesIn(getModelPaths(IRFolderPaths, CONFORMANCE_OTHER_OPS)), + ::testing::Combine(::testing::ValuesIn(getModelPaths(IRFolderPaths)), ::testing::Values(targetDevice), ::testing::Values(pluginConfig)), ReadIRTest::getTestCaseName); diff --git a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp index c58644d5139..237e3b57dd4 100644 --- a/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp +++ b/src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp @@ -781,6 +781,7 @@ InputsMap getInputMap() { #include "openvino/opsets/opset7_tbl.hpp" #include "openvino/opsets/opset8_tbl.hpp" #include "openvino/opsets/opset9_tbl.hpp" +#include "openvino/opsets/opset10_tbl.hpp" #include "ov_ops/opset_private_tbl.hpp" #undef _OPENVINO_OP_REG