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

[CONFORMANCE] Fix canExport model test + fix some instantiations (#14153)

Browse Source 
* [CONFROMANCE] Fix OV Path in new conformance runner

* filelist

* dd

* try

* one

* Update run_conformance.py

* sss

* revert extra

* f

* exec_net

* init_1

* fix_instantiations

* remove extra

* Update summarize.py
This commit is contained in:
Irina Efode
2022-11-28 06:41:24 +03:00
committed by GitHub
parent 1849a0be0b
commit c63f20fa7d
8 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,7 +71,7 @@ inline const std::vector<std::map<std::string, std::string>> generate_configs(co
return resultConfig;
}
inline const std::string generate_complex_device_name(const std::string deviceName) {
inline const std::string generate_complex_device_name(const std::string& deviceName) {
return deviceName + ":" + ov::test::conformance::targetDevice;
}

11
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/exec_network_base.cpp
View File

@@ -19,9 +19,18 @@ namespace {
const std::vector<InferenceEngine::Precision> execNetBaseElemTypes = {
InferenceEngine::Precision::FP32,
InferenceEngine::Precision::FP16,
InferenceEngine::Precision::FP64,
InferenceEngine::Precision::BF16,
InferenceEngine::Precision::U8,
InferenceEngine::Precision::U16,
InferenceEngine::Precision::U32,
InferenceEngine::Precision::U64,
InferenceEngine::Precision::I8,
InferenceEngine::Precision::I16,
InferenceEngine::Precision::U16
InferenceEngine::Precision::I32,
InferenceEngine::Precision::I64,
InferenceEngine::Precision::BOOL,
};
INSTANTIATE_TEST_SUITE_P(ie_executable_network, ExecNetSetPrecision,

3
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_graph_info.cpp
View File

@@ -23,6 +23,9 @@ const std::vector<ov::element::Type_t> ovExecGraphInfoElemTypes = {
ov::element::u64,
ov::element::f16,
ov::element::f32,
ov::element::f64,
ov::element::bf16,
ov::element::boolean,
};
INSTANTIATE_TEST_SUITE_P(ov_compiled_model,

11
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/get_metric.cpp
View File

@@ -10,13 +10,10 @@
namespace {
using namespace ov::test::behavior;
using namespace ov::test::conformance;
using namespace InferenceEngine::PluginConfigParams;
//
// IE Class Common tests with <pluginName, deviceName params>
//
INSTANTIATE_TEST_SUITE_P(
ov_compiled_model, OVClassExecutableNetworkImportExportTestP,
::testing::ValuesIn(return_all_possible_device_combination()));
@@ -63,19 +60,19 @@ INSTANTIATE_TEST_SUITE_P(
INSTANTIATE_TEST_SUITE_P(
ov_compiled_model, OVClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS,
::testing::ValuesIn(return_all_possible_device_combination()));
::testing::Values(targetDevice));
INSTANTIATE_TEST_SUITE_P(
ov_compiled_model, OVClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_METRICS,
::testing::ValuesIn(return_all_possible_device_combination()));
::testing::Values(targetDevice));
INSTANTIATE_TEST_SUITE_P(
ov_compiled_model, OVClassHeteroExecutableNetworkGetMetricTest_NETWORK_NAME,
::testing::ValuesIn(return_all_possible_device_combination()));
::testing::Values(targetDevice));
INSTANTIATE_TEST_SUITE_P(
ov_compiled_model, OVClassHeteroExecutableNetworkGetMetricTest_TARGET_FALLBACK,
::testing::ValuesIn(return_all_possible_device_combination()));
::testing::Values(targetDevice));
} // namespace

4
src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/core_integration.cpp
View File

@@ -78,11 +78,11 @@ INSTANTIATE_TEST_SUITE_P(
INSTANTIATE_TEST_SUITE_P(
ie_plugin, IEClassQueryNetworkTest,
::testing::Values(ov::test::conformance::targetDevice));
::testing::ValuesIn(return_all_possible_device_combination()));
// IE Class Load network
INSTANTIATE_TEST_SUITE_P(
ie_plugin, IEClassLoadNetworkTest,
::testing::Values(targetDevice));
::testing::ValuesIn(return_all_possible_device_combination()));
} // namespace

5
src/tests/functional/plugin/shared/include/behavior/executable_network/exec_network_base.hpp
View File

@@ -284,9 +284,8 @@ TEST_P(ExecutableNetworkBaseTest, canExport) {
std::string modelName = GetTestName().substr(0, CommonTestUtils::maxFileNameLength) + "_" + ts;
auto execNet = ie->LoadNetwork(cnnNet, target_device, configuration);
ASSERT_NO_THROW(execNet.Export(modelName));
ASSERT_TRUE(CommonTestUtils::fileExists(modelName + ".xml"));
ASSERT_TRUE(CommonTestUtils::fileExists(modelName + ".bin"));
CommonTestUtils::removeIRFiles(modelName + ".xml", modelName + ".bin");
ASSERT_TRUE(CommonTestUtils::fileExists(modelName));
CommonTestUtils::removeFile(modelName);
}
TEST_P(ExecutableNetworkBaseTest, pluginDoesNotChangeOriginalNetwork) {

5
src/tests/functional/plugin/shared/include/behavior/ov_executable_network/exec_network_base.hpp
View File

@@ -328,9 +328,8 @@ TEST_P(OVExecutableNetworkBaseTest, canExport) {
std::ofstream out(modelName, std::ios::out);
EXPECT_NO_THROW(execNet.export_model(out));
out.close();
EXPECT_TRUE(CommonTestUtils::fileExists(modelName + ".xml"));
EXPECT_TRUE(CommonTestUtils::fileExists(modelName + ".bin"));
CommonTestUtils::removeIRFiles(modelName + ".xml", modelName + ".bin");
EXPECT_TRUE(CommonTestUtils::fileExists(modelName));
CommonTestUtils::removeFile(modelName);
}
TEST_P(OVExecutableNetworkBaseTest, pluginDoesNotChangeOriginalNetwork) {

1
src/tests/ie_test_utils/functional_test_utils/layer_tests_summary/summarize.py
View File

@@ -272,3 +272,4 @@ if __name__ == "__main__":
args = parse_arguments()
summary_root = merge_xmls(args.xml)
create_summary(summary_root, args.out, [] if args.expected_devices is None else args.expected_devices, args.report_tag, args.report_version, args.conformance_mode, args.csv, args.output_filename)