[G-API] Wrap GArray by TolyaTalamanov · Pull Request #18762 · opencv/opencv

TolyaTalamanov · 2020-11-09T14:51:04Z

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

I agree to contribute to the project under Apache 2 License.
To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
The PR is proposed to proper branch
There is reference to original bug report and related work
There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
The feature is well documented and sample code can be built with the project CMake

Overview

Changes

Added struct GTypeInfo which stores GShape & GKind.
Implemented function collectInfo which collect GTypeInfo from input/output node handles in the ade::Graph, such kind of information are needed to:
- Properly allocate outputs ( Python GComputation.apply() doesn't take output args, so need to allocate their inside)
- Properly extract inputs ( Need to know how to represent values coming from python. Example: If we have tuple contains 4 values and can be represented as cv::Scalar or cv::Rect)
Added CV_POINT2F to GKind to handle GArray<cv::Point2f>
Wrapped GGoodFeatures operation
Wrapped GArray<cv::Point2f> as GArrayP2f into python (GArray is supported only for output)

Implementation details

GArray is a template class, so it can't be wrapped to python as is. The solution is wrap all instances corresponding in GKind. Now only instance for GArray<cv::Point2f> (cv::GShape::CV_POINT2F) is wrapped. For this, need to create using on GArraycv::Point2f`:

using GArrayP2f = cv::GArray<cv::Point2f>

and put this:

class GAPI_EXPORTS_W_SIMPLE GArrayP2f { };

to shadow_gapi.hpp to force python generate code for this instance.
Such principle will be used for wrapping other GArray & GOpaque types.

Kind cv::GKind::CV_UNKNOWN isn't planned to be supported, yet

Build configuration

force_builders=Custom,Custom Win,Custom Mac
build_gapi_standalone:Linux x64=ade-0.1.1f
build_gapi_standalone:Win64=ade-0.1.1f
build_gapi_standalone:Mac=ade-0.1.1f
build_gapi_standalone:Linux x64 Debug=ade-0.1.1f

Xbuild_image:Custom=centos:7
Xbuildworker:Custom=linux-1
build_gapi_standalone:Custom=ade-0.1.1f

build_image:Custom=ubuntu-openvino-2020.3.0:16.04
build_image:Custom Win=openvino-2020.3.0
build_image:Custom Mac=openvino-2020.3.0

test_modules:Custom=gapi
test_modules:Custom Win=gapi
test_modules:Custom Mac=gapi

buildworker:Custom=linux-1
# disabled due high memory usage: test_opencl:Custom=ON
test_opencl:Custom=OFF
test_bigdata:Custom=1
test_filter:Custom=*

asmorkalov · 2020-11-23T09:21:59Z

@TolyaTalamanov The PR still does not pass pre-commit checks. Please take a look on CI.

TolyaTalamanov · 2020-11-24T08:01:33Z

@dkurt Could you have a look, please ?

modules/gapi/include/opencv2/gapi/garray.hpp

modules/gapi/misc/python/pyopencv_gapi.hpp

modules/gapi/misc/python/test/test_gapi_imgproc.py

TolyaTalamanov · 2020-11-25T07:53:44Z

@dkurt

TolyaTalamanov · 2020-11-25T09:43:55Z

@smirnov-alexey

alalek · 2020-11-25T09:49:41Z

modules/gapi/misc/python/test/test_gapi_imgproc.py

+        cv.gapi.core.cpu.kernels(),
+        cv.gapi.core.fluid.kernels()
+        # cv.gapi.core.plaidml.kernels()
+      ]


indentation is strange here (use 4 spaces)

alalek · 2020-11-25T09:52:21Z

modules/gapi/misc/python/test/test_gapi_imgproc.py

+    def test_good_features_to_track(self):
+        # TODO: Extend to use any type and size here
+        sz = (720, 1280)
+        in1 = np.random.randint(0, 100, sz).astype(np.uint8)


np.random

input is not determined (no way to reproduce failed test) - we don't want sporadic failures.

it is better to use some image instead (or draw it)

alalek · 2020-11-25T09:53:31Z

modules/gapi/misc/python/test/test_gapi_imgproc.py

+            # OpenCV - (num_points, 1, 2)
+            # G-API  - (num_points, 2)
+            # Comparison
+            self.assertEqual(0.0, cv.norm(expected.flatten(), actual.flatten(), cv.NORM_INF))


for pkg in pkgs

Consider providing clear messages about failures: add information about used "pkg".

alalek · 2020-11-25T10:25:57Z

modules/gapi/misc/python/test/test_gapi_streaming.py

+        ccomp.start()
+
+        # Assert
+        while cap.isOpened():


Please limit the number of processed frames.
We really don't need to process all 100 frames here.

/cc @dmatveev This note is actual for other tests too, including C++

modules/gapi/src/api/gcomputation.cpp

…/opencv into at/support-garray

TolyaTalamanov · 2020-11-26T11:47:23Z

@alalek @dkurt @smirnov-alexey Could you have a look ?

TolyaTalamanov · 2020-11-26T12:52:31Z

modules/gapi/src/api/gcomputation.cpp

+            {
+                switch (info.kind)
+                {
+                    case cv::detail::OpaqueKind::CV_POINT2F:


I'm going to use HostCtor to avoid switch here in next PR

It has been already implemented in PR: #18900

TolyaTalamanov · 2020-11-26T14:26:18Z

@dmatveev Could you have a look ?

[G-API] Wrap GArray * Wrap GArray for output * Collect in/out info in graph * Add imgproc tests * Add cv::Point2f * Update test_gapi_imgproc.py * Fix comments to review

TolyaTalamanov added category: g-api / gapi category: python bindings labels Nov 9, 2020

TolyaTalamanov changed the title ~~[G-API] Wrap GArray part 1~~ [G-API] Wrap GArray Nov 10, 2020

TolyaTalamanov force-pushed the at/support-garray branch 5 times, most recently from 3a6c459 to 48e3d24 Compare November 23, 2020 10:30

Wrap GArray for output

1940228

TolyaTalamanov force-pushed the at/support-garray branch from 48e3d24 to 1940228 Compare November 23, 2020 10:35

TolyaTalamanov added 2 commits November 23, 2020 14:21

Collect in/out info in graph

86f33cb

Add imgproc tests

d5e7af4

TolyaTalamanov force-pushed the at/support-garray branch 2 times, most recently from ae2fdaa to e3fdd97 Compare November 23, 2020 12:59

Add cv::Point2f

1fc2945

TolyaTalamanov force-pushed the at/support-garray branch from e3fdd97 to 1fc2945 Compare November 24, 2020 07:58

dkurt reviewed Nov 24, 2020

View reviewed changes

modules/gapi/include/opencv2/gapi/garray.hpp Show resolved Hide resolved

dkurt reviewed Nov 24, 2020

View reviewed changes

modules/gapi/misc/python/pyopencv_gapi.hpp Show resolved Hide resolved

dkurt reviewed Nov 24, 2020

View reviewed changes

modules/gapi/misc/python/test/test_gapi_imgproc.py Outdated Show resolved Hide resolved

Update test_gapi_imgproc.py

99ced80

asmorkalov requested a review from dkurt November 25, 2020 09:22

alalek reviewed Nov 25, 2020

View reviewed changes

smirnov-alexey reviewed Nov 25, 2020

View reviewed changes

modules/gapi/src/api/gcomputation.cpp Show resolved Hide resolved

TolyaTalamanov added 2 commits November 26, 2020 13:28

Fix comments to review

5140b24

Merge branch 'at/support-garray' of https://github.com/TolyaTalamanov…

ba7b534

…/opencv into at/support-garray

TolyaTalamanov commented Nov 26, 2020

View reviewed changes

dkurt approved these changes Nov 26, 2020

View reviewed changes

smirnov-alexey approved these changes Nov 26, 2020

View reviewed changes

alalek approved these changes Nov 26, 2020

View reviewed changes

alalek assigned dkurt Nov 27, 2020

alalek merged commit 7521f20 into opencv:master Nov 27, 2020

alalek mentioned this pull request Nov 27, 2020

Merge 4.x #18951

Merged

Uh oh!

Conversation

TolyaTalamanov commented Nov 9, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Readiness Checklist

Overview

Changes

Implementation details

Build configuration

Uh oh!

asmorkalov commented Nov 23, 2020

Uh oh!

TolyaTalamanov commented Nov 24, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

TolyaTalamanov commented Nov 25, 2020

Uh oh!

TolyaTalamanov commented Nov 25, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

TolyaTalamanov commented Nov 26, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

TolyaTalamanov Nov 26, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

TolyaTalamanov commented Nov 26, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

TolyaTalamanov commented Nov 9, 2020 •

edited

Loading

TolyaTalamanov Nov 26, 2020 •

edited

Loading