[Op Conformance] Update compare accuracy function

openvinotoolkit · Jan 18, 2024 · 9fae912 · 9fae912
1 parent 1a8f72f
commit 9fae912
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 3,929 deletions.
diff --git a/...intel_gpu/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp b/...intel_gpu/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp
@@ -2,99 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "behavior/ov_plugin/core_integration.hpp"
-
 #include "behavior/ov_plugin/core_integration_sw.hpp"
 #include "behavior/ov_plugin/query_model.hpp"
 
 using namespace ov::test::behavior;
 
 namespace {
 
-INSTANTIATE_TEST_SUITE_P(smoke_OVClassBasicTestP, OVClassBasicTestP,
-        ::testing::Values(std::make_pair(std::string("openvino_intel_gpu_plugin"), std::string(ov::test::utils::DEVICE_GPU))));
-
-INSTANTIATE_TEST_SUITE_P(smoke_OVClassNetworkTestP, OVClassNetworkTestP,
-        ::testing::Values(std::string(ov::test::utils::DEVICE_GPU)));
-
-//
-// OV Class GetMetric
-//
-
-INSTANTIATE_TEST_SUITE_P(
-        nightly_OVClassGetMetricTest, OVClassGetMetricTest_SUPPORTED_CONFIG_KEYS,
-        ::testing::Values(std::string(ov::test::utils::DEVICE_GPU),
-                          std::string(ov::test::utils::DEVICE_HETERO),
-                          std::string(ov::test::utils::DEVICE_BATCH))
-);
-
-INSTANTIATE_TEST_SUITE_P(
-        nightly_OVClassGetMetricTest, OVClassGetMetricTest_SUPPORTED_METRICS,
-        ::testing::Values(std::string(ov::test::utils::DEVICE_GPU),
-                          std::string(ov::test::utils::DEVICE_HETERO),
-                          std::string(ov::test::utils::DEVICE_BATCH))
-);
-
-INSTANTIATE_TEST_SUITE_P(
-        nightly_OVClassGetMetricTest, OVClassGetMetricTest_AVAILABLE_DEVICES,
-        ::testing::Values(std::string(ov::test::utils::DEVICE_GPU))
-);
-
-INSTANTIATE_TEST_SUITE_P(
-        nightly_OVClassGetMetricTest, OVClassGetMetricTest_FULL_DEVICE_NAME,
-        ::testing::Values(std::string(ov::test::utils::DEVICE_GPU),
-                          std::string(ov::test::utils::DEVICE_HETERO),
-                          std::string(ov::test::utils::DEVICE_BATCH))
-);
-
-INSTANTIATE_TEST_SUITE_P(
-        nightly_OVClassGetMetricTest, OVClassGetMetricTest_OPTIMIZATION_CAPABILITIES,
-        ::testing::Values(std::string(ov::test::utils::DEVICE_GPU))
-);
+INSTANTIATE_TEST_SUITE_P(smoke_OVClassModelTestP, OVClassModelTestP,
+                         ::testing::Values(std::string(ov::test::utils::DEVICE_GPU)));
 
-INSTANTIATE_TEST_SUITE_P(
-        nightly_OVClassGetMetricTest, OVClassGetMetricTest_DEVICE_GOPS,
-        ::testing::Values(std::string(ov::test::utils::DEVICE_GPU))
-);
-
-INSTANTIATE_TEST_SUITE_P(
-        nightly_OVClassGetMetricTest, OVClassGetMetricTest_DEVICE_TYPE,
-        ::testing::Values(std::string(ov::test::utils::DEVICE_GPU))
-);
-
-INSTANTIATE_TEST_SUITE_P(
-        nightly_OVClassGetMetricTest, OVClassGetMetricTest_RANGE_FOR_ASYNC_INFER_REQUESTS,
-        ::testing::Values(std::string(ov::test::utils::DEVICE_GPU))
-);
-
-INSTANTIATE_TEST_SUITE_P(
-        nightly_OVClassGetMetricTest, OVClassGetMetricTest_RANGE_FOR_STREAMS,
-        ::testing::Values(std::string(ov::test::utils::DEVICE_GPU))
-);
-
-INSTANTIATE_TEST_SUITE_P(
-        nightly_OVClassGetMetricTest, OVClassGetMetricTest_ThrowUnsupported,
-        ::testing::Values(std::string(ov::test::utils::DEVICE_GPU),
-                          std::string(ov::test::utils::DEVICE_HETERO),
-                          std::string(ov::test::utils::DEVICE_BATCH))
-);
-
-INSTANTIATE_TEST_SUITE_P(
-        nightly_OVClassGetConfigTest, OVClassGetConfigTest_ThrowUnsupported,
-        ::testing::Values(std::string(ov::test::utils::DEVICE_GPU),
-                          std::string(ov::test::utils::DEVICE_HETERO),
-                          std::string(ov::test::utils::DEVICE_BATCH))
-);
-
-INSTANTIATE_TEST_SUITE_P(
-        nightly_OVClassGetAvailableDevices, OVClassGetAvailableDevices,
-        ::testing::Values(std::string(ov::test::utils::DEVICE_GPU))
-);
-
-// IE Class Common tests with <pluginName, target_device params>
-//
-INSTANTIATE_TEST_SUITE_P(nightly_OVClassModelTestP, OVClassModelTestP, ::testing::Values("GPU"));
-INSTANTIATE_TEST_SUITE_P(nightly_OVClassModelOptionalTestP, OVClassModelOptionalTestP, ::testing::Values("GPU"));
+INSTANTIATE_TEST_SUITE_P(nightly_OVClassModelOptionalTestP, OVClassModelOptionalTestP,
+                         ::testing::Values(std::string(ov::test::utils::DEVICE_GPU)));
 
 // Several devices case
 INSTANTIATE_TEST_SUITE_P(nightly_OVClassSeveralDevicesTest,
@@ -109,10 +28,6 @@ INSTANTIATE_TEST_SUITE_P(nightly_OVClassSeveralDevicesTest,
                          OVClassSeveralDevicesTestDefaultCore,
                          ::testing::Values(std::vector<std::string>({"GPU.0", "GPU.1"})));
 
-// Set config for all GPU devices
-
-INSTANTIATE_TEST_SUITE_P(nightly_OVClassSetGlobalConfigTest, OVClassSetGlobalConfigTest, ::testing::Values("GPU"));
-
 // IE Class Query network
 
 INSTANTIATE_TEST_SUITE_P(smoke_OVClassQueryModelTest, OVClassQueryModelTest, ::testing::Values("GPU"));

diff --git a/...intel_gpu/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp b/...intel_gpu/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp
@@ -103,6 +103,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_OVClassSetDevicePriorityConfigPropsTest,
 //
 // GPU specific metrics
 //
+
 using OVGetMetricPropsTest_GPU_DEVICE_TOTAL_MEM_SIZE = OVClassBaseTestP;
 TEST_P(OVGetMetricPropsTest_GPU_DEVICE_TOTAL_MEM_SIZE, GetMetricAndPrintNoThrow) {
     ov::Core ie;

diff --git a/...tests/functional/plugin/shared/include/behavior/ov_executable_network/exec_graph_info.hpp b/...tests/functional/plugin/shared/include/behavior/ov_executable_network/exec_graph_info.hpp