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

alalek · alalek · commit e85b41f9be29 · 2021-01-25T22:42:13.000Z
diff --git a/modules/core/include/opencv2/core/bindings_utils.hpp b/modules/core/include/opencv2/core/bindings_utils.hpp
@@ -78,6 +78,41 @@ String testOverloadResolution(const Rect& rect)
                   rect.width, rect.height);
 }
 
+CV_WRAP static inline
+String dumpRect(const Rect& argument)
+{
+    return format("rect: (x=%d, y=%d, w=%d, h=%d)", argument.x, argument.y,
+                  argument.width, argument.height);
+}
+
+CV_WRAP static inline
+String dumpTermCriteria(const TermCriteria& argument)
+{
+    return format("term_criteria: (type=%d, max_count=%d, epsilon=%lf",
+                  argument.type, argument.maxCount, argument.epsilon);
+}
+
+CV_WRAP static inline
+String dumpRotatedRect(const RotatedRect& argument)
+{
+    return format("rotated_rect: (c_x=%f, c_y=%f, w=%f, h=%f, a=%f)",
+                  argument.center.x, argument.center.y, argument.size.width,
+                  argument.size.height, argument.angle);
+}
+
+CV_WRAP static inline
+String dumpRange(const Range& argument)
+{
+    if (argument == Range::all())
+    {
+        return "range: all";
+    }
+    else
+    {
+        return format("range: (s=%d, e=%d)", argument.start, argument.end);
+    }
+}
+
 CV_WRAP static inline
 AsyncArray testAsyncArray(InputArray argument)
 {
diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp
@@ -1149,14 +1149,14 @@ void OpenCLExecutionContext::release()
 }
 
 
+
 // true if we have initialized OpenCL subsystem with available platforms
-static bool g_isOpenCLActivated = false;
+static bool g_isOpenCLInitialized = false;
+static bool g_isOpenCLAvailable = false;
 
 bool haveOpenCL()
 {
     CV_TRACE_FUNCTION();
-    static bool g_isOpenCLInitialized = false;
-    static bool g_isOpenCLAvailable = false;
 
     if (!g_isOpenCLInitialized)
     {
@@ -1178,7 +1178,7 @@ bool haveOpenCL()
         {
             cl_uint n = 0;
             g_isOpenCLAvailable = ::clGetPlatformIDs(0, NULL, &n) == CL_SUCCESS;
-            g_isOpenCLActivated = n > 0;
+            g_isOpenCLAvailable &= n > 0;
             CV_LOG_INFO(NULL, "OpenCL: found " << n << " platforms");
         }
         catch (...)
@@ -1214,7 +1214,7 @@ bool useOpenCL()
 
 bool isOpenCLActivated()
 {
-    if (!g_isOpenCLActivated)
+    if (!g_isOpenCLAvailable)
         return false; // prevent unnecessary OpenCL activation via useOpenCL()->haveOpenCL() calls
     return useOpenCL();
 }
diff --git a/modules/dnn/misc/python/test/test_dnn.py b/modules/dnn/misc/python/test/test_dnn.py
@@ -177,7 +177,7 @@ def test_model(self):
             cv.rectangle(frame, box, (0, 255, 0))
             cv.rectangle(frame, np.array(box), (0, 255, 0))
             cv.rectangle(frame, tuple(box), (0, 255, 0))
-            # FIXIT never properly work: cv.rectangle(frame, list(box), (0, 255, 0))
+            cv.rectangle(frame, list(box), (0, 255, 0))
 
 
     def test_classification_model(self):
diff --git a/modules/dnn/src/onnx/onnx_importer.cpp b/modules/dnn/src/onnx/onnx_importer.cpp
@@ -1162,6 +1162,53 @@ void ONNXImporter::handleNode(const opencv_onnx::NodeProto& node_proto_)
                     layerParams.type = "Scale";
                 }
             }
+            else if (!haveVariables)
+            {
+                Mat inp0 = getBlob(node_proto, 0);
+                Mat inp1 = getBlob(node_proto, 1);
+
+                if (inp0.size != inp1.size && (inp0.total() != 1 || inp1.total() != 1))
+                    CV_Error_(Error::StsNotImplemented, ("Different shapes case is not supported with constant inputs: %s", layer_type.c_str()));
+
+                if (inp0.total() == 1 && inp1.total() == 1 && inp0.dims != inp1.dims)
+                {
+                    if (inp0.dims < inp1.dims)
+                    {
+                        inp0 = inp0.reshape(1, inp1.dims, inp1.size);
+                        inp0.dims = inp1.dims;
+                    }
+                    else
+                    {
+                        inp1 = inp1.reshape(1, inp0.dims, inp0.size);
+                        inp1.dims = inp0.dims;
+                    }
+                }
+
+                Mat out;
+                if (inp0.total() != inp1.total())
+                {
+                    if (inp0.total() == 1)
+                    {
+                        float coeff = isDiv ? 1.0 / inp0.at<float>(0) : inp0.at<float>(0);
+                        multiply(inp1, coeff, out);
+                    }
+                    else
+                    {
+                        float coeff = isDiv ? 1.0 / inp1.at<float>(0) : inp1.at<float>(0);
+                        multiply(inp0, coeff, out);
+                    }
+
+                }
+                else
+                {
+                    out = isDiv ? inp0 / inp1 : inp0.mul(inp1);
+                }
+
+                if (inp0.dims == 1 && inp1.dims == 1)
+                    out.dims = 1;  // to workaround dims == 1
+                addConstant(layerParams.name, out);
+                return;
+            }
             else if (outShapes[node_proto.input(0)] == outShapes[node_proto.input(1)])
             {
                 layerParams.type = "Eltwise";
@@ -1201,20 +1248,6 @@ void ONNXImporter::handleNode(const opencv_onnx::NodeProto& node_proto_)
                 }
                 layerParams.type = "Scale";
             }
-
-            if (!haveVariables)
-            {
-                Mat inp0 = getBlob(node_proto, 0);
-                Mat inp1 = getBlob(node_proto, 1);
-                if (inp0.size != inp1.size && inp1.total() != 1)
-                    CV_Error(Error::StsNotImplemented, "Constant multiply with different shapes");
-
-                Mat out = isDiv ? inp0 / inp1 : inp0.mul(inp1);
-                out = out.reshape(1, inp0.dims, inp0.size);
-                out.dims = inp0.dims;  // to workaround dims == 1
-                addConstant(layerParams.name, out);
-                return;
-            }
         }
         else if (layer_type == "Conv")
         {
@@ -1733,9 +1766,26 @@ void ONNXImporter::handleNode(const opencv_onnx::NodeProto& node_proto_)
             if (!hasVariableInps)
             {
                 std::vector<Mat> inputs(node_proto.input_size()), concatenated;
+                // Due constant folding we can get inputs with different number of dimensions
+                // Insert the missing dimension to inputs
+                MatShape inputShape;
                 for (size_t i = 0; i < inputs.size(); ++i)
                 {
                     inputs[i] = getBlob(node_proto, i);
+                    if (inputs[i].size.dims() > inputShape.size())
+                    {
+                        inputShape = shape(inputs[i]);
+                    }
+                }
+
+                // Concat-1 has default value for axis is 1: https://github.com/onnx/onnx/blob/master/docs/Changelog.md#Concat-1
+                int axis = layerParams.get<int>("axis", 1);
+                for (size_t i = 0; i < inputs.size(); ++i)
+                {
+                    MatShape targetShape = inputShape;
+                    targetShape[axis] = shape(inputs[i])[axis];
+                    CV_CheckEQ(total(targetShape), total(shape(inputs[i])), "");
+                    inputs[i] = inputs[i].reshape(0, targetShape);
                 }
                 runLayer(layerParams, inputs, concatenated);
 
diff --git a/modules/dnn/src/tensorflow/tf_importer.cpp b/modules/dnn/src/tensorflow/tf_importer.cpp
@@ -1228,8 +1228,18 @@ void TFImporter::parseNode(const tensorflow::NodeDef& layer_)
 
             int kernel_blob_index = -1;
             const tensorflow::TensorProto& kernelTensor = getConstBlob(layer, value_id, -1, &kernel_blob_index);
-            blobFromTensor(kernelTensor, layerParams.blobs[0]);
-            releaseTensor(const_cast<tensorflow::TensorProto*>(&kernelTensor));
+            const String kernelTensorName = layer.input(kernel_blob_index);
+            std::map<String, Mat>::iterator sharedWeightsIt = sharedWeights.find(kernelTensorName);
+            if (sharedWeightsIt == sharedWeights.end())
+            {
+                blobFromTensor(kernelTensor, layerParams.blobs[0]);
+                releaseTensor(const_cast<tensorflow::TensorProto*>(&kernelTensor));
+                sharedWeights[kernelTensorName] = layerParams.blobs[0];
+            }
+            else
+            {
+                layerParams.blobs[0] = sharedWeightsIt->second;
+            }
 
             if (kernel_blob_index == 1) { // In this case output is computed by x*W formula - W should be transposed
                 Mat data = layerParams.blobs[0].t();
diff --git a/modules/dnn/test/test_onnx_importer.cpp b/modules/dnn/test/test_onnx_importer.cpp
@@ -706,6 +706,11 @@ TEST_P(Test_ONNX_layers, Mish)
     testONNXModels("mish");
 }
 
+TEST_P(Test_ONNX_layers, CalculatePads)
+{
+    testONNXModels("calc_pads");
+}
+
 TEST_P(Test_ONNX_layers, Conv1d)
 {
     testONNXModels("conv1d");
diff --git a/modules/highgui/src/window_w32.cpp b/modules/highgui/src/window_w32.cpp
@@ -1118,26 +1118,20 @@ static void icvScreenToClient( HWND hwnd, RECT* rect )
 /* Calculatess the window coordinates relative to the upper left corner of the mainhWnd window */
 static RECT icvCalcWindowRect( CvWindow* window )
 {
-    const int gutter = 1;
-    RECT crect = { 0 }, trect = { 0 } , rect = { 0 };
+    RECT crect = { 0 }, trect = { 0 }, rect = { 0 };
 
     assert(window);
 
     GetClientRect(window->frame, &crect);
-    if(window->toolbar.toolbar)
+    if (window->toolbar.toolbar)
     {
         GetWindowRect(window->toolbar.toolbar, &trect);
         icvScreenToClient(window->frame, &trect);
-        SubtractRect( &rect, &crect, &trect);
+        SubtractRect(&rect, &crect, &trect);
     }
     else
         rect = crect;
 
-    rect.top += gutter;
-    rect.left += gutter;
-    rect.bottom -= gutter;
-    rect.right -= gutter;
-
     return rect;
 }
 
diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp
diff --git a/modules/python/test/test_misc.py b/modules/python/test/test_misc.py

Original file line number	Diff line number	Diff line change
`@@ -1149,14 +1149,14 @@ void OpenCLExecutionContext::release()`
`1149`	`1149`	`}`
`1150`	`1150`
`1151`	`1151`
	`1152`	`+`
`1152`	`1153`	`// true if we have initialized OpenCL subsystem with available platforms`
`1153`		`-static bool g_isOpenCLActivated = false;`
	`1154`	`+static bool g_isOpenCLInitialized = false;`
	`1155`	`+static bool g_isOpenCLAvailable = false;`
`1154`	`1156`
`1155`	`1157`	`bool haveOpenCL()`
`1156`	`1158`	`{`
`1157`	`1159`	`CV_TRACE_FUNCTION();`
`1158`		`- static bool g_isOpenCLInitialized = false;`
`1159`		`- static bool g_isOpenCLAvailable = false;`
`1160`	`1160`
`1161`	`1161`	`if (!g_isOpenCLInitialized)`
`1162`	`1162`	`{`
`@@ -1178,7 +1178,7 @@ bool haveOpenCL()`
`1178`	`1178`	`{`
`1179`	`1179`	`cl_uint n = 0;`
`1180`	`1180`	`g_isOpenCLAvailable = ::clGetPlatformIDs(0, NULL, &n) == CL_SUCCESS;`
`1181`		`- g_isOpenCLActivated = n > 0;`
	`1181`	`+ g_isOpenCLAvailable &= n > 0;`
`1182`	`1182`	`CV_LOG_INFO(NULL, "OpenCL: found " << n << " platforms");`
`1183`	`1183`	`}`
`1184`	`1184`	`catch (...)`
`@@ -1214,7 +1214,7 @@ bool useOpenCL()`
`1214`	`1214`
`1215`	`1215`	`bool isOpenCLActivated()`
`1216`	`1216`	`{`
`1217`		`- if (!g_isOpenCLActivated)`
	`1217`	`+ if (!g_isOpenCLAvailable)`
`1218`	`1218`	`return false; // prevent unnecessary OpenCL activation via useOpenCL()->haveOpenCL() calls`
`1219`	`1219`	`return useOpenCL();`
`1220`	`1220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -706,6 +706,11 @@ TEST_P(Test_ONNX_layers, Mish)`
`706`	`706`	`testONNXModels("mish");`
`707`	`707`	`}`
`708`	`708`
	`709`	`+TEST_P(Test_ONNX_layers, CalculatePads)`
	`710`	`+{`
	`711`	`+ testONNXModels("calc_pads");`
	`712`	`+}`
	`713`	`+`
`709`	`714`	`TEST_P(Test_ONNX_layers, Conv1d)`
`710`	`715`	`{`
`711`	`716`	`testONNXModels("conv1d");`