Skip to content

Commit

Permalink
Add backwardDrvComp keyword for tests suites that are backward comp…
Browse files Browse the repository at this point in the history 
…atible with PV driver
  • Loading branch information
@MirceaDan99
MirceaDan99 committed Jun 25, 2024
1 parent 83f6d21 commit 41a3385
Show file tree
Hide file tree
Showing 26 changed files with 90 additions and 96 deletions.
2 changes: 1 addition & 1 deletion src/plugins/intel_npu/tests/functional/behavior/infer_request_run.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const std::vector<ov::AnyMap> configsInferRequestRunTests = {
{ov::log::level(ov::log::Level::INFO)}
};

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTest, InferRequestRunTests,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTest, InferRequestRunTests,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(configsInferRequestRunTests)),
InferRequestRunTests::getTestCaseName);
Expand Down
2 changes: 1 addition & 1 deletion ...tel_npu/tests/functional/behavior/npu_driver_compiler_adapter/downgrade_interpolate11.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const std::vector<ov::AnyMap> configs = {
{{ov::intel_npu::compiler_type(ov::intel_npu::CompilerType::DRIVER)}},
};

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTest, DriverCompilerAdapterDowngradeInterpolate11TestNPU,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTest, DriverCompilerAdapterDowngradeInterpolate11TestNPU,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(configs)),
DriverCompilerAdapterDowngradeInterpolate11TestNPU::getTestCaseName);
2 changes: 1 addition & 1 deletion ...lugins/intel_npu/tests/functional/behavior/npu_driver_compiler_adapter/inputs_outputs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const std::vector<ov::AnyMap> configs = {
{{ov::intel_npu::compiler_type(ov::intel_npu::CompilerType::DRIVER)}},
};

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTest, DriverCompilerAdapterInputsOutputsTestNPU,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTest, DriverCompilerAdapterInputsOutputsTestNPU,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(configs)),
DriverCompilerAdapterInputsOutputsTestNPU::getTestCaseName);
2 changes: 1 addition & 1 deletion ...plugins/intel_npu/tests/functional/behavior/npu_driver_compiler_adapter/query_network.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ TEST_P(QueryNetworkTestSuite1NPU, TestQueryNetworkSupported) {
EXPECT_EQ(expected, actual);
}

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTest, QueryNetworkTestSuite1NPU,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTest, QueryNetworkTestSuite1NPU,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(configs)),
QueryNetworkTestNPU::getTestCaseName);
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/intel_npu/tests/functional/behavior/ov_plugin/internal_properties_tests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,13 @@ const std::vector<ov::AnyMap> IncorrectMutablePropertiesWrongValueTypes = {
{{ov::intel_npu::compilation_mode_params.name(), "not-a-param=true"}},
};

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests,
OVPropertiesTestsNPU,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(CorrectPluginMutableProperties)),
(ov::test::utils::appendPlatformTypeTestName<OVPropertiesTestsNPU>));

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests,
OVPropertiesIncorrectTestsNPU,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(IncorrectMutablePropertiesWrongValueTypes)),
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/intel_npu/tests/functional/internal/overload/compiled_model/property.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ TEST_P(ClassPluginPropertiesTestSuite0NPU, CanSetGetPublicMutableProperty) {
ASSERT_EQ(retrieved_value.as<std::string>(), configValue.as<std::string>());
}

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests_ClassPluginPropertiesTestNPU, ClassPluginPropertiesTestSuite0NPU,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests_ClassPluginPropertiesTestNPU, ClassPluginPropertiesTestSuite0NPU,
::testing::Combine(::testing::Values(ov::test::utils::getDeviceName()),
::testing::ValuesIn(plugin_public_mutable_properties)),
ClassPluginPropertiesTestNPU::getTestCaseName);
Expand All @@ -218,7 +218,7 @@ TEST_P(ClassPluginPropertiesTestSuite1NPU, CanSetGetInternalMutableProperty) {
ASSERT_EQ(retrieved_value.as<std::string>(), configValue.as<std::string>());
}

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests_ClassPluginPropertiesTestNPU, ClassPluginPropertiesTestSuite1NPU,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests_ClassPluginPropertiesTestNPU, ClassPluginPropertiesTestSuite1NPU,
::testing::Combine(::testing::Values(ov::test::utils::getDeviceName()),
::testing::ValuesIn(plugin_internal_mutable_properties)),
ClassPluginPropertiesTestNPU::getTestCaseName);
Expand Down Expand Up @@ -279,7 +279,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests_ClassPluginPropertiesOptsTest1NPU,
::testing::ValuesIn(plugin_public_immutable_properties)),
ClassPluginPropertiesTestNPU::getTestCaseName);

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests_ClassPluginPropertiesOptsTest2NPU, ClassPluginPropertiesTestSuite3NPU,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests_ClassPluginPropertiesOptsTest2NPU, ClassPluginPropertiesTestSuite3NPU,
::testing::Combine(::testing::Values(ov::test::utils::getDeviceName()),
::testing::ValuesIn(plugin_public_mutable_properties)),
ClassPluginPropertiesTestNPU::getTestCaseName);
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/intel_npu/tests/functional/internal/overload/ov_plugin/core_integration.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ TEST_P(OVClassLoadNetworkTestNPU, LoadNetworkHETEROWithDeviceIDNoThrow) {
}
}

TEST(OVClassBasicPropsTestNPU, smoke_SetConfigDevicePropertiesThrows) {
TEST(backwardDrvComp_OVClassBasicPropsTestNPU, smoke_SetConfigDevicePropertiesThrows) {
ov::Core core;
ASSERT_THROW(core.set_property("", ov::device::properties(ov::test::utils::DEVICE_NPU, ov::enable_profiling(true))),
ov::Exception);
Expand Down
2 changes: 1 addition & 1 deletion ...u/tests/functional/shared_tests_instances/behavior/compiled_model/compiled_model_base.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVCompiledModelBaseTestOpti
::testing::ValuesIn(heteroCompiledModelConfigs)),
ov::test::utils::appendPlatformTypeTestName<OVCompiledModelBaseTestOptional>);

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVAutoExecutableNetworkTest,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVAutoExecutableNetworkTest,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(compiledModelConfigs)),
ov::test::utils::appendPlatformTypeTestName<OVAutoExecutableNetworkTest>);
Expand Down
4 changes: 2 additions & 2 deletions ...tel_npu/tests/functional/shared_tests_instances/behavior/compiled_model/import_export.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ auto heteroCompiledModelConfigs = []() -> std::vector<ov::AnyMap> {
return heteroPluginConfigs;
}();

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompiledGraphImportExportTest,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVCompiledGraphImportExportTest,
::testing::Combine(::testing::ValuesIn(convertModelTypes),
::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(compiledModelConfigs)),
Expand All @@ -51,7 +51,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVCompiledGraphImportExport
::testing::ValuesIn(heteroCompiledModelConfigs)),
ov::test::utils::appendPlatformTypeTestName<OVCompiledGraphImportExportTest>);

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVClassCompiledModelImportExportTestP,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVClassCompiledModelImportExportTestP,
::testing::Values(ov::test::utils::DEVICE_NPU),
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelImportExportTestP>);

Expand Down
14 changes: 7 additions & 7 deletions .../intel_npu/tests/functional/shared_tests_instances/behavior/compiled_model/properties.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ const auto& combineHeteroParamsExecDevices = []() -> std::vector<std::pair<ov::A
return execHeteroParams;
}();

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVClassCompiledModelGetIncorrectPropertyTest,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVClassCompiledModelGetIncorrectPropertyTest,
::testing::Values(ov::test::utils::DEVICE_NPU),
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelGetIncorrectPropertyTest>);

Expand All @@ -131,7 +131,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVClassCompiledModelGetInco
ov::test::utils::DEVICE_NPU),
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelGetIncorrectPropertyTest>);

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVClassCompiledModelGetPropertyTest,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVClassCompiledModelGetPropertyTest,
::testing::Values(ov::test::utils::DEVICE_NPU),
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelGetPropertyTest>);

Expand All @@ -140,7 +140,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVClassCompiledModelGetProp
ov::test::utils::DEVICE_NPU),
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelGetPropertyTest>);

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVClassCompiledModelGetConfigTest,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVClassCompiledModelGetConfigTest,
::testing::Values(ov::test::utils::DEVICE_NPU),
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelGetConfigTest>);

Expand All @@ -166,20 +166,20 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVClassCompileModelWithCorr
::testing::ValuesIn(heteroCompiledModelConfigs)),
ov::test::utils::appendPlatformTypeTestName<OVClassCompileModelWithCorrectPropertiesTest>);

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVClassCompiledModelPropertiesIncorrectTests,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVClassCompiledModelPropertiesIncorrectTests,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(compiledModelIncorrectConfigs)),
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelPropertiesIncorrectTests>);

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompiledModelIncorrectDevice,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVCompiledModelIncorrectDevice,
::testing::Values(ov::test::utils::DEVICE_NPU),
ov::test::utils::appendPlatformTypeTestName<OVCompiledModelIncorrectDevice>);

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompiledModelPropertiesDefaultSupportedTests,
::testing::Values(ov::test::utils::DEVICE_NPU),
ov::test::utils::appendPlatformTypeTestName<OVCompiledModelPropertiesDefaultSupportedTests>);

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVClassCompiledModelPropertiesDefaultTests,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVClassCompiledModelPropertiesDefaultTests,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(publicCompiledModelConfigs)),
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelPropertiesDefaultTests>);
Expand All @@ -195,7 +195,7 @@ INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVClassCompiledModelSetCorr
::testing::ValuesIn(compiledModelPropertiesAnyToString)),
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelSetCorrectConfigTest>);

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVClassCompiledModelSetIncorrectConfigTest,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVClassCompiledModelSetIncorrectConfigTest,
::testing::Values(ov::test::utils::DEVICE_NPU),
ov::test::utils::appendPlatformTypeTestName<OVClassCompiledModelSetIncorrectConfigTest>);

Expand Down
2 changes: 1 addition & 1 deletion ...npu/tests/functional/shared_tests_instances/behavior/ov_infer_request/batched_tensors.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ using namespace ov::test::behavior;

namespace {

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestBatchedTests,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVInferRequestBatchedTests,
::testing::Values(ov::test::utils::DEVICE_NPU),
ov::test::utils::appendPlatformTypeTestName<OVInferRequestBatchedTests>);
} // namespace
12 changes: 6 additions & 6 deletions .../intel_npu/tests/functional/shared_tests_instances/behavior/ov_infer_request/callback.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,32 @@ const std::vector<ov::AnyMap> autoConfigs = {
{ov::device::priorities(ov::test::utils::DEVICE_NPU),
ov::device::properties(ov::test::utils::DEVICE_NPU, ov::AnyMap{})}};

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestCallbackTests,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVInferRequestCallbackTests,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(configs)),
InferRequestParamsAnyMapTestName::getTestCaseName);

INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVInferRequestCallbackTests,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_Multi_BehaviorTests, OVInferRequestCallbackTests,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_MULTI),
::testing::ValuesIn(multiConfigs)),
InferRequestParamsAnyMapTestName::getTestCaseName);

INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestCallbackTests,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_Auto_BehaviorTests, OVInferRequestCallbackTests,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_AUTO),
::testing::ValuesIn(autoConfigs)),
InferRequestParamsAnyMapTestName::getTestCaseName);

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestCallbackTestsNPU,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVInferRequestCallbackTestsNPU,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(configs)),
InferRequestParamsAnyMapTestName::getTestCaseName);

INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVInferRequestCallbackTestsNPU,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_Multi_BehaviorTests, OVInferRequestCallbackTestsNPU,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_MULTI),
::testing::ValuesIn(multiConfigs)),
InferRequestParamsAnyMapTestName::getTestCaseName);

INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestCallbackTestsNPU,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_Auto_BehaviorTests, OVInferRequestCallbackTestsNPU,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_AUTO),
::testing::ValuesIn(autoConfigs)),
InferRequestParamsAnyMapTestName::getTestCaseName);
Expand Down
4 changes: 2 additions & 2 deletions ...el_npu/tests/functional/shared_tests_instances/behavior/ov_infer_request/cancellation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ using namespace ov::test::behavior;
namespace {
const std::vector<ov::AnyMap> configs = {{}};

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestCancellationTests,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVInferRequestCancellationTests,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(configs)),
InferRequestParamsAnyMapTestName::getTestCaseName);

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestCancellationTestsNPU,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVInferRequestCancellationTestsNPU,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(configs)),
InferRequestParamsAnyMapTestName::getTestCaseName);
Expand Down
2 changes: 1 addition & 1 deletion ...u/tests/functional/shared_tests_instances/behavior/ov_infer_request/compile_and_infer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ using namespace ov::test::behavior;

const std::vector<ov::AnyMap> configs = {{}};

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVCompileAndInferRequest,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVCompileAndInferRequest,
::testing::Combine(::testing::Values(getConstantGraph(ov::element::f32)),
::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(configs)),
Expand Down
2 changes: 1 addition & 1 deletion ...intel_npu/tests/functional/shared_tests_instances/behavior/ov_infer_request/inference.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace {

using namespace ov::test::behavior;

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestInferenceTests,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVInferRequestInferenceTests,
::testing::Combine(::testing::Values(tensor_roi::roi_nchw(), tensor_roi::roi_1d()),
::testing::Values(ov::test::utils::DEVICE_NPU)),
ov::test::utils::appendPlatformTypeTestName<OVInferRequestInferenceTests>);
Expand Down
Loading

0 comments on commit 41a3385

Please sign in to comment.