From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Sat, 19 Sep 2020 17:03:08 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/3.4' into merge-3.4
X-Git-Tag: submit/tizen/20210224.033012~2^2~43
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f52a2cf5e16c5545d8e6cc7bcb1571e4d3c2cddf;p=platform%2Fupstream%2Fopencv.git

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

f52a2cf5e16c5545d8e6cc7bcb1571e4d3c2cddf
diff --cc cmake/OpenCVModule.cmake
index c66855a239,10ee406032..bd14aa2378
--- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake
@@@ -1360,12 -1337,8 +1360,12 @@@ function(ocv_add_samples
          endif()
          add_dependencies(${parent_target} ${the_target})
  
 +        if(TARGET opencv_videoio_plugins)
 +          add_dependencies(${the_target} opencv_videoio_plugins)
 +        endif()
 +
-         if(WIN32)
-           install(TARGETS ${the_target} RUNTIME DESTINATION "samples/${module_id}" COMPONENT samples)
+         if(INSTALL_BIN_EXAMPLES)
+           install(TARGETS ${the_target} RUNTIME DESTINATION "${OPENCV_SAMPLES_BIN_INSTALL_PATH}/${module_id}" COMPONENT samples)
          endif()
        endforeach()
      endif()
diff --cc modules/dnn/test/test_onnx_importer.cpp
index 0c1aae016b,993ba56be4..f9cfd290a9
--- a/modules/dnn/test/test_onnx_importer.cpp
+++ b/modules/dnn/test/test_onnx_importer.cpp
@@@ -275,19 -262,26 +275,31 @@@ TEST_P(Test_ONNX_layers, ReduceSum
      testONNXModels("reduce_sum");
  }
  
+ TEST_P(Test_ONNX_layers, ReduceMaxGlobal)
+ {
+     testONNXModels("reduce_max");
+ }
+ 
+ TEST_P(Test_ONNX_layers, Scale)
+ {
+     if (backend == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019)
+         applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER);
+     testONNXModels("scale");
+ }
+ 
  TEST_P(Test_ONNX_layers, ReduceMean3D)
  {
 -    if (backend == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019 && target != DNN_TARGET_CPU)
 +    if (backend == DNN_BACKEND_CUDA)
 +    {
 +        // ok
 +    }
 +    else if (backend == DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019 && target != DNN_TARGET_CPU)
          applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NN_BUILDER);  // Only CPU on DLIE backend is supported
 -    if (backend == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH && target != DNN_TARGET_CPU)
 +    else if (backend == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH && target != DNN_TARGET_CPU)
          applyTestTag(CV_TEST_TAG_DNN_SKIP_IE_NGRAPH);  // Only CPU on DLIE backend is supported
 -    if (target != DNN_TARGET_CPU)
 +    else if (target != DNN_TARGET_CPU)
          throw SkipTestException("Only CPU is supported");
 +
      testONNXModels("reduce_mean3d");
  }