Merge pull request #16438 from ashishkrshrivastava:opencvc

bcc99466 · Alexander Alekhin · GitHub · 6ad390a1 · d64529f6 · bcc99466
Unverified Commit bcc99466 authored Feb 07, 2020 by Alexander Alekhin Committed by GitHub Feb 07, 2020
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

darknet_io.cpp modules/dnn/src/darknet/darknet_io.cpp +0 -0

test_darknet_importer.cpp modules/dnn/test/test_darknet_importer.cpp +12 -0

No files found.
--- a/modules/dnn/src/darknet/darknet_io.cpp
+++ b/modules/dnn/src/darknet/darknet_io.cpp
--- a/modules/dnn/test/test_darknet_importer.cpp
+++ b/modules/dnn/test/test_darknet_importer.cpp
@@ -528,6 +528,11 @@ TEST_P(Test_Darknet_layers, reorg)
    testDarknetLayer("reorg");
 }

+TEST_P(Test_Darknet_layers, maxpool)
+{
+    testDarknetLayer("maxpool");
+}
+
 TEST_P(Test_Darknet_layers, convolutional)
 {
    if (target == DNN_TARGET_MYRIAD)
@@ -537,6 +542,13 @@ TEST_P(Test_Darknet_layers, convolutional)
    testDarknetLayer("convolutional", true);
 }

+TEST_P(Test_Darknet_layers, connected)
+{
+    if (backend == DNN_BACKEND_OPENCV && target == DNN_TARGET_OPENCL_FP16)
+        applyTestTag(CV_TEST_TAG_DNN_SKIP_OPENCL_FP16);
+    testDarknetLayer("connected", true);
+}
+
 INSTANTIATE_TEST_CASE_P(/**/, Test_Darknet_layers, dnnBackendsAndTargets());

 }} // namespace