From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Mon, 28 Sep 2020 21:33:29 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/3.4' into merge-3.4
X-Git-Tag: submit/tizen/20210224.033012~2^2~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=295afd58820c79e4cc9ee4f7c732943b74196ba4;p=platform%2Fupstream%2Fopencv.git

Merge remote-tracking branch 'upstream/3.4' into merge-3.4
---

295afd58820c79e4cc9ee4f7c732943b74196ba4
diff --cc modules/dnn/test/test_torch_importer.cpp
index b52141913f,3be22d6d25..9de74d6cae
--- a/modules/dnn/test/test_torch_importer.cpp
+++ b/modules/dnn/test/test_torch_importer.cpp
@@@ -112,17 -112,8 +112,17 @@@ public
  TEST_P(Test_Torch_layers, run_convolution)
  {
      // Output reference values are in range [23.4018, 72.0181]
 -    double l1 = (target == DNN_TARGET_OPENCL_FP16 || target == DNN_TARGET_MYRIAD) ? 0.08 : default_l1;
 -    double lInf = (target == DNN_TARGET_OPENCL_FP16 || target == DNN_TARGET_MYRIAD) ? 0.43 : default_lInf;
 +    double l1 = default_l1, lInf = default_lInf;
 +    if (target == DNN_TARGET_OPENCL_FP16 || target == DNN_TARGET_MYRIAD)
 +    {
 +        l1 = 0.08;
-         lInf = 0.42;
++        lInf = 0.43;
 +    }
 +    else if (target == DNN_TARGET_CUDA_FP16)
 +    {
 +        l1 = 0.08;
 +        lInf = 0.5;
 +    }
      runTorchNet("net_conv", "", false, true, true, l1, lInf);
  }
  
@@@ -184,16 -164,8 +184,16 @@@ TEST_P(Test_Torch_layers, run_concat
  
  TEST_P(Test_Torch_layers, run_depth_concat)
  {
 -    runTorchNet("net_depth_concat", "", false, true, true, 0.0,
 -                target == DNN_TARGET_OPENCL_FP16 ? 0.032 : 0.0);
 +    double lInf = 0.0;
 +    if (target == DNN_TARGET_OPENCL_FP16)
 +    {
-         lInf = 0.021;
++        lInf = 0.032;
 +    }
 +    else if (target == DNN_TARGET_CUDA_FP16)
 +    {
 +        lInf = 0.03;
 +    }
 +    runTorchNet("net_depth_concat", "", false, true, true, 0.0, lInf);
  }
  
  TEST_P(Test_Torch_layers, run_deconv)