Merge pull request #20157 from mpashchenkov:mp/ocv-gapi-pnetworks

Maxim Pashchenkov · web-flow · commit 2610724ee00a · 2021-06-01T14:42:44.000Z
G-API: Python. Wrapper for networks.

* Python networks

* Added pyopencv_to

* Changed work with pyopencv_to
diff --git a/modules/gapi/include/opencv2/gapi/infer.hpp b/modules/gapi/include/opencv2/gapi/infer.hpp
@@ -693,6 +693,14 @@ template<typename... Args>
 cv::gapi::GNetPackage networks(Args&&... args) {
     return cv::gapi::GNetPackage({ cv::detail::strip(args)... });
 }
+
+inline cv::gapi::GNetPackage& operator += (      cv::gapi::GNetPackage& lhs,
+                                           const cv::gapi::GNetPackage& rhs) {
+    lhs.networks.reserve(lhs.networks.size() + rhs.networks.size());
+    lhs.networks.insert(lhs.networks.end(), rhs.networks.begin(), rhs.networks.end());
+    return lhs;
+}
+
 } // namespace gapi
 } // namespace cv
 
diff --git a/modules/gapi/misc/python/pyopencv_gapi.hpp b/modules/gapi/misc/python/pyopencv_gapi.hpp
@@ -756,6 +756,23 @@ static PyObject* pyopencv_cv_gapi_kernels(PyObject* , PyObject* py_args, PyObjec
     return pyopencv_from(pkg);
 }
 
+static PyObject* pyopencv_cv_gapi_networks(PyObject*, PyObject* py_args, PyObject*)
+{
+    using namespace cv;
+    gapi::GNetPackage pkg;
+    Py_ssize_t size = PyTuple_Size(py_args);
+    for (int i = 0; i < size; ++i)
+    {
+        gapi_ie_PyParams params;
+        PyObject* item = PyTuple_GetItem(py_args, i);
+        if (pyopencv_to(item, params, ArgInfo("PyParams", false)))
+        {
+            pkg += gapi::networks(params);
+        }
+    }
+    return pyopencv_from(pkg);
+}
+
 static PyObject* pyopencv_cv_gapi_op(PyObject* , PyObject* py_args, PyObject*)
 {
     using namespace cv;
@@ -916,6 +933,7 @@ struct PyOpenCV_Converter<cv::GOpaque<T>>
 // extend cv.gapi methods
 #define PYOPENCV_EXTRA_METHODS_GAPI \
   {"kernels", CV_PY_FN_WITH_KW(pyopencv_cv_gapi_kernels), "kernels(...) -> GKernelPackage"}, \
+  {"networks", CV_PY_FN_WITH_KW(pyopencv_cv_gapi_networks), "networks(...) -> GNetPackage"}, \
   {"__op", CV_PY_FN_WITH_KW(pyopencv_cv_gapi_op), "__op(...) -> retval\n"},
 
 
diff --git a/modules/gapi/misc/python/shadow_gapi.hpp b/modules/gapi/misc/python/shadow_gapi.hpp
@@ -58,7 +58,6 @@ namespace cv
 
    namespace gapi
    {
-       GAPI_EXPORTS_W gapi::GNetPackage networks(const cv::gapi::ie::PyParams& params);
        namespace wip
        {
            class GAPI_EXPORTS_W IStreamSource { };
diff --git a/modules/gapi/samples/face_detection_mtcnn.cpp b/modules/gapi/samples/face_detection_mtcnn.cpp
@@ -496,13 +496,6 @@ static inline std::tuple<cv::GMat, cv::GMat> run_mtcnn_p(cv::GMat &in, const std
     return std::make_tuple(regressions, scores);
 }
 
-//Operator fot PNet network package creation in the loop
-inline cv::gapi::GNetPackage& operator += (cv::gapi::GNetPackage& lhs, const cv::gapi::GNetPackage& rhs) {
-    lhs.networks.reserve(lhs.networks.size() + rhs.networks.size());
-    lhs.networks.insert(lhs.networks.end(), rhs.networks.begin(), rhs.networks.end());
-    return lhs;
-}
-
 static inline std::string get_pnet_level_name(const cv::Size &in_size) {
     return "MTCNNProposal_" + std::to_string(in_size.width) + "x" + std::to_string(in_size.height);
 }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@ namespace cv`
`58`	`58`
`59`	`59`	`namespace gapi`
`60`	`60`	`{`
`61`		`- GAPI_EXPORTS_W gapi::GNetPackage networks(const cv::gapi::ie::PyParams& params);`
`62`	`61`	`namespace wip`
`63`	`62`	`{`
`64`	`63`	`class GAPI_EXPORTS_W IStreamSource { };`
Original file line number	Diff line number	Diff line change
`@@ -496,13 +496,6 @@ static inline std::tuple<cv::GMat, cv::GMat> run_mtcnn_p(cv::GMat &in, const std`
`496`	`496`	`return std::make_tuple(regressions, scores);`
`497`	`497`	`}`
`498`	`498`
`499`		`-//Operator fot PNet network package creation in the loop`
`500`		`-inline cv::gapi::GNetPackage& operator += (cv::gapi::GNetPackage& lhs, const cv::gapi::GNetPackage& rhs) {`
`501`		`- lhs.networks.reserve(lhs.networks.size() + rhs.networks.size());`
`502`		`- lhs.networks.insert(lhs.networks.end(), rhs.networks.begin(), rhs.networks.end());`
`503`		`- return lhs;`
`504`		`-}`
`505`		`-`
`506`	`499`	`static inline std::string get_pnet_level_name(const cv::Size &in_size) {`
`507`	`500`	`return "MTCNNProposal_" + std::to_string(in_size.width) + "x" + std::to_string(in_size.height);`
`508`	`501`	`}`