Removed FPGA constant from tests (#5626)

This commit is contained in:
Ilya Lavrenov authored and GitHub committed 2021-05-13 21:53:08 +03:00
1 parent 5af767a0a2
commit f88611e5a2
4 files changed
+4 -21

No files matched your search

@@ -40,21 +40,6 @@ INSTANTIATE_TEST_CASE_P(
using IEClassNetworkTestP_VPU = IEClassNetworkTestP;
TEST_P(IEClassNetworkTestP_VPU, smoke_ImportNetworkNoThrowIfNoDeviceName) {
SKIP_IF_CURRENT_TEST_IS_DISABLED();
Core ie;
std::stringstream strm;
ExecutableNetwork executableNetwork;
ASSERT_NO_THROW(executableNetwork = ie.LoadNetwork(actualNetwork, deviceName));
SKIP_IF_NOT_IMPLEMENTED(executableNetwork.Export(strm));
if (!strm.str().empty() && deviceName.find(CommonTestUtils::DEVICE_FPGA) != std::string::npos) {
SKIP_IF_NOT_IMPLEMENTED(executableNetwork = ie.ImportNetwork(strm));
}
if (executableNetwork) {
ASSERT_NO_THROW(executableNetwork.CreateInferRequest());
}
}
TEST_P(IEClassNetworkTestP_VPU, smoke_ImportNetworkNoThrowWithDeviceName) {
SKIP_IF_CURRENT_TEST_IS_DISABLED();
Core ie;
@@ -115,8 +115,7 @@ namespace BehaviorTestsDefinitions {
if ((targetDevice == CommonTestUtils::DEVICE_HDDL) || (targetDevice == CommonTestUtils::DEVICE_GNA)) {
ASSERT_EQ(0u, InferenceEngine::ExecutorManager::getInstance()->getExecutorsNumber());
} else if ((targetDevice == CommonTestUtils::DEVICE_FPGA) ||
(targetDevice == CommonTestUtils::DEVICE_KEEMBAY) ||
} else if ((targetDevice == CommonTestUtils::DEVICE_KEEMBAY) ||
(targetDevice == CommonTestUtils::DEVICE_MYRIAD)) {
ASSERT_EQ(2u, InferenceEngine::ExecutorManager::getInstance()->getExecutorsNumber());
} else if (targetDevice == CommonTestUtils::DEVICE_MULTI) {
@@ -141,7 +140,7 @@ namespace BehaviorTestsDefinitions {
auto execNet = ie->LoadNetwork(cnnNet, targetDevice, config);
execNet.CreateInferRequest();
if ((targetDevice == CommonTestUtils::DEVICE_FPGA) || (targetDevice == CommonTestUtils::DEVICE_MYRIAD) ||
if ((targetDevice == CommonTestUtils::DEVICE_MYRIAD) ||
(targetDevice == CommonTestUtils::DEVICE_KEEMBAY)) {
ASSERT_EQ(1u, InferenceEngine::ExecutorManager::getInstance()->getExecutorsNumber());
} else if (targetDevice == CommonTestUtils::DEVICE_MULTI) {
@@ -170,7 +169,7 @@ namespace BehaviorTestsDefinitions {
auto execNet = ie->LoadNetwork(cnnNet, targetDevice, config);
execNet.CreateInferRequest();
if ((targetDevice == CommonTestUtils::DEVICE_FPGA) || (targetDevice == CommonTestUtils::DEVICE_MYRIAD) ||
if ((targetDevice == CommonTestUtils::DEVICE_MYRIAD) ||
(targetDevice == CommonTestUtils::DEVICE_KEEMBAY)) {
ASSERT_EQ(1u, InferenceEngine::ExecutorManager::getInstance()->getExecutorsNumber());
ASSERT_EQ(0u, InferenceEngine::ExecutorManager::getInstance()->getIdleCPUStreamsExecutorsNumber());
@@ -47,7 +47,7 @@ TEST_P(InferConfigTests, canSetExclusiveAsyncRequests) {
if ((targetDevice == CommonTestUtils::DEVICE_HDDL) || (targetDevice == CommonTestUtils::DEVICE_GNA)) {
ASSERT_EQ(0u, InferenceEngine::ExecutorManager::getInstance()->getExecutorsNumber());
} else if ((targetDevice == CommonTestUtils::DEVICE_FPGA) || (targetDevice == CommonTestUtils::DEVICE_MYRIAD) ||
} else if ((targetDevice == CommonTestUtils::DEVICE_MYRIAD) ||
(targetDevice == CommonTestUtils::DEVICE_KEEMBAY)) {
ASSERT_EQ(2u, InferenceEngine::ExecutorManager::getInstance()->getExecutorsNumber());
} else if (targetDevice == CommonTestUtils::DEVICE_MULTI) {
@@ -11,7 +11,6 @@ const char DEVICE_CPU[] = "CPU";
const char DEVICE_GNA[] = "GNA";
const char DEVICE_GPU[] = "GPU";
const char DEVICE_HDDL[] = "HDDL";
const char DEVICE_FPGA[] = "FPGA";
const char DEVICE_MYRIAD[] = "MYRIAD";
const char DEVICE_KEEMBAY[] = "VPUX";
const char DEVICE_MULTI[] = "MULTI";