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 committed Jun 19, 2024
1 parent 6d4f060 commit 3abbf34
Show file tree
Hide file tree
Showing 24 changed files with 86 additions and 92 deletions.
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
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);
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
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,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 @@ -227,7 +227,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 @@ -288,7 +288,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
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
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestCallbackTestsNPU,
::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
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,27 @@ const std::vector<ov::AnyMap> autoConfigs = {
{ov::device::priorities(ov::test::utils::DEVICE_NPU),
ov::device::properties(ov::test::utils::DEVICE_NPU, {})}};

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

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

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

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

INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestIOTensorTest,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_Auto_BehaviorTests, OVInferRequestIOTensorTest,
::testing::Combine(::testing::Values(ov::test::utils::DEVICE_AUTO),
::testing::ValuesIn(autoConfigs)),
InferRequestParamsAnyMapTestName::getTestCaseName);
Expand All @@ -54,32 +54,32 @@ const std::vector<ov::element::Type> prcs = {
ov::element::u8, ov::element::u16, ov::element::u32, ov::element::u64,
};

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestIOTensorSetPrecisionTest,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVInferRequestIOTensorSetPrecisionTest,
::testing::Combine(::testing::ValuesIn(prcs), ::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(configs)),
ov::test::utils::appendPlatformTypeTestName<OVInferRequestIOTensorSetPrecisionTest>);

INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, OVInferRequestIOTensorSetPrecisionTest,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_Multi_BehaviorTests, OVInferRequestIOTensorSetPrecisionTest,
::testing::Combine(::testing::ValuesIn(prcs), ::testing::Values(ov::test::utils::DEVICE_MULTI),
::testing::ValuesIn(multiConfigs)),
ov::test::utils::appendPlatformTypeTestName<OVInferRequestIOTensorSetPrecisionTest>);

INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestIOTensorSetPrecisionTest,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_Auto_BehaviorTests, OVInferRequestIOTensorSetPrecisionTest,
::testing::Combine(::testing::ValuesIn(prcs), ::testing::Values(ov::test::utils::DEVICE_AUTO),
::testing::ValuesIn(autoConfigs)),
ov::test::utils::appendPlatformTypeTestName<OVInferRequestIOTensorSetPrecisionTest>);

INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferRequestIOTensorSetPrecisionTestNPU,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_BehaviorTests, OVInferRequestIOTensorSetPrecisionTestNPU,
::testing::Combine(::testing::ValuesIn(prcs), ::testing::Values(ov::test::utils::DEVICE_NPU),
::testing::ValuesIn(configs)),
ov::test::utils::appendPlatformTypeTestName<OVInferRequestIOTensorSetPrecisionTestNPU>);

INSTANTIATE_TEST_SUITE_P(smoke_Mutli_BehaviorTests, OVInferRequestIOTensorSetPrecisionTestNPU,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_Mutli_BehaviorTests, OVInferRequestIOTensorSetPrecisionTestNPU,
::testing::Combine(::testing::ValuesIn(prcs), ::testing::Values(ov::test::utils::DEVICE_MULTI),
::testing::ValuesIn(multiConfigs)),
ov::test::utils::appendPlatformTypeTestName<OVInferRequestIOTensorSetPrecisionTestNPU>);

INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, OVInferRequestIOTensorSetPrecisionTestNPU,
INSTANTIATE_TEST_SUITE_P(backwardDrvComp_smoke_Auto_BehaviorTests, OVInferRequestIOTensorSetPrecisionTestNPU,
::testing::Combine(::testing::ValuesIn(prcs), ::testing::Values(ov::test::utils::DEVICE_AUTO),
::testing::ValuesIn(autoConfigs)),
ov::test::utils::appendPlatformTypeTestName<OVInferRequestIOTensorSetPrecisionTestNPU>);
Expand Down
Loading

0 comments on commit 3abbf34

Please sign in to comment.