[G-API]: findContours() and boundingRect() Standard Kernels Implementation by OrestChura · Pull Request #18510 · opencv/opencv

OrestChura · 2020-10-05T06:52:07Z

These changes:

Add findContours() standard kernel
- provide API and documentation:
  - as OpenCV provides two overloads whether to calculate hierarchy or not, but they differ by only the output in sight of G-API, two different G-API functions and kernels implemented
- support OCV backend
- provide accuracy tests
divide G-API Imgproc documentation into more parts according to imgproc module parts
- some typos connected with division into parts corrected
provide GArray<GArray> overload for get_out function to convert correctly into vector<vector>
Add boundingRect() standard kernel
- provide API and documentation:
 - GOpaque used as an output
 - as OpenCV provides two possibilities whether to take a gray-scale image or a set of 2D points (Point2i or Point2f supported), three different overloads of a single G-API function and three kernels implemented
 - for a gray-scale image the overload via GMat
 - for a set of Point2i - the one via GArray<Point2i>
 - set of Point2f -> GArray<Point2f>
- support OCV backend
- provide accuracy tests
comparison function for Rects provided
some typos in gapi_tests_common corrected

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 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

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

build_image:Custom=centos:7
buildworker:Custom=linux-1
build_gapi_standalone:Custom=ade-0.1.1f

Xbuild_image:Custom=ubuntu-openvino-2020.3.0:16.04
Xbuild_image:Custom Win=openvino-2020.3.0
Xbuild_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=*

OrestChura · 2020-10-05T06:53:57Z

@anna-khakimova please take a look

anna-khakimova · 2020-10-05T10:47:47Z

@AsyaPronina please take a look

dmatveev · 2020-10-05T18:30:13Z

Warnings & failure with custom build

OrestChura · 2020-10-05T19:47:20Z

@mpashchenkov

OrestChura · 2020-10-06T01:48:11Z

failure with custom build

Seems like this failure (most of warnings and streaming test fails) is in master as all the custom Linux builds are red because of this

Working on my own warnings still, thanks

- API and documentation provided: - as OpenCV provides two overloads whether to calculate hierarchy or not, but they differ by only the output in sight of G-API, two different G-API functions and kernels implemented - G-API Imgproc documentation divided into more parts according to imgproc module parts - some typos connected with division into parts corrected - `GArray<GArray>` overload for `get_out` function provided to coonvert correctly into `vector<vector>` - OCV backend supported - accuracy tests provided

- API and documentation provided: - GOpaque<Rect> used as an output - as OpenCV provides two possibilities whether to take a gray-scale image or a set of 2D points (`Point2i` or `Point2f` supported), three different overloads of a single G-API function and three kernels implemented - for a gray-scale image the overload via `GMat` - for a set of `Point2i` - the one via GArray<`Point2i`> - set of `Point2f` -> GArray<`Point2f`> - OCV backend supported - accuracy tests provided - comparison function for Rects provided - some typos in `gapi_tests_common` corrected

modules/gapi/test/common/gapi_imgproc_tests_inl.hpp

modules/gapi/include/opencv2/gapi/imgproc.hpp

modules/gapi/src/api/kernels_imgproc.cpp

- split tests - Fix Windows warnings

modules/gapi/test/common/gapi_imgproc_tests_inl.hpp

alalek · 2020-10-19T17:14:13Z

modules/gapi/test/common/gapi_imgproc_tests_inl.hpp

+    // Draw random ellipses on given mat of given size and type
+    void initMatForFindingContours(cv::Mat& mat, const cv::Size& sz, int type)
+    {
+        cv::RNG rng(time(nullptr));


Never do that.

Tests must be reproducible (they are here to catch regressions in the code, not an issues from algorithms).
Reuse cv::theRNG() (probably by reference).

/cc @dmatveev

Oh, I'm really sorry! I've got it now much more clearly, I think.
So, even if it is not what caused issues, I should get rid of this time() I've added to tests when will fix this...
Thank you!

- Fix unnecessary precision losses

modules/gapi/include/opencv2/gapi/imgproc.hpp

modules/gapi/test/cpu/gapi_imgproc_tests_cpu.cpp

modules/gapi/test/common/gapi_imgproc_tests_inl.hpp

- Hierarchical -> H - added cv::GMatDesc::isVectorPoins() - added support of giving a set of points to boundingRect()

modules/gapi/src/api/gmat.cpp

mpashchenkov

Ok.

alalek · 2020-10-30T10:17:47Z

modules/gapi/include/opencv2/gapi/gmat.hpp


    bool isND() const { return !dims.empty(); }

+    // Checks if the passed mat is a set of n-dimetional points of the given depth


alalek · 2020-10-30T10:19:30Z

modules/gapi/include/opencv2/gapi/imgproc.hpp

+The function retrieves contours from the binary image using the algorithm @cite Suzuki85 .
+The contours are a useful tool for shape analysis and object detection and recognition.
+See squares.cpp in the OpenCV sample directory.
+@note Since opencv 3.2 source image is not modified by this function.


This note doesn't make sense for G-API module.

I see, can agree with you. Input Mat actually never changes in G-API..
But on the one hand, I thought it could be important somehow to preserve the notes from OpenCV docs.
On the other hand - since it is a new operation for G-API, there is no need to mention the changes of API of OpenCV 3.2, right?
So, I should just remove this note, am I correct about the logic of this decision?

alalek · 2020-10-30T10:21:45Z

modules/gapi/include/opencv2/gapi/imgproc.hpp

+@return GArray of detected contours. Each contour is stored as a GArray of points.
+ */
+GAPI_EXPORTS GArray<GArray<Point>>
+findContours(const GMat &src, const int mode, const int method, const Point &offset = Point());


int mode
int method

Consider using enums instead.

offset

Not really needed.
At least in form of constant (used to process ROIs, so it should be some dynamic parameter).
/cc @dmatveev

enums used instead of ints

offset is GOpaque now to be dynamic. It is required argument now though. Will return default value back later, when GOpaque supports ConstVal initialization

alalek · 2020-10-30T10:27:57Z

modules/gapi/test/common/gapi_tests_common.hpp

    double _tol;
 };

+class AbsToleranceRect : public WrappableRect<AbsToleranceRect>


Intersection over union?

replaced this version of comparison by IoU. Thanks for advice!

alalek · 2020-10-30T10:28:42Z

modules/gapi/test/common/gapi_tests_common.hpp

+    AbsToleranceRect(double tol) : _tol(tol) {}
+    bool operator() (const cv::Rect& in1, const cv::Rect& in2) const
+    {
+        double abs_err = (  static_cast<double>(std::abs(in1.x - in2.x))


"Intersection over union" (IoU)?

replaced. Thanks for advice!

- IoU comparison function added for Rects - isPointsVector moved from a GMatDesc method to a separate function in imgproc.hpp - enums instead of int - typos corrected

TolyaTalamanov · 2020-11-02T07:54:00Z

modules/gapi/include/opencv2/gapi/cpu/gcpukernel.hpp

 {
 };

+//FIXME(dm): GArray<vector<U>>/GArray<GArray<U>> conversion should be done more gracefully in the system


Put space after //

TolyaTalamanov · 2020-11-02T08:00:09Z

modules/gapi/test/common/gapi_tests_common.hpp

+                                / std::max(1, std::abs(in2.height))) / 4.0;
+        if (abs_err > _tol)
+        {
+            std::cout << "AbsToleranceRect error: abs_err=" << abs_err << "  tolerance=" << _tol


Debug prints ?

Leaved as is for now, will discuss the possibility -> std::cerr later

- findContours: Point offset -> GOpaque<Point> - removed "straight" comparison for Rects, IoU available only - changed vectors initialization -> fix Debug test run - Some typos

OrestChura · 2020-11-09T09:42:08Z

@dmatveev Please take a look

alalek · 2020-11-09T11:18:08Z

modules/gapi/include/opencv2/gapi/imgproc.hpp

+GAPI_EXPORTS GArray<GArray<Point>>
+findContours(const GMat &src, const RetrievalModes mode, const ContourApproximationModes method,
+             // FIXME oc: make default value offset = Point()
+             const GOpaque<Point> &offset);


add overload without offset?

Yes! Thank you! It will be better when there is ConstVal for GOpaque appeared, but for a temporary workaround for functionality it's great

alalek · 2020-11-09T11:22:36Z

modules/gapi/include/opencv2/gapi/imgproc.hpp

+}
+
+// Checks if the passed mat is a set of n-dimentional points of the given depth
+bool isPointsVector(const int chan, const cv::Size &size, const int depth,


isPointsVector

Why "points"?

Refer to OpenCV functionality. It is called checkVector. Also you may want to use checkArray() naming here.

@alalek This checks if it's vector of points represented via GMatDesc. Although, I agree that this naming is debatable.
Don't want to refer fully to checkVector() method as this is a cut version of it, not fully corresponding to all the functionality of the original Mat::checkVector().
Do you insist to rename to checkArray()?

this name works well, given its intent, I believe

alalek · 2020-11-09T11:23:10Z

modules/gapi/include/opencv2/gapi/imgproc.hpp

 */

+namespace {
+void checkMetaForFindingContours(const int depth, const int chan, const int mode)


"validateSomething"?

@alalek like validateFindingContoursMeta? Changed

- overload without offset added (as a temporary workaround) - checkMetaForFindingContours -> validateFindingContoursMeta - added ostream overload for enums used in tests

dmatveev

LGTM, 👍 thanks!

dmatveev · 2020-11-11T07:55:19Z

modules/gapi/include/opencv2/gapi/imgproc.hpp

+}
+
+// Checks if the passed mat is a set of n-dimentional points of the given depth
+bool isPointsVector(const int chan, const cv::Size &size, const int depth,


this name works well, given its intent, I believe

[G-API]: findContours() and boundingRect() Standard Kernels Implementation * Add findContours() standard kernel - API and documentation provided: - as OpenCV provides two overloads whether to calculate hierarchy or not, but they differ by only the output in sight of G-API, two different G-API functions and kernels implemented - G-API Imgproc documentation divided into more parts according to imgproc module parts - some typos connected with division into parts corrected - `GArray<GArray>` overload for `get_out` function provided to coonvert correctly into `vector<vector>` - OCV backend supported - accuracy tests provided * Add boundingRect() standard kernel - API and documentation provided: - GOpaque<Rect> used as an output - as OpenCV provides two possibilities whether to take a gray-scale image or a set of 2D points (`Point2i` or `Point2f` supported), three different overloads of a single G-API function and three kernels implemented - for a gray-scale image the overload via `GMat` - for a set of `Point2i` - the one via GArray<`Point2i`> - set of `Point2f` -> GArray<`Point2f`> - OCV backend supported - accuracy tests provided - comparison function for Rects provided - some typos in `gapi_tests_common` corrected * Fix precommit windows warnings * - Addressing comments: - split tests - Fix Windows warnings * Static_cast for warnings * - Remove randomness - Fix unnecessary precision losses * - Forgot reference for RNG * addressing comments * equalizeHist -> no group * `const` addedin new functions * Address suggestions: - Hierarchical -> H - added cv::GMatDesc::isVectorPoins() - added support of giving a set of points to boundingRect() * Addressing comments - IoU comparison function added for Rects - isPointsVector moved from a GMatDesc method to a separate function in imgproc.hpp - enums instead of int - typos corrected * Addressing comments - findContours: Point offset -> GOpaque<Point> - removed "straight" comparison for Rects, IoU available only - changed vectors initialization -> fix Debug test run - Some typos * added comment for later upgrades * Fix not to corrupt docs by FIXME * Addressing commens - overload without offset added (as a temporary workaround) - checkMetaForFindingContours -> validateFindingContoursMeta - added ostream overload for enums used in tests

OrestChura added test feature category: g-api / gapi labels Oct 5, 2020

OrestChura added 3 commits October 19, 2020 09:44

Fix precommit windows warnings

ede8c65

OrestChura force-pushed the oc/boundingRect branch from ffb4ff6 to ede8c65 Compare October 19, 2020 07:06

mpashchenkov reviewed Oct 19, 2020

View reviewed changes

modules/gapi/test/common/gapi_imgproc_tests_inl.hpp Outdated Show resolved Hide resolved

modules/gapi/test/common/gapi_imgproc_tests_inl.hpp Outdated Show resolved Hide resolved

mpashchenkov reviewed Oct 19, 2020

View reviewed changes

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

mpashchenkov reviewed Oct 19, 2020

View reviewed changes

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

- Addressing comments:

0210f3a

- split tests - Fix Windows warnings

mpashchenkov reviewed Oct 19, 2020

View reviewed changes

modules/gapi/test/common/gapi_imgproc_tests_inl.hpp Outdated Show resolved Hide resolved

Static_cast for warnings

456bd02

alalek reviewed Oct 19, 2020

View reviewed changes

OrestChura added 2 commits October 19, 2020 21:00

- Remove randomness

094a66d

- Fix unnecessary precision losses

- Forgot reference for RNG

3a7530c

AsyaPronina reviewed Oct 21, 2020

View reviewed changes

modules/gapi/include/opencv2/gapi/imgproc.hpp Outdated Show resolved Hide resolved

modules/gapi/include/opencv2/gapi/imgproc.hpp Outdated Show resolved Hide resolved

modules/gapi/test/cpu/gapi_imgproc_tests_cpu.cpp Outdated Show resolved Hide resolved

OrestChura added 2 commits October 21, 2020 20:39

addressing comments

2de582d

equalizeHist -> no group

3e611dd

AsyaPronina reviewed Oct 23, 2020

View reviewed changes

modules/gapi/test/common/gapi_imgproc_tests_inl.hpp Outdated Show resolved Hide resolved

OrestChura added 2 commits October 23, 2020 17:01

const addedin new functions

7ce40bb

Address suggestions:

09c4d1f

- Hierarchical -> H - added cv::GMatDesc::isVectorPoins() - added support of giving a set of points to boundingRect()

OrestChura requested a review from AsyaPronina October 25, 2020 14:30

mpashchenkov reviewed Oct 29, 2020

View reviewed changes

modules/gapi/src/api/gmat.cpp Outdated Show resolved Hide resolved

mpashchenkov approved these changes Oct 30, 2020

View reviewed changes

alalek reviewed Oct 30, 2020

View reviewed changes

Addressing comments

98ffe27

- IoU comparison function added for Rects - isPointsVector moved from a GMatDesc method to a separate function in imgproc.hpp - enums instead of int - typos corrected

TolyaTalamanov reviewed Nov 2, 2020

View reviewed changes

OrestChura added 3 commits November 2, 2020 15:42

Addressing comments

b650198

- findContours: Point offset -> GOpaque<Point> - removed "straight" comparison for Rects, IoU available only - changed vectors initialization -> fix Debug test run - Some typos

added comment for later upgrades

47e7fd1

Fix not to corrupt docs by FIXME

f037663

TolyaTalamanov self-requested a review November 9, 2020 05:59

TolyaTalamanov approved these changes Nov 9, 2020

View reviewed changes

AsyaPronina approved these changes Nov 9, 2020

View reviewed changes

alalek reviewed Nov 9, 2020

View reviewed changes

Addressing commens

e56c15a

- overload without offset added (as a temporary workaround) - checkMetaForFindingContours -> validateFindingContoursMeta - added ostream overload for enums used in tests

dmatveev approved these changes Nov 11, 2020

View reviewed changes

dmatveev added this to the 4.5.1 milestone Nov 11, 2020

Merge branch 'master' into oc/boundingRect

44b8e19

alalek assigned dmatveev Nov 11, 2020

alalek merged commit 3fc1c73 into opencv:master Nov 11, 2020

alalek mentioned this pull request Nov 27, 2020

Merge 4.x #18951

Merged


		bool isND() const { return !dims.empty(); }

		// Checks if the passed mat is a set of n-dimetional points of the given depth

Uh oh!

Conversation

OrestChura commented Oct 5, 2020

Pull Request Readiness Checklist

Uh oh!

OrestChura commented Oct 5, 2020

Uh oh!

anna-khakimova commented Oct 5, 2020

Uh oh!

dmatveev commented Oct 5, 2020

Uh oh!

OrestChura commented Oct 5, 2020

Uh oh!

OrestChura commented Oct 6, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

alalek Oct 19, 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!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mpashchenkov left a comment

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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

OrestChura Nov 2, 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!

Choose a reason for hiding this comment

Uh oh!

OrestChura Nov 2, 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!

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!

OrestChura commented Nov 9, 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

OrestChura commented Oct 6, 2020 •

edited

Loading

alalek Oct 19, 2020 •

edited

Loading

OrestChura Nov 2, 2020 •

edited

Loading

OrestChura Nov 2, 2020 •

edited

Loading