IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove MYRIAD/HDDL related tests in auto/multi and re-enable unit tests on CI (#15485)

Browse Source 
Signed-off-by: fishbell <bell.song@intel.com>
This commit is contained in:
yanlan song
2023-02-03 22:58:04 +08:00
committed by GitHub
parent 049cfcb72c
commit f5fb22e205
7 changed files with 38 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.ci/azure/linux.yml
View File

@@ -421,7 +421,6 @@ jobs:
- script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ieMultiPluginUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ieMultiPluginUnitTests.xml
displayName: 'MULTI UT'
enabled: 'false'
- script: $(RUN_PREFIX) $(INSTALL_TEST_DIR)/ov_template_func_tests --gtest_filter=*smoke* --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-templateFuncTests.xml
displayName: 'TEMPLATE FuncTests'

1
.ci/azure/linux_debian.yml
View File

@@ -332,7 +332,6 @@ jobs:
- script: $(INSTALL_TEST_DIR)/ieMultiPluginUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-ieMultiPluginUnitTests.xml
displayName: 'MULTI UT'
enabled: 'false'
- script: |
$(INSTALL_TEST_DIR)/ov_template_func_tests --gtest_filter=*smoke* --gtest_output=xml:$(INSTALL_TEST_DIR)/TEST-templateFuncTests.xml

1
.ci/azure/windows.yml
View File

@@ -307,7 +307,6 @@ jobs:
- script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ieMultiPluginUnitTests --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-ieMultiPluginUnitTests.xml
displayName: 'MULTI UT'
enabled: 'false'
- script: call $(SETUPVARS) && $(INSTALL_TEST_DIR)\ov_template_func_tests --gtest_output=xml:$(INSTALL_TEST_DIR)\TEST-templateFuncTests.xml
displayName: 'TEMPLATE FuncTests'

26
src/tests/unit/auto/auto_select_device_failed_test.cpp
View File

@@ -259,7 +259,7 @@ TEST_P(AutoLoadFailedTest, LoadCNNetWork) {
// the test configure, for example
// ConfigParams {true, false, GENERAL, {DeviceParams {CommonTestUtils::DEVICE_GPU, false},
// DeviceParams {"MYRIAD", true},
// DeviceParams {CommonTestUtils::DEVICE_KEEMBAY, true},
// DeviceParams {CommonTestUtils::DEVICE_CPU, true}}, 2, 3, 2},
//
// every element for ConfigParams
@@ -275,28 +275,28 @@ TEST_P(AutoLoadFailedTest, LoadCNNetWork) {
// so inference request num is 4 (CPU 2, MYRIAD 2)
//
const std::vector<ConfigParams> testConfigs = {ConfigParams {true, false, GENERAL, {DeviceParams {CommonTestUtils::DEVICE_GPU, true},
DeviceParams {"MYRIAD", true},
DeviceParams {CommonTestUtils::DEVICE_KEEMBAY, true},
DeviceParams {CommonTestUtils::DEVICE_CPU, true}}, 1, 2, 2},
ConfigParams {true, false, GENERAL, {DeviceParams {CommonTestUtils::DEVICE_GPU, false},
DeviceParams {"MYRIAD", true},
DeviceParams {CommonTestUtils::DEVICE_KEEMBAY, true},
DeviceParams {CommonTestUtils::DEVICE_CPU, true}}, 2, 3, 2},
ConfigParams {true, false, GENERAL, {DeviceParams {CommonTestUtils::DEVICE_GPU, true},
DeviceParams {"MYRIAD", false},
DeviceParams {CommonTestUtils::DEVICE_KEEMBAY, false},
DeviceParams {CommonTestUtils::DEVICE_CPU, true}}, 1, 2, 2},
ConfigParams {true, false, GENERAL, {DeviceParams {CommonTestUtils::DEVICE_GPU, true},
DeviceParams {"MYRIAD", true},
DeviceParams {CommonTestUtils::DEVICE_KEEMBAY, true},
DeviceParams {CommonTestUtils::DEVICE_CPU, false}}, 1, 2, 1},
ConfigParams {true, false, GENERAL, {DeviceParams {CommonTestUtils::DEVICE_GPU, true},
DeviceParams {"MYRIAD", false},
DeviceParams {CommonTestUtils::DEVICE_KEEMBAY, false},
DeviceParams {CommonTestUtils::DEVICE_CPU, false}}, 1, 2, 1},
ConfigParams {true, false, GENERAL, {DeviceParams {CommonTestUtils::DEVICE_GPU, false},
DeviceParams {"MYRIAD", true},
DeviceParams {CommonTestUtils::DEVICE_KEEMBAY, true},
DeviceParams {CommonTestUtils::DEVICE_CPU, false}}, 2, 3, 1},
ConfigParams {true, false, GENERAL, {DeviceParams {CommonTestUtils::DEVICE_GPU, false},
DeviceParams {"MYRIAD", false},
DeviceParams {CommonTestUtils::DEVICE_KEEMBAY, false},
DeviceParams {CommonTestUtils::DEVICE_CPU, true}}, 3, 4, 2},
ConfigParams {false, false, GENERAL, {DeviceParams {CommonTestUtils::DEVICE_GPU, false},
DeviceParams {"MYRIAD", false},
DeviceParams {CommonTestUtils::DEVICE_KEEMBAY, false},
DeviceParams {CommonTestUtils::DEVICE_CPU, false}}, 3, 4, 0},
ConfigParams {true, false, GENERAL, {DeviceParams {CommonTestUtils::DEVICE_GPU, true},
DeviceParams {CommonTestUtils::DEVICE_CPU, true}}, 1, 2, 2},
@@ -313,20 +313,20 @@ const std::vector<ConfigParams> testConfigs = {ConfigParams {true, false, GENERA
ConfigParams {false, true, GENERAL, {DeviceParams {CommonTestUtils::DEVICE_GPU, true}}, 1, 0, 0},
ConfigParams {false, true, GENERAL, {DeviceParams {CommonTestUtils::DEVICE_CPU, true}}, 1, 0, 0},
ConfigParams {true, true, GENERAL, {DeviceParams {CommonTestUtils::DEVICE_GPU, false},
DeviceParams {"MYRIAD", true},
DeviceParams {CommonTestUtils::DEVICE_KEEMBAY, true},
DeviceParams {CommonTestUtils::DEVICE_CPU, true}}, 2, 2, 1},
ConfigParams {false, true, GENERAL, {DeviceParams {CommonTestUtils::DEVICE_GPU, false},
DeviceParams {"MYRIAD", true},
DeviceParams {CommonTestUtils::DEVICE_KEEMBAY, true},
DeviceParams {CommonTestUtils::DEVICE_CPU, false}}, 2, 2, 0},
ConfigParams {true, true, GENERAL, {DeviceParams {CommonTestUtils::DEVICE_GPU, false},
DeviceParams {CommonTestUtils::DEVICE_CPU, true}}, 2, 2, 1},
ConfigParams {true, false, LATENCY, {DeviceParams {CommonTestUtils::DEVICE_GPU, false},
DeviceParams {"MYRIAD", false},
DeviceParams {CommonTestUtils::DEVICE_KEEMBAY, false},
DeviceParams {CommonTestUtils::DEVICE_CPU, true}}, 3, 3, 1},
ConfigParams {true, false, LATENCY, {DeviceParams {CommonTestUtils::DEVICE_GPU, false},
DeviceParams {CommonTestUtils::DEVICE_CPU, true}}, 2, 2, 1},
ConfigParams {true, false, THROUGHPUT, {DeviceParams {CommonTestUtils::DEVICE_GPU, false},
DeviceParams {"MYRIAD", false},
DeviceParams {CommonTestUtils::DEVICE_KEEMBAY, false},
DeviceParams {CommonTestUtils::DEVICE_CPU, true}}, 3, 4, 2},
ConfigParams {true, false, THROUGHPUT, {DeviceParams {CommonTestUtils::DEVICE_GPU, false},
DeviceParams {CommonTestUtils::DEVICE_CPU, true}}, 2, 3, 2}

8
src/tests/unit/auto/exec_network_get_metrics.cpp
View File

@@ -311,14 +311,6 @@ const std::vector<ConfigParams> testConfigs = {
ConfigParams {true, 3, 5, false, 2, 5, true, CommonTestUtils::DEVICE_KEEMBAY, 8, 0},
ConfigParams {false, 3, 5, true, 2, 5, false, CommonTestUtils::DEVICE_KEEMBAY, 2, 0},
ConfigParams {true, 3, 5, true, 2, 5, false, CommonTestUtils::DEVICE_KEEMBAY, 2, 0},
ConfigParams {false, 3, -1, false, 2, -1, true, "MYRIAD", 1, 0},
ConfigParams {true, 3, -1, false, 2, -1, true, "MYRIAD", 6, 0},
ConfigParams {false, 3, -1, true, 2, -1, false, "MYRIAD", 2, 0},
ConfigParams {true, 3, -1, true, 2, -1, false, "MYRIAD", 2, 0},
ConfigParams {false, 3, 5, false, 2, 5, true, "MYRIAD", 1, 0},
ConfigParams {true, 3, 5, false, 2, 5, true, "MYRIAD", 6, 0},
ConfigParams {false, 3, 5, true, 2, 5, false, "MYRIAD", 2, 0},
ConfigParams {true, 3, 5, true, 2, 5, false, "MYRIAD", 2, 0},
};
INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, ExecNetworkGetMetric,

25
src/tests/unit/auto/get_device_list.cpp
View File

@@ -33,8 +33,7 @@ const char igpuFullDeviceName[] = "Intel(R) Gen9 HD Graphics (iGPU)";
const char dgpuFullDeviceName[] = "Intel(R) Iris(R) Xe MAX Graphics (dGPU)";
// const char myriadFullDeviceName[] = "Intel Movidius Myriad X VPU";
// const char vpuxFullDeviceName[] = "";
const std::vector<std::string> availableDevs = {"CPU", "GPU.0", "GPU.1",
"MYRIAD.9.2-ma2480", "MYRIAD.9.1-ma2480", "VPUX"};
const std::vector<std::string> availableDevs = {"CPU", "GPU.0", "GPU.1", "VPUX"};
using ConfigParams = std::tuple<
std::string, // Priority devices
std::string // expect metaDevices
@@ -97,21 +96,17 @@ TEST_P(GetDeviceListTest, GetDeviceListTestWithExcludeList) {
const std::vector<ConfigParams> testConfigs = {
//
ConfigParams {"CPU,GPU,MYRIAD,VPUX",
"CPU,GPU,MYRIAD,VPUX"},
ConfigParams {"VPUX,GPU,CPU,-MYRIAD",
"VPUX,GPU,CPU"},
ConfigParams {"-VPUX,GPU,CPU,MYRIAD,-MYRIAD.9.2-ma2480",
"GPU,CPU,MYRIAD.9.1-ma2480"},
ConfigParams {"-GPU.0,GPU,CPU,MYRIAD",
"GPU.1,CPU,MYRIAD"},
ConfigParams {"CPU,GPU,VPUX",
"CPU,GPU,VPUX"},
ConfigParams {"VPUX,GPU,CPU,-GPU.0",
"VPUX,GPU.1,CPU"},
ConfigParams {"-GPU.0,GPU,CPU",
"GPU.1,CPU"},
ConfigParams {"-GPU.0,GPU",
"GPU.1"},
ConfigParams {"MYRIAD,-MYRIAD.9.2-ma2480",
"MYRIAD.9.1-ma2480"},
ConfigParams {"-GPU.0", "CPU,GPU.1,MYRIAD.9.2-ma2480,MYRIAD.9.1-ma2480,VPUX"},
ConfigParams {"-GPU.0,-MYRIAD.9.2-ma2480", "CPU,GPU.1,MYRIAD.9.1-ma2480,VPUX"},
ConfigParams {"-GPU.0,-MYRIAD.9.2-ma2480,-CPU", "GPU.1,MYRIAD.9.1-ma2480,VPUX"}
ConfigParams {"-GPU.0", "CPU,GPU.1,VPUX"},
ConfigParams {"-GPU.0,-GPU.1", "CPU,VPUX"},
ConfigParams {"-GPU.0,-CPU", "GPU.1,VPUX"}
};

36
src/tests/unit/auto/parse_meta_device_test.cpp
View File

@@ -41,10 +41,8 @@ const char igpuFullDeviceName[] = "Intel(R) Gen9 HD Graphics (iGPU)";
const char dgpuFullDeviceName[] = "Intel(R) Iris(R) Xe MAX Graphics (dGPU)";
// const char myriadFullDeviceName[] = "Intel Movidius Myriad X VPU";
// const char vpuxFullDeviceName[] = "";
const std::vector<std::string> availableDevs = {"CPU", "GPU.0", "GPU.1",
"MYRIAD.9.2-ma2480", "MYRIAD.9.1-ma2480", "VPUX"};
const std::vector<std::string> availableDevsNoID = {"CPU", "GPU",
"MYRIAD", "VPUX"};
const std::vector<std::string> availableDevs = {"CPU", "GPU.0", "GPU.1", "VPUX"};
const std::vector<std::string> availableDevsNoID = {"CPU", "GPU", "VPUX"};
using ConfigParams = std::tuple<
std::string, // Priority devices
std::vector<DeviceInformation>, // expect metaDevices
@@ -232,44 +230,40 @@ const std::vector<ConfigParams> testConfigs = {
// {"MYRIAD.9.1-ma2480", {}, 3, "9.1-ma2480", "MYRIAD_9.1-ma2480", 2},
// {"VPUX", {}, 4, "", "VPUX_", 3}}, false},
//
ConfigParams {"CPU,GPU,MYRIAD,VPUX",
ConfigParams {"CPU,GPU,VPUX",
{{"CPU", {}, -1, "", "CPU_", 0},
{"GPU.0", {}, -1, "", std::string(igpuFullDeviceName) + "_0", 1},
{"GPU.1", {}, -1, "", std::string(dgpuFullDeviceName) + "_1", 1},
{"MYRIAD", {}, -1, "", "MYRIAD_", 2},
{"VPUX", {}, -1, "", "VPUX_", 3}}, false},
ConfigParams {"VPUX,GPU,CPU",
{"VPUX", {}, -1, "", "VPUX_", 2}}, false},
ConfigParams {"VPUX,GPU,CPU",
{{"VPUX", {}, -1, "", "VPUX_", 0},
{"GPU.0", {}, -1, "", std::string(igpuFullDeviceName) + "_0", 1},
{"GPU.1", {}, -1, "", std::string(dgpuFullDeviceName) + "_1", 1},
{"CPU", {}, -1, "", "CPU_", 2}}, false},
ConfigParams {"CPU(1),GPU(2),VPUX(4)",
ConfigParams {"CPU(1),GPU(2),VPUX(4)",
{{"CPU", {}, 1, "", "CPU_", 0},
{"GPU.0", {}, 2, "", std::string(igpuFullDeviceName) + "_0", 1},
{"GPU.1", {}, 2, "", std::string(dgpuFullDeviceName) + "_1", 1},
{"VPUX", {}, 4, "", "VPUX_", 2}}, false},
ConfigParams {"CPU(-1),GPU,MYRIAD,VPUX", {}, true},
ConfigParams {"CPU(NA),GPU,MYRIAD,VPUX", {}, true},
ConfigParams {"CPU(-1),GPU,VPUX", {}, true},
ConfigParams {"CPU(NA),GPU,VPUX", {}, true},
ConfigParams {"CPU(3),GPU.1,MYRIAD.9.2-ma2480,VPUX",
ConfigParams {"CPU(3),GPU.1,VPUX",
{{"CPU", {}, 3, "", "CPU_", 0},
{"GPU.1", {}, -1, "", std::string(dgpuFullDeviceName) + "_1", 1},
{"MYRIAD.9.2-ma2480", {}, -1, "", "MYRIAD_9.2-ma2480", 2},
{"VPUX", {}, -1, "", "VPUX_", 3}}, false},
ConfigParams {"VPUX,MYRIAD.9.2-ma2480,GPU.1,CPU(3)",
{"VPUX", {}, -1, "", "VPUX_", 2}}, false},
ConfigParams {"VPUX,GPU.1,CPU(3)",
{{"VPUX", {}, -1, "", "VPUX_", 0},
{"MYRIAD.9.2-ma2480", {}, -1, "", "MYRIAD_9.2-ma2480", 1},
{"GPU.1", {}, -1, "", std::string(dgpuFullDeviceName) + "_1", 2},
{"CPU", {}, 3, "", "CPU_", 3}}, false}
{"GPU.1", {}, -1, "", std::string(dgpuFullDeviceName) + "_1", 1},
{"CPU", {}, 3, "", "CPU_", 2}}, false}
};
const std::vector<ConfigParams> testConfigsNoID = {
ConfigParams {"CPU,GPU,MYRIAD,VPUX",
ConfigParams {"CPU,GPU,VPUX",
{{"CPU", {}, -1, "", "CPU_", 0},
{"GPU", {}, -1, "0", std::string(igpuFullDeviceName) + "_0", 1},
{"MYRIAD", {}, -1, "", "MYRIAD_", 2},
{"VPUX", {}, -1, "", "VPUX_", 3}}, false},
{"VPUX", {}, -1, "", "VPUX_", 2}}, false},
};