diff --git a/src/plugins/auto_batch/tests/functional/CMakeLists.txt b/src/plugins/auto_batch/tests/functional/CMakeLists.txt index c39647cf13c..041473d0a1f 100644 --- a/src/plugins/auto_batch/tests/functional/CMakeLists.txt +++ b/src/plugins/auto_batch/tests/functional/CMakeLists.txt @@ -4,6 +4,26 @@ set(TARGET_NAME ov_auto_batch_func_tests) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + ie_add_compiler_flags(/wd4244) + ie_add_compiler_flags(/wd4267) + ie_add_compiler_flags(/wd4305) + ie_add_compiler_flags(/wd4018) + ie_add_compiler_flags(/wd4050) + ie_add_compiler_flags(/wd4250) + ie_add_compiler_flags(/wd4334) + ie_add_compiler_flags(/wd4661) + ie_add_compiler_flags(/wd4273) + ie_add_compiler_flags(/wd4309) + ie_add_compiler_flags(/wd4804) +endif() +if(NOT MSVC) + ie_add_compiler_flags(-Wno-missing-declarations) + ie_add_compiler_flags(-Wno-sign-compare) + ie_add_compiler_flags(-Wno-odr) + ie_add_compiler_flags(-Wno-all) +endif() + set(SHARED_HEADERS_DIR "${OpenVINO_SOURCE_DIR}/src/tests/functional/plugin/shared/include") addIeTargetTest( NAME @@ -22,6 +42,10 @@ addIeTargetTest( Auto_Batch ) if (ENABLE_INTEL_GPU) - target_compile_definitions(${TARGET_NAME} PRIVATE HAVE_GPU_PLUGIN) + target_compile_definitions(${TARGET_NAME} PRIVATE HAVE_INTEL_GPU_PLUGIN) endif() +if (ENABLE_TEMPLATE) + target_compile_definitions(${TARGET_NAME} PRIVATE HAVE_TEMPLATE_PLUGIN) +endif() + set_ie_threading_interface_for(${TARGET_NAME}) diff --git a/src/plugins/auto_batch/tests/functional/behavior/executable_network/exec_net_base.cpp b/src/plugins/auto_batch/tests/functional/behavior/executable_network/exec_net_base.cpp new file mode 100644 index 00000000000..cb6c41a4804 --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/executable_network/exec_net_base.cpp @@ -0,0 +1,28 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/executable_network/exec_network_base.hpp" + +using namespace BehaviorTestsDefinitions; +namespace { + +const std::vector netPrecisions = {InferenceEngine::Precision::FP32, + InferenceEngine::Precision::FP16}; +auto autoBatchConfig = []() { + return std::vector>{ + // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, + // no timeout to avoid increasing the test time + {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; +}; + +#ifdef HAVE_INTEL_GPU_PLUGIN +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + ExecNetSetPrecision, + ::testing::Combine(::testing::ValuesIn(netPrecisions), + ::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(autoBatchConfig())), + ExecNetSetPrecision::getTestCaseName); +#endif +} // namespace diff --git a/src/plugins/auto_batch/tests/functional/behavior/infer_request/callback.cpp b/src/plugins/auto_batch/tests/functional/behavior/infer_request/callback.cpp new file mode 100644 index 00000000000..2c02cbe6053 --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/infer_request/callback.cpp @@ -0,0 +1,24 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/infer_request/callback.hpp" + +using namespace BehaviorTestsDefinitions; +namespace { +auto autoBatchConfigs = []() { + return std::vector>{ + // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, + // no timeout to avoid increasing the test time + {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; +}; + +#ifdef HAVE_INTEL_GPU_PLUGIN +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + InferRequestCallbackTests, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(autoBatchConfigs())), + InferRequestCallbackTests::getTestCaseName); +#endif +} // namespace \ No newline at end of file diff --git a/src/plugins/auto_batch/tests/functional/behavior/infer_request/multithreading.cpp b/src/plugins/auto_batch/tests/functional/behavior/infer_request/multithreading.cpp new file mode 100644 index 00000000000..ff46af0c35b --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/infer_request/multithreading.cpp @@ -0,0 +1,28 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/infer_request/multithreading.hpp" + +#include + +#include "ie_plugin_config.hpp" + +using namespace BehaviorTestsDefinitions; +namespace { +auto auto_batch_configs = []() { + return std::vector>{ + // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, + // no timeout to avoid increasing the test time + {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; +}; + +#ifdef HAVE_INTEL_GPU_PLUGIN +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + InferRequestMultithreadingTests, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(auto_batch_configs())), + InferRequestMultithreadingTests::getTestCaseName); +#endif +} // namespace \ No newline at end of file diff --git a/src/plugins/auto_batch/tests/functional/behavior/infer_request/perf_counters.cpp b/src/plugins/auto_batch/tests/functional/behavior/infer_request/perf_counters.cpp new file mode 100644 index 00000000000..7c75ddbc40a --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/infer_request/perf_counters.cpp @@ -0,0 +1,24 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/infer_request/perf_counters.hpp" + +using namespace BehaviorTestsDefinitions; +namespace { +auto AutoBatchConfigs = []() { + return std::vector>{ + // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, + // no timeout to avoid increasing the test time + {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; +}; + +#ifdef HAVE_INTEL_GPU_PLUGIN +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + InferRequestPerfCountersTest, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(AutoBatchConfigs())), + InferRequestPerfCountersTest::getTestCaseName); +#endif +} // namespace \ No newline at end of file diff --git a/src/plugins/auto_batch/tests/functional/behavior/infer_request/wait.cpp b/src/plugins/auto_batch/tests/functional/behavior/infer_request/wait.cpp new file mode 100644 index 00000000000..d89d02c468c --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/infer_request/wait.cpp @@ -0,0 +1,28 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/infer_request/wait.hpp" + +#include + +#include "ie_plugin_config.hpp" + +using namespace BehaviorTestsDefinitions; +namespace { +auto autoBatchConfigs = []() { + return std::vector>{ + // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, + // no timeout to avoid increasing the test time + {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; +}; + +#ifdef HAVE_INTEL_GPU_PLUGIN +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + InferRequestWaitTests, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(autoBatchConfigs())), + InferRequestWaitTests::getTestCaseName); +#endif +} // namespace \ No newline at end of file diff --git a/src/plugins/auto_batch/tests/functional/behavior/ov_executable_network/exec_net_base.cpp b/src/plugins/auto_batch/tests/functional/behavior/ov_executable_network/exec_net_base.cpp new file mode 100644 index 00000000000..626eec8872a --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/ov_executable_network/exec_net_base.cpp @@ -0,0 +1,24 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/ov_executable_network/exec_network_base.hpp" + +using namespace ov::test::behavior; +namespace { +auto autoBatchConfigs = []() { + return std::vector{ + // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, + // no timeout to avoid increasing the test time + {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; +}; + +#ifdef HAVE_INTEL_GPU_PLUGIN +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatchBehaviorTests, OVExecutableNetworkBaseTest, + ::testing::Combine( + ::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(autoBatchConfigs())), + OVExecutableNetworkBaseTest::getTestCaseName); +#endif +} // namespace diff --git a/src/plugins/auto_batch/tests/functional/behavior/ov_executable_network/properties.cpp b/src/plugins/auto_batch/tests/functional/behavior/ov_executable_network/properties.cpp new file mode 100644 index 00000000000..bbc4328b7f7 --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/ov_executable_network/properties.cpp @@ -0,0 +1,52 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/ov_executable_network/properties.hpp" + +#include "ie_system_conf.h" +#include "openvino/runtime/properties.hpp" + +using namespace ov::test::behavior; + +namespace { + +const std::vector auto_batch_inproperties = { + {ov::num_streams(-100)}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_CPU) + "(4)"}, + {ov::auto_batch_timeout(-1)}}, +#ifdef HAVE_TEMPLATE_PLUGIN + {ov::device::id("UNSUPPORTED_DEVICE_ID_STRING")}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_TEMPLATE) + "(4)"}, + {ov::auto_batch_timeout(-1)}}, +#endif +}; + +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + OVCompiledModelPropertiesIncorrectTests, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(auto_batch_inproperties)), + OVCompiledModelPropertiesIncorrectTests::getTestCaseName); + +const std::vector auto_batch_properties = { + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_CPU) + "(4)"}}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_CPU) + "(4)"}, + {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "1"}}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_CPU) + "(4)"}, + {ov::auto_batch_timeout(10)}}, +#ifdef HAVE_TEMPLATE_PLUGIN + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_TEMPLATE) + "(4)"}}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_TEMPLATE) + "(4)"}, + {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "1"}}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_TEMPLATE) + "(4)"}, + {ov::auto_batch_timeout(10)}}, +#endif +}; + +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + OVCompiledModelPropertiesTests, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(auto_batch_properties)), + OVCompiledModelPropertiesTests::getTestCaseName); + +} // namespace diff --git a/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/callback.cpp b/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/callback.cpp new file mode 100644 index 00000000000..13a79ebd114 --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/callback.cpp @@ -0,0 +1,27 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/ov_infer_request/callback.hpp" + +#include + +using namespace ov::test::behavior; + +namespace { +auto autoBatchConfigs = []() { + return std::vector{ + // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, + // no timeout to avoid increasing the test time + {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; +}; + +#ifdef HAVE_INTEL_GPU_PLUGIN +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + OVInferRequestCallbackTests, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(autoBatchConfigs())), + OVInferRequestCallbackTests::getTestCaseName); +#endif +} // namespace \ No newline at end of file diff --git a/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/cancellation.cpp b/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/cancellation.cpp new file mode 100644 index 00000000000..e871763a069 --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/cancellation.cpp @@ -0,0 +1,25 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/ov_infer_request/cancellation.hpp" + +using namespace ov::test::behavior; + +namespace { +auto autoBatchConfigs = []() { + return std::vector{ + // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, + // no timeout to avoid increasing the test time + {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; +}; + +#ifdef HAVE_INTEL_GPU_PLUGIN +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatchBehaviorTests, + OVInferRequestCancellationTests, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(autoBatchConfigs())), + OVInferRequestCancellationTests::getTestCaseName); +#endif +} // namespace \ No newline at end of file diff --git a/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/io_tensor.cpp b/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/io_tensor.cpp new file mode 100644 index 00000000000..8603794b0ca --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/io_tensor.cpp @@ -0,0 +1,73 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/ov_infer_request/io_tensor.hpp" + +#include + +using namespace ov::test::behavior; + +namespace { +auto AutoBatchConfigs = []() { + return std::vector{ + // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, + // no timeout to avoid increasing the test time + {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; +}; + +std::vector prcs = { + ov::element::boolean, + ov::element::bf16, + ov::element::f16, + ov::element::f32, + ov::element::f64, + ov::element::i4, + ov::element::i8, + ov::element::i16, + ov::element::i32, + ov::element::i64, + ov::element::u1, + ov::element::u4, + ov::element::u8, + ov::element::u16, + ov::element::u32, + ov::element::u64, +}; + +std::vector supported_input_prcs = {ov::element::boolean, + ov::element::f16, + ov::element::f32, + ov::element::f64, + ov::element::i8, + ov::element::i16, + ov::element::i32, + ov::element::i64, + ov::element::u8, + ov::element::u16, + ov::element::u32, + ov::element::u64}; + +#ifdef HAVE_INTEL_GPU_PLUGIN +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + OVInferRequestIOTensorTest, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(AutoBatchConfigs())), + OVInferRequestIOTensorTest::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + OVInferRequestIOTensorSetPrecisionTest, + ::testing::Combine(::testing::ValuesIn(prcs), + ::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(AutoBatchConfigs())), + OVInferRequestIOTensorSetPrecisionTest::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + OVInferRequestCheckTensorPrecision, + ::testing::Combine(::testing::ValuesIn(supported_input_prcs), + ::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(AutoBatchConfigs())), + OVInferRequestCheckTensorPrecision::getTestCaseName); +#endif +} // namespace \ No newline at end of file diff --git a/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/multithreading.cpp b/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/multithreading.cpp new file mode 100644 index 00000000000..8b8987f7b9f --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/multithreading.cpp @@ -0,0 +1,27 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/ov_infer_request/multithreading.hpp" + +#include + +using namespace ov::test::behavior; + +namespace { +auto AutoBatchConfigs = []() { + return std::vector{ + // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, + // no timeout to avoid increasing the test time + {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; +}; + +#ifdef HAVE_INTEL_GPU_PLUGIN +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + OVInferRequestMultithreadingTests, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(AutoBatchConfigs())), + OVInferRequestMultithreadingTests::getTestCaseName); +#endif +} // namespace \ No newline at end of file diff --git a/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/perf_counters.cpp b/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/perf_counters.cpp new file mode 100644 index 00000000000..5641cbc1423 --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/perf_counters.cpp @@ -0,0 +1,25 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/ov_infer_request/perf_counters.hpp" + +using namespace ov::test::behavior; + +namespace { +auto AutoBatchConfigs = []() { + return std::vector{ + // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, + // no timeout to avoid increasing the test time + {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; +}; + +#ifdef HAVE_INTEL_GPU_PLUGIN +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + OVInferRequestPerfCountersTest, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(AutoBatchConfigs())), + OVInferRequestPerfCountersTest::getTestCaseName); +#endif +} // namespace \ No newline at end of file diff --git a/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/wait.cpp b/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/wait.cpp new file mode 100644 index 00000000000..5bc55352db9 --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/ov_infer_request/wait.cpp @@ -0,0 +1,27 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/ov_infer_request/wait.hpp" + +#include + +using namespace ov::test::behavior; + +namespace { +auto AutoBatchConfigs = []() { + return std::vector{ + // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, + // no timeout to avoid increasing the test time + {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; +}; + +#ifdef HAVE_INTEL_GPU_PLUGIN +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + OVInferRequestWaitTests, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(AutoBatchConfigs())), + OVInferRequestWaitTests::getTestCaseName); +#endif +} // namespace \ No newline at end of file diff --git a/src/plugins/auto_batch/tests/functional/behavior/ov_plugin/life_time.cpp b/src/plugins/auto_batch/tests/functional/behavior/ov_plugin/life_time.cpp new file mode 100644 index 00000000000..1dd2c82f077 --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/ov_plugin/life_time.cpp @@ -0,0 +1,14 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/ov_plugin/life_time.hpp" + +using namespace ov::test::behavior; +namespace { +INSTANTIATE_TEST_SUITE_P(smoke_VirtualPlugin_BehaviorTests, + OVHoldersTest, + ::testing::Values(CommonTestUtils::DEVICE_BATCH), + OVHoldersTest::getTestCaseName); + +} // namespace diff --git a/src/plugins/auto_batch/tests/functional/behavior/ov_plugin/properties_tests.cpp b/src/plugins/auto_batch/tests/functional/behavior/ov_plugin/properties_tests.cpp new file mode 100644 index 00000000000..8d25262bd94 --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/ov_plugin/properties_tests.cpp @@ -0,0 +1,34 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/ov_plugin/properties_tests.hpp" + +#include "openvino/runtime/properties.hpp" + +using namespace ov::test::behavior; + +namespace { +const std::vector auto_batch_inproperties = { + {ov::device::id("UNSUPPORTED_DEVICE_ID_STRING")}, +}; + +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_AutoBatch_BehaviorTests, + OVPropertiesIncorrectTests, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(auto_batch_inproperties)), + OVPropertiesIncorrectTests::getTestCaseName); + +const std::vector auto_batch_properties = { + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_TEMPLATE}}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_TEMPLATE}, {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "1"}}, +}; + +#ifdef HAVE_INTEL_TEMPLATE_PLUGIN +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_AutoBatch_BehaviorTests, + OVPropertiesTests, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(auto_batch_properties)), + OVPropertiesTests::getTestCaseName); +#endif +} // namespace \ No newline at end of file diff --git a/src/plugins/auto_batch/tests/functional/behavior/ov_plugin/remote.cpp b/src/plugins/auto_batch/tests/functional/behavior/ov_plugin/remote.cpp new file mode 100644 index 00000000000..745bdae36b9 --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/ov_plugin/remote.cpp @@ -0,0 +1,33 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/ov_plugin/remote.hpp" + +#include "common_test_utils/test_constants.hpp" +#include "ie_plugin_config.hpp" + +using namespace ov::test; + +namespace { +std::vector> generate_remote_params() { + return {}; +} +auto AutoBatchConfigs = []() { + return std::vector{ + // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, + // no timeout to avoid increasing the test time + {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; +}; + +#ifdef HAVE_INTEL_GPU_PLUGIN +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_AutoBatch_BehaviorTests, + OVRemoteTest, + ::testing::Combine(::testing::Values(ngraph::element::f32), + ::testing::Values(::CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(AutoBatchConfigs()), + ::testing::ValuesIn(generate_remote_params())), + OVRemoteTest::getTestCaseName); +#endif +} // namespace \ No newline at end of file diff --git a/src/plugins/auto_batch/tests/functional/behavior/plugin/auto_batching_tests.cpp b/src/plugins/auto_batch/tests/functional/behavior/plugin/auto_batching_tests.cpp index e3afbe3fa4c..4696730e415 100644 --- a/src/plugins/auto_batch/tests/functional/behavior/plugin/auto_batching_tests.cpp +++ b/src/plugins/auto_batch/tests/functional/behavior/plugin/auto_batching_tests.cpp @@ -32,7 +32,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_AutoBatching_CPU, ::testing::ValuesIn(num_batch)), AutoBatching_Test_DetectionOutput::getTestCaseName); -#ifdef HAVE_GPU_PLUGIN +#ifdef HAVE_INTEL_GPU_PLUGIN const std::vector gpu_num_streams{2}; const std::vector gpu_get_vs_set{true, false}; const std::vector gpu_num_requests{1, 8, 16, 64}; diff --git a/src/plugins/auto_batch/tests/functional/behavior/plugin/configuration_tests.cpp b/src/plugins/auto_batch/tests/functional/behavior/plugin/configuration_tests.cpp new file mode 100644 index 00000000000..ee78389c119 --- /dev/null +++ b/src/plugins/auto_batch/tests/functional/behavior/plugin/configuration_tests.cpp @@ -0,0 +1,54 @@ +// Copyright (C) 2018-2023 Intel Corporation +// SPDX-License-Identifier: Apache-2.0 +// + +#include "behavior/plugin/configuration_tests.hpp" +#include "gpu/gpu_config.hpp" + +using namespace BehaviorTestsDefinitions; +namespace { +IE_SUPPRESS_DEPRECATED_START +auto auto_batch_inconfigs = []() { + return std::vector>{ + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_GPU}, {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "-1"}}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_GPU}, + {InferenceEngine::PluginConfigParams::KEY_PERFORMANCE_HINT, "DOESN'T EXIST"}}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_GPU}, + {InferenceEngine::PluginConfigParams::KEY_PERFORMANCE_HINT, InferenceEngine::PluginConfigParams::LATENCY}, + {InferenceEngine::PluginConfigParams::KEY_PERFORMANCE_HINT_NUM_REQUESTS, "-1"}}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_GPU}, + {InferenceEngine::PluginConfigParams::KEY_PERF_COUNT, "ON"}}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_GPU}, + {InferenceEngine::PluginConfigParams::KEY_CONFIG_FILE, "unknown_file"}}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_GPU}, + {InferenceEngine::PluginConfigParams::KEY_DEVICE_ID, "DEVICE_UNKNOWN"}}}; +}; +IE_SUPPRESS_DEPRECATED_END + +auto auto_batch_configs = []() { + return std::vector>{ + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_GPU}}, + {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_GPU}, {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "1"}}, + }; +}; + +#ifdef HAVE_INTEL_GPU_PLUGIN +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + IncorrectConfigTests, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(auto_batch_inconfigs())), + IncorrectConfigTests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + IncorrectConfigAPITests, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(auto_batch_inconfigs())), + IncorrectConfigAPITests::getTestCaseName); + +INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, + CorrectConfigTests, + ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), + ::testing::ValuesIn(auto_batch_configs())), + CorrectConfigTests::getTestCaseName); +#endif +} // namespace \ No newline at end of file diff --git a/src/plugins/auto_batch/tests/functional/skip_tests_config.cpp b/src/plugins/auto_batch/tests/functional/skip_tests_config.cpp index 4af33e89542..7253fc50235 100644 --- a/src/plugins/auto_batch/tests/functional/skip_tests_config.cpp +++ b/src/plugins/auto_batch/tests/functional/skip_tests_config.cpp @@ -11,5 +11,13 @@ std::vector disabledTestPatterns() { return { // TODO: for 22.2 (CVS-68949) R"(smoke_AutoBatching_CPU/AutoBatching_Test_DetectionOutput.*)", + // Not implemented yet: + R"(.*Behavior.*ExecutableNetworkBaseTest.*canSetConfigToExecNet.*)", + R"(.*Behavior.*ExecutableNetworkBaseTest.*canExport.*)", + R"(.*OVExecutableNetworkBaseTest.*CanSetConfigToExecNet.*)", + R"(.*OVExecutableNetworkBaseTest.*CanSetConfigToExecNetAndCheckConfigAndCheck.*)", + // Issue: 90539 + R"(smoke_AutoBatch_BehaviorTests/OVInferRequestIOTensorTest.InferStaticNetworkSetInputTensor/targetDevice=BATCH.*)", + R"(.*VirtualPlugin.*BehaviorTests.*OVHoldersTest.*)", }; } diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_executable_network/properties.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_executable_network/properties.cpp index 173ed266a36..d199fa52010 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_executable_network/properties.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_executable_network/properties.cpp @@ -28,11 +28,6 @@ const std::vector auto_inproperties = { }; -const std::vector auto_batch_inproperties = { - {ov::num_streams(-100)}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG) , std::string(CommonTestUtils::DEVICE_CPU) + "(4)"}, {ov::auto_batch_timeout(-1)}}, -}; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompiledModelPropertiesIncorrectTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), @@ -57,12 +52,6 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVCompiledModelPropertiesInco ::testing::ValuesIn(auto_inproperties)), OVCompiledModelPropertiesIncorrectTests::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVCompiledModelPropertiesIncorrectTests, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(auto_batch_inproperties)), - OVCompiledModelPropertiesIncorrectTests::getTestCaseName); - #if (defined(__APPLE__) || defined(_WIN32)) auto default_affinity = [] { auto numaNodes = InferenceEngine::getAvailableNUMANodes(); @@ -110,12 +99,6 @@ const std::vector multi_properties = { {InferenceEngine::PluginConfigParams::KEY_CPU_THROUGHPUT_STREAMS, InferenceEngine::PluginConfigParams::CPU_THROUGHPUT_AUTO}}, }; -const std::vector auto_batch_properties = { - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG) , std::string(CommonTestUtils::DEVICE_CPU) + "(4)"}}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG) , std::string(CommonTestUtils::DEVICE_CPU) + "(4)"}, {CONFIG_KEY(AUTO_BATCH_TIMEOUT) , "1"}}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG) , std::string(CommonTestUtils::DEVICE_CPU) + "(4)"}, {ov::auto_batch_timeout(10)}}, -}; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompiledModelPropertiesTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), @@ -134,9 +117,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVCompiledModelPropertiesTes ::testing::ValuesIn(multi_properties)), OVCompiledModelPropertiesTests::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVCompiledModelPropertiesTests, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(auto_batch_properties)), - OVCompiledModelPropertiesTests::getTestCaseName); } // namespace diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/life_time.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/life_time.cpp index c7b8ead895f..b449a1d5614 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/life_time.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/life_time.cpp @@ -13,7 +13,6 @@ namespace { INSTANTIATE_TEST_SUITE_P(smoke_VirtualPlugin_BehaviorTests, OVHoldersTest, ::testing::Values("AUTO:CPU", "MULTI:CPU", - //CommonTestUtils::DEVICE_BATCH, "HETERO:CPU"), OVHoldersTest::getTestCaseName); diff --git a/src/plugins/template/tests/functional/shared_tests_instances/behavior/ov_executable_network/properties.cpp b/src/plugins/template/tests/functional/shared_tests_instances/behavior/ov_executable_network/properties.cpp index 10ba97613de..f669e15378b 100644 --- a/src/plugins/template/tests/functional/shared_tests_instances/behavior/ov_executable_network/properties.cpp +++ b/src/plugins/template/tests/functional/shared_tests_instances/behavior/ov_executable_network/properties.cpp @@ -26,13 +26,6 @@ const std::vector auto_inproperties = { {ov::device::id("UNSUPPORTED_DEVICE_ID_STRING")}, }; - -const std::vector auto_batch_inproperties = { - {ov::device::id("UNSUPPORTED_DEVICE_ID_STRING")}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG) , std::string(CommonTestUtils::DEVICE_TEMPLATE) + "(4)"}, - {ov::auto_batch_timeout(-1)}}, -}; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompiledModelPropertiesIncorrectTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE), @@ -57,12 +50,6 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVCompiledModelPropertiesInco ::testing::ValuesIn(auto_inproperties)), OVCompiledModelPropertiesIncorrectTests::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVCompiledModelPropertiesIncorrectTests, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(auto_batch_inproperties)), - OVCompiledModelPropertiesIncorrectTests::getTestCaseName); - const std::vector default_properties = { {ov::enable_profiling(true)}, {ov::device::id("0")}, @@ -90,12 +77,6 @@ const std::vector multi_properties = { {ov::device::priorities(CommonTestUtils::DEVICE_TEMPLATE), ov::device::id("0")}, }; -const std::vector auto_batch_properties = { - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG) , std::string(CommonTestUtils::DEVICE_TEMPLATE) + "(4)"}}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG) , std::string(CommonTestUtils::DEVICE_TEMPLATE) + "(4)"}, {CONFIG_KEY(AUTO_BATCH_TIMEOUT) , "1"}}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG) , std::string(CommonTestUtils::DEVICE_TEMPLATE) + "(4)"}, {ov::auto_batch_timeout(10)}}, -}; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompiledModelPropertiesTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE), @@ -114,9 +95,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVCompiledModelPropertiesTes ::testing::ValuesIn(multi_properties)), OVCompiledModelPropertiesTests::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVCompiledModelPropertiesTests, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(auto_batch_properties)), - OVCompiledModelPropertiesTests::getTestCaseName); } // namespace \ No newline at end of file diff --git a/src/plugins/template/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp b/src/plugins/template/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp index d6a87759e01..278e7fc7014 100644 --- a/src/plugins/template/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp +++ b/src/plugins/template/tests/functional/shared_tests_instances/behavior/ov_plugin/properties_tests.cpp @@ -21,16 +21,10 @@ const std::vector multi_inproperties = { {ov::device::id("UNSUPPORTED_DEVICE_ID_STRING")}, }; - const std::vector auto_inproperties = { {ov::device::id("UNSUPPORTED_DEVICE_ID_STRING")}, }; - -const std::vector auto_batch_inproperties = { - {ov::device::id("UNSUPPORTED_DEVICE_ID_STRING")}, -}; - INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_BehaviorTests, OVPropertiesIncorrectTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE), @@ -55,12 +49,6 @@ INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_Auto_BehaviorTests, OVPropertiesIncorrec ::testing::ValuesIn(auto_inproperties)), OVPropertiesIncorrectTests::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_AutoBatch_BehaviorTests, OVPropertiesIncorrectTests, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(auto_batch_inproperties)), - OVPropertiesIncorrectTests::getTestCaseName); - const std::vector default_properties = { {ov::enable_profiling(true)}, {ov::device::id(0)}, @@ -88,12 +76,6 @@ const std::vector multi_properties = { {ov::device::priorities(CommonTestUtils::DEVICE_TEMPLATE), ov::device::id(0)}, }; -const std::vector auto_batch_properties = { - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG) , CommonTestUtils::DEVICE_TEMPLATE}}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG) , CommonTestUtils::DEVICE_TEMPLATE}, - {CONFIG_KEY(AUTO_BATCH_TIMEOUT) , "1"}}, -}; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVPropertiesTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE), @@ -112,9 +94,4 @@ INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_Multi_BehaviorTests, OVPropertiesTests, ::testing::ValuesIn(multi_properties)), OVPropertiesTests::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_AutoBatch_BehaviorTests, OVPropertiesTests, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(auto_batch_properties)), - OVPropertiesTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/executable_network/exec_net_base.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/executable_network/exec_net_base.cpp index 1038b0d3b0b..853dbedc470 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/executable_network/exec_net_base.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/executable_network/exec_net_base.cpp @@ -58,14 +58,6 @@ auto autoConfig = []() { }; }; -auto autoBatchConfig = []() { - return std::vector>{ - // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, - // no timeout to avoid increasing the test time - {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; -}; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, ExecNetSetPrecision, ::testing::Combine( ::testing::ValuesIn(netPrecisions), @@ -86,11 +78,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, ExecNetSetPrecision, ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(autoConfig())), ExecNetSetPrecision::getTestCaseName); - -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, ExecNetSetPrecision, - ::testing::Combine( - ::testing::ValuesIn(netPrecisions), - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(autoBatchConfig())), - ExecNetSetPrecision::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/callback.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/callback.cpp index 397761e18d7..17c9400133a 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/callback.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/callback.cpp @@ -24,14 +24,6 @@ auto autoConfigs = []() { CommonTestUtils::DEVICE_GPU + std::string(",") + CommonTestUtils::DEVICE_CPU}}}; }; -auto autoBatchConfigs = []() { - return std::vector>{ - // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, - // no timeout to avoid increasing the test time - {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; -}; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestCallbackTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), @@ -49,10 +41,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestCallbackTests, ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(autoConfigs())), InferRequestCallbackTests::getTestCaseName); - -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, InferRequestCallbackTests, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(autoBatchConfigs())), - InferRequestCallbackTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/multithreading.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/multithreading.cpp index 1001b64cba6..a261be4ff5d 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/multithreading.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/multithreading.cpp @@ -21,14 +21,6 @@ auto autoconfigs = []() { std::string(CommonTestUtils::DEVICE_CPU) + "," + CommonTestUtils::DEVICE_GPU}}}; }; -auto auto_batch_configs = []() { - return std::vector>{ - // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, - // no timeout to avoid increasing the test time - {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; -}; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestMultithreadingTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), @@ -47,10 +39,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestMultithreadingTes ::testing::ValuesIn(autoconfigs())), InferRequestMultithreadingTests::getTestCaseName); - -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, InferRequestMultithreadingTests, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(auto_batch_configs())), - InferRequestMultithreadingTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/perf_counters.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/perf_counters.cpp index e69979a2034..2c9942ce0fe 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/perf_counters.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/perf_counters.cpp @@ -24,15 +24,6 @@ auto AutoConfigs = CommonTestUtils::DEVICE_GPU + std::string(",") + CommonTestUtils::DEVICE_CPU}}}; }; -auto AutoBatchConfigs = - []() { - return std::vector>{ - // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, - // no timeout to avoid increasing the test time - {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; - }; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestPerfCountersTest, ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_GPU), @@ -50,10 +41,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(AutoConfigs())), InferRequestPerfCountersTest::getTestCaseName); - -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, - InferRequestPerfCountersTest, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(AutoBatchConfigs())), - InferRequestPerfCountersTest::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/wait.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/wait.cpp index 47213ac0dbe..0c913fb55db 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/wait.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/wait.cpp @@ -21,14 +21,6 @@ auto autoConfigs = []() { CommonTestUtils::DEVICE_GPU + std::string(",") + CommonTestUtils::DEVICE_CPU}}}; }; -auto autoBatchConfigs = []() { - return std::vector>{ - // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, - // no timeout to avoid increasing the test time - {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; -}; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestWaitTests, ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_GPU), @@ -47,10 +39,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, ::testing::ValuesIn(autoConfigs())), InferRequestWaitTests::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, - InferRequestWaitTests, - ::testing::Combine(::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(autoBatchConfigs())), - InferRequestWaitTests::getTestCaseName); - } // namespace diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_executable_network/exec_net_base.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_executable_network/exec_net_base.cpp index a6fbe02366b..fb573b0d2d3 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_executable_network/exec_net_base.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_executable_network/exec_net_base.cpp @@ -12,23 +12,9 @@ auto configs = []() { }; }; -auto autoBatchConfigs = []() { - return std::vector{ - // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, - // no timeout to avoid increasing the test time - {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; -}; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVExecutableNetworkBaseTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(configs())), OVExecutableNetworkBaseTest::getTestCaseName); - -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatchBehaviorTests, OVExecutableNetworkBaseTest, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(autoBatchConfigs())), - OVExecutableNetworkBaseTest::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/callback.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/callback.cpp index af0f01d93e8..bbbbbb34d0b 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/callback.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/callback.cpp @@ -21,14 +21,6 @@ auto multiConfigs = []() { return std::vector{{ov::device::priorities(CommonTestUtils::DEVICE_GPU)}}; }; -auto autoBatchConfigs = []() { - return std::vector{ - // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, - // no timeout to avoid increasing the test time - {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; -}; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestCallbackTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), @@ -47,10 +39,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestCallbackTests, ::testing::ValuesIn(multiConfigs())), OVInferRequestCallbackTests::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVInferRequestCallbackTests, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(autoBatchConfigs())), - OVInferRequestCallbackTests::getTestCaseName); - } // namespace diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/cancellation.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/cancellation.cpp index 8c743daf107..d418b94b286 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/cancellation.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/cancellation.cpp @@ -13,23 +13,10 @@ auto configs = []() { }; }; -auto autoBatchConfigs = []() { - return std::vector{ - // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, - // no timeout to avoid increasing the test time - {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; -}; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestCancellationTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(configs())), OVInferRequestCancellationTests::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatchBehaviorTests, OVInferRequestCancellationTests, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(autoBatchConfigs())), - OVInferRequestCancellationTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/io_tensor.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/io_tensor.cpp index 5ee1dfc87b0..8fd2006f092 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/io_tensor.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/io_tensor.cpp @@ -30,14 +30,6 @@ auto AutoConfigs = []() { return std::vector{{ov::device::priorities(CommonTestUtils::DEVICE_GPU)}}; }; -auto AutoBatchConfigs = []() { - return std::vector{ - // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, - // no timeout to avoid increasing the test time - {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; -}; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestIOTensorTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), @@ -56,12 +48,6 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestIOTensorTest, ::testing::ValuesIn(AutoConfigs())), OVInferRequestIOTensorTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVInferRequestIOTensorTest, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(AutoBatchConfigs())), - OVInferRequestIOTensorTest::getTestCaseName); - std::vector prcs = { ov::element::boolean, ov::element::bf16, @@ -117,12 +103,6 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestIOTensorSetPrec ::testing::ValuesIn(AutoConfigs())), OVInferRequestIOTensorSetPrecisionTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVInferRequestIOTensorSetPrecisionTest, - ::testing::Combine( - ::testing::ValuesIn(prcs), - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(AutoBatchConfigs())), - OVInferRequestIOTensorSetPrecisionTest::getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_GPU_BehaviorTests, OVInferRequestCheckTensorPrecision, ::testing::Combine( @@ -131,10 +111,5 @@ INSTANTIATE_TEST_SUITE_P(smoke_GPU_BehaviorTests, OVInferRequestCheckTensorPreci ::testing::ValuesIn(emptyConfigs())), OVInferRequestCheckTensorPrecision::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVInferRequestCheckTensorPrecision, - ::testing::Combine( - ::testing::ValuesIn(supported_input_prcs), - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(AutoBatchConfigs())), - OVInferRequestCheckTensorPrecision::getTestCaseName); + } // namespace diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/multithreading.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/multithreading.cpp index c95f011e305..d000dc44849 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/multithreading.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/multithreading.cpp @@ -22,14 +22,6 @@ auto Multiconfigs = []() { return std::vector{{ov::device::priorities(CommonTestUtils::DEVICE_GPU)}}; }; -auto AutoBatchConfigs = []() { - return std::vector{ - // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, - // no timeout to avoid increasing the test time - {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; -}; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestMultithreadingTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), @@ -48,9 +40,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestMultithreadingT ::testing::ValuesIn(Multiconfigs())), OVInferRequestMultithreadingTests::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVInferRequestMultithreadingTests, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(AutoBatchConfigs())), - OVInferRequestMultithreadingTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/perf_counters.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/perf_counters.cpp index a69e40a3663..e2ac4b552fc 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/perf_counters.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/perf_counters.cpp @@ -41,14 +41,6 @@ auto Autoconfigs = []() { return std::vector{{ov::device::priorities(CommonTestUtils::DEVICE_GPU)}}; }; -auto AutoBatchConfigs = []() { - return std::vector{ - // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, - // no timeout to avoid increasing the test time - {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; -}; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestPerfCountersTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), @@ -67,9 +59,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestPerfCountersTes ::testing::ValuesIn(Autoconfigs())), OVInferRequestPerfCountersTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVInferRequestPerfCountersTest, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(AutoBatchConfigs())), - OVInferRequestPerfCountersTest::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/wait.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/wait.cpp index 1fd14f42886..f39d2cf3568 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/wait.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_infer_request/wait.cpp @@ -26,14 +26,6 @@ auto Autoconfigs = []() { return std::vector{{ov::device::priorities(CommonTestUtils::DEVICE_GPU)}}; }; -auto AutoBatchConfigs = []() { - return std::vector{ - // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, - // no timeout to avoid increasing the test time - {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; -}; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestWaitTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), @@ -52,9 +44,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestWaitTests, ::testing::ValuesIn(Autoconfigs())), OVInferRequestWaitTests::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, OVInferRequestWaitTests, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(AutoBatchConfigs())), - OVInferRequestWaitTests::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_plugin/remote.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_plugin/remote.cpp index 1f975ea4553..2117751a03f 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_plugin/remote.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/ov_plugin/remote.cpp @@ -20,14 +20,6 @@ auto MultiConfigs = []() { return std::vector{{ov::device::priorities(CommonTestUtils::DEVICE_GPU)}}; }; -auto AutoBatchConfigs = []() { - return std::vector{ - // explicit batch size 4 to avoid fallback to no auto-batching (i.e. plain GPU) - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), std::string(CommonTestUtils::DEVICE_GPU) + "(4)"}, - // no timeout to avoid increasing the test time - {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "0 "}}}; -}; - INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_BehaviorTests, OVRemoteTest, ::testing::Combine( ::testing::Values(ngraph::element::f32), @@ -44,11 +36,4 @@ INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_Multi_BehaviorTests, OVRemoteTest, ::testing::ValuesIn(generate_remote_params())), OVRemoteTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_AutoBatch_BehaviorTests, OVRemoteTest, - ::testing::Combine( - ::testing::Values(ngraph::element::f32), - ::testing::Values(::CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(AutoBatchConfigs()), - ::testing::ValuesIn(generate_remote_params())), - OVRemoteTest::getTestCaseName); } // namespace diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/plugin/configuration_tests.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/plugin/configuration_tests.cpp index 6c98f7f912f..e941018b080 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/plugin/configuration_tests.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/plugin/configuration_tests.cpp @@ -86,24 +86,6 @@ namespace { CommonTestUtils::DEVICE_GPU + std::string(",") + CommonTestUtils::DEVICE_CPU}, {InferenceEngine::PluginConfigParams::KEY_MODEL_PRIORITY, "ABC"}}}; }; - - auto auto_batch_inconfigs = []() { - return std::vector>{ - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_GPU}, - {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "-1"}}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_GPU}, - {InferenceEngine::PluginConfigParams::KEY_PERFORMANCE_HINT, "DOESN'T EXIST"}}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_GPU}, - {InferenceEngine::PluginConfigParams::KEY_PERFORMANCE_HINT, InferenceEngine::PluginConfigParams::LATENCY}, - {InferenceEngine::PluginConfigParams::KEY_PERFORMANCE_HINT_NUM_REQUESTS, "-1"}}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_GPU}, - {InferenceEngine::PluginConfigParams::KEY_PERF_COUNT, "ON"}}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_GPU}, - {InferenceEngine::PluginConfigParams::KEY_CONFIG_FILE, "unknown_file"}}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_GPU}, - {InferenceEngine::PluginConfigParams::KEY_DEVICE_ID, "DEVICE_UNKNOWN"}}}; - }; - IE_SUPPRESS_DEPRECATED_END INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, IncorrectConfigTests, @@ -124,13 +106,6 @@ namespace { ::testing::ValuesIn(autoinconfigs())), IncorrectConfigTests::getTestCaseName); - - INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, IncorrectConfigTests, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(auto_batch_inconfigs())), - IncorrectConfigTests::getTestCaseName); - const std::vector> conf = { {} }; @@ -231,14 +206,6 @@ namespace { InferenceEngine::PluginConfigParams::MODEL_PRIORITY_LOW}}}; }; - auto auto_batch_configs = []() { - return std::vector>{ - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_GPU}}, - {{CONFIG_KEY(AUTO_BATCH_DEVICE_CONFIG), CommonTestUtils::DEVICE_GPU}, - {CONFIG_KEY(AUTO_BATCH_TIMEOUT), "1"}}, - }; - }; - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, DefaultValuesConfigTests, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), @@ -262,17 +229,6 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(autoinconfigs())), IncorrectConfigAPITests::getTestCaseName); - INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, IncorrectConfigAPITests, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(auto_batch_inconfigs())), - IncorrectConfigAPITests::getTestCaseName); - - INSTANTIATE_TEST_SUITE_P(smoke_AutoBatch_BehaviorTests, CorrectConfigTests, - ::testing::Combine( - ::testing::Values(CommonTestUtils::DEVICE_BATCH), - ::testing::ValuesIn(auto_batch_configs())), - CorrectConfigTests::getTestCaseName); auto ExcluAsyncReqConfigs = []() { return std::vector>{