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

[CONFORMANCE] Fix API Conformance run according changed functions (#14112)

Browse Source 
* [CONFORMANCE] Fix API Conformance run according changed functions

* def para
This commit is contained in:
Irina Efode 2022-11-21 18:49:44 +03:00 committed by GitHub
parent abdcaef36d
commit 68b6b273c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/read_ir/read_ir_query_model.cpp
View File

@ -13,12 +13,23 @@ namespace op {
using namespace ov::test::subgraph; using namespace ov::test::subgraph;
namespace { 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 <openvino/opsets/opset10_tbl.hpp>
#undef _OPENVINO_OP_REG
INSTANTIATE_TEST_SUITE_P(conformance_query_model_other,
ReadIRTest, ReadIRTest,
::testing::Combine( ::testing::Combine(::testing::ValuesIn(getModelPaths(IRFolderPaths)),
::testing::ValuesIn(getModelPaths(IRFolderPaths)), ::testing::Values(targetDevice),
::testing::Values(targetDevice), ::testing::Values(pluginConfig)),
::testing::Values(pluginConfig)),
ReadIRTest::getTestCaseName); ReadIRTest::getTestCaseName);
} // namespace } // namespace

2
src/tests/functional/plugin/conformance/test_runner/conformance_infra/include/conformance.hpp
View File

@ -48,7 +48,7 @@ inline ov::AnyMap readPluginConfig(const std::string &configFilePath) {
} }
inline std::vector<std::string> getModelPaths(const std::vector<std::string>& conformance_ir_paths, inline std::vector<std::string> getModelPaths(const std::vector<std::string>& 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 // This is required to prevent re-scan folders each call in case there is nothing found
static bool listPrepared = false; static bool listPrepared = false;
if (!listPrepared) { if (!listPrepared) {

14
src/tests/functional/plugin/conformance/test_runner/op_conformance_runner/src/read_ir/read_ir_compare_with_refs.cpp
View File

@ -16,10 +16,8 @@ using namespace ov::test::subgraph;
namespace { namespace {
#include <ngraph/ngraph.hpp> #define _OPENVINO_OP_REG(NAME, NAMESPACE) \
INSTANTIATE_TEST_SUITE_P(conformance_##NAME, \
#define NGRAPH_OP(NAME, NAMESPACE) \
INSTANTIATE_TEST_SUITE_P(conformance##NAME, \
ReadIRTest, \ ReadIRTest, \
::testing::Combine(::testing::ValuesIn(getModelPaths(IRFolderPaths, #NAME)), \ ::testing::Combine(::testing::ValuesIn(getModelPaths(IRFolderPaths, #NAME)), \
::testing::Values(targetDevice), \ ::testing::Values(targetDevice), \
@ -27,12 +25,12 @@ namespace {
ReadIRTest::getTestCaseName); \ ReadIRTest::getTestCaseName); \
// It should point on latest opset which contains biggest list of operations // It should point on latest opset which contains biggest list of operations
#include <ngraph/opsets/opset10_tbl.hpp> #include "openvino/opsets/opset10_tbl.hpp"
#undef NGRAPH_OP #undef _OPENVINO_OP_REG
INSTANTIATE_TEST_SUITE_P(conformanceOther, INSTANTIATE_TEST_SUITE_P(conformance_other,
ReadIRTest, ReadIRTest,
::testing::Combine(::testing::ValuesIn(getModelPaths(IRFolderPaths, CONFORMANCE_OTHER_OPS)), ::testing::Combine(::testing::ValuesIn(getModelPaths(IRFolderPaths)),
::testing::Values(targetDevice), ::testing::Values(targetDevice),
::testing::Values(pluginConfig)), ::testing::Values(pluginConfig)),
ReadIRTest::getTestCaseName); ReadIRTest::getTestCaseName);

1
src/tests/functional/shared_test_classes/src/base/utils/generate_inputs.cpp
View File

@ -781,6 +781,7 @@ InputsMap getInputMap() {
#include "openvino/opsets/opset7_tbl.hpp" #include "openvino/opsets/opset7_tbl.hpp"
#include "openvino/opsets/opset8_tbl.hpp" #include "openvino/opsets/opset8_tbl.hpp"
#include "openvino/opsets/opset9_tbl.hpp" #include "openvino/opsets/opset9_tbl.hpp"
#include "openvino/opsets/opset10_tbl.hpp"
#include "ov_ops/opset_private_tbl.hpp" #include "ov_ops/opset_private_tbl.hpp"
#undef _OPENVINO_OP_REG #undef _OPENVINO_OP_REG