diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp index 7751b3b6419..1c7ba598d31 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/include/api_conformance_helpers.hpp @@ -71,7 +71,7 @@ inline const std::vector> 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; } diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/exec_network_base.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/exec_network_base.cpp index 434a2fde1a4..758b8a3ab4e 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/exec_network_base.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/executable_network/exec_network_base.cpp @@ -19,9 +19,18 @@ namespace { const std::vector 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, diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_graph_info.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_graph_info.cpp index 4399c256842..55206537b61 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_graph_info.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/exec_graph_info.cpp @@ -23,6 +23,9 @@ const std::vector 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, diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/get_metric.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/get_metric.cpp index bc380409d0f..353dac3af02 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/get_metric.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/ov_executable_network/get_metric.cpp @@ -10,13 +10,10 @@ namespace { using namespace ov::test::behavior; using namespace ov::test::conformance; -using namespace InferenceEngine::PluginConfigParams; // // IE Class Common tests with // - - 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 diff --git a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/core_integration.cpp b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/core_integration.cpp index cb89d49362d..e4746f5a6d0 100644 --- a/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/core_integration.cpp +++ b/src/tests/functional/plugin/conformance/test_runner/api_conformance_runner/src/behavior/plugin/core_integration.cpp @@ -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 \ No newline at end of file diff --git a/src/tests/functional/plugin/shared/include/behavior/executable_network/exec_network_base.hpp b/src/tests/functional/plugin/shared/include/behavior/executable_network/exec_network_base.hpp index b7f4c0f4238..d3826ca0ca3 100644 --- a/src/tests/functional/plugin/shared/include/behavior/executable_network/exec_network_base.hpp +++ b/src/tests/functional/plugin/shared/include/behavior/executable_network/exec_network_base.hpp @@ -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) { diff --git a/src/tests/functional/plugin/shared/include/behavior/ov_executable_network/exec_network_base.hpp b/src/tests/functional/plugin/shared/include/behavior/ov_executable_network/exec_network_base.hpp index b648a6dee87..131f078f252 100644 --- a/src/tests/functional/plugin/shared/include/behavior/ov_executable_network/exec_network_base.hpp +++ b/src/tests/functional/plugin/shared/include/behavior/ov_executable_network/exec_network_base.hpp @@ -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) { diff --git a/src/tests/ie_test_utils/functional_test_utils/layer_tests_summary/summarize.py b/src/tests/ie_test_utils/functional_test_utils/layer_tests_summary/summarize.py index fb7576b5c31..dc2e21f477c 100644 --- a/src/tests/ie_test_utils/functional_test_utils/layer_tests_summary/summarize.py +++ b/src/tests/ie_test_utils/functional_test_utils/layer_tests_summary/summarize.py @@ -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) +