Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 25 Sep 2021 17:50:00 +0000 (17:50 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 25 Sep 2021 17:50:00 +0000 (17:50 +0000)
12 files changed:
1  2 
3rdparty/openvx/hal/openvx_hal.cpp
3rdparty/openvx/hal/openvx_hal.hpp
cmake/OpenCVDetectInferenceEngine.cmake
modules/core/src/system.cpp
modules/dnn/src/layers/region_layer.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_darknet_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/imgproc/include/opencv2/imgproc/hal/hal.hpp
modules/imgproc/src/hal_replacement.hpp
modules/photo/src/inpaint.cpp
samples/dnn/text_detection.py

Simple merge
Simple merge
Simple merge
@@@ -69,7 -63,8 +69,8 @@@ class RegionLayerImpl CV_FINAL : publi
  {
  public:
      int coords, classes, anchors, classfix;
 -    float thresh, nmsThreshold, scale_x_y;
 +    float thresh, scale_x_y;
+     int new_coords;
      bool useSoftmax, useLogistic;
  #ifdef HAVE_OPENCL
      UMat blob_umat;
      {
  #ifdef HAVE_DNN_NGRAPH
      if (backendId == DNN_BACKEND_INFERENCE_ENGINE_NGRAPH)
-         return INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2020_2) && preferableTarget != DNN_TARGET_MYRIAD;
+         return INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2020_2) && preferableTarget != DNN_TARGET_MYRIAD && new_coords == 0;
  #endif
-             return true;
 +#ifdef HAVE_CUDA
 +        if (backendId == DNN_BACKEND_CUDA)
++            return new_coords == 0;
 +#endif
          return backendId == DNN_BACKEND_OPENCV;
      }
  
Simple merge
Simple merge