Fix master branch and resolve conflicted PRS (#8039)

This commit is contained in:
Irina Efode 2021-10-15 14:05:39 +03:00 committed by GitHub
parent ccdd0e61d5
commit e8f2249d8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -24,7 +24,6 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, OVInferenceChaining,
INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVInferenceChaining, INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, OVInferenceChaining,
::testing::Combine( ::testing::Combine(
::testing::Values(ov::element::f32),
::testing::Values(CommonTestUtils::DEVICE_HETERO), ::testing::Values(CommonTestUtils::DEVICE_HETERO),
::testing::ValuesIn(HeteroConfigs)), ::testing::ValuesIn(HeteroConfigs)),
OVInferenceChaining::getTestCaseName); OVInferenceChaining::getTestCaseName);