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

diff --cc cmake/OpenCVDetectCUDA.cmake
Simple merge

diff --cc modules/dnn/src/ocl4dnn/src/ocl4dnn_conv_spatial.cpp
Simple merge

diff --cc modules/dnn/src/onnx/onnx_importer.cpp
Simple merge

diff --cc modules/dnn/test/test_layers.cpp
Simple merge

diff --cc modules/dnn/test/test_torch_importer.cpp
index b52141913f935b1e4b5b4e261ff5b4d57aed43c5,3be22d6d25dd11f45d44149da2de83fa4558da85..9de74d6caebf9b6ba7c87b0a29a1e0f4566486d4
--- 1/modules/dnn/test/test_torch_importer.cpp
--- 2/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)

diff --cc platforms/ios/build_framework.py
Simple merge