Skip to content

Commit 28aab13

Browse files
committed
dnn(test): update tests for OpenVINO 2021.2
1 parent 752cc26 commit 28aab13

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

modules/dnn/perf/perf_net.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ PERF_TEST_P_(DNNTestNetwork, YOLOv3)
206206
if (backend == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH && target == DNN_TARGET_OPENCL_FP16)
207207
throw SkipTestException("Test is disabled in OpenVINO 2020.4");
208208
#endif
209-
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021010000) // nGraph compilation failure
209+
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_GE(2021010000) // nGraph compilation failure
210210
if (target == DNN_TARGET_MYRIAD)
211211
throw SkipTestException("");
212212
#endif
@@ -241,7 +241,7 @@ PERF_TEST_P_(DNNTestNetwork, YOLOv4_tiny)
241241
{
242242
if (backend == DNN_BACKEND_HALIDE)
243243
throw SkipTestException("");
244-
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021010000) // nGraph compilation failure
244+
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_GE(2021010000) // nGraph compilation failure
245245
if (target == DNN_TARGET_MYRIAD)
246246
throw SkipTestException("");
247247
#endif
@@ -276,9 +276,9 @@ PERF_TEST_P_(DNNTestNetwork, Inception_v2_Faster_RCNN)
276276
if (backend == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019)
277277
throw SkipTestException("Test is disabled in OpenVINO 2019R2");
278278
#endif
279-
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021010000)
280-
if (backend == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH && target == DNN_TARGET_MYRIAD)
281-
throw SkipTestException("Test is disabled in OpenVINO 2021.1 / MYRIAD");
279+
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_GE(2021010000)
280+
if (target == DNN_TARGET_MYRIAD)
281+
throw SkipTestException("Test is disabled in OpenVINO 2021.1+ / MYRIAD");
282282
#endif
283283
if (backend == DNN_BACKEND_HALIDE ||
284284
(backend == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019 && target != DNN_TARGET_CPU) ||

modules/dnn/test/test_darknet_importer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ TEST_P(Test_Darknet_nets, YOLOv4_tiny)
625625
target == DNN_TARGET_CPU ? CV_TEST_TAG_MEMORY_512MB : CV_TEST_TAG_MEMORY_1GB
626626
);
627627

628-
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_EQ(2021010000) // nGraph compilation failure
628+
#if defined(INF_ENGINE_RELEASE) && INF_ENGINE_VER_MAJOR_GE(2021010000) // nGraph compilation failure
629629
if (target == DNN_TARGET_MYRIAD)
630630
applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_MYRIAD, CV_TEST_TAG_DNN_SKIP_IE_VERSION);
631631
#endif

0 commit comments

Comments
 (0)