[G-API] Support generic infer overloads by TolyaTalamanov · Pull Request #19310 · opencv/opencv

TolyaTalamanov · 2021-01-12T07:26:29Z

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

Build configuration

Xforce_builders_only=linux,docs
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-2021.1.0:20.04
build_image:Custom Win=openvino-2021.1.0
build_image:Custom Mac=openvino-2021.2.0

test_modules:Custom=gapi,python2,python3,java
test_modules:Custom Win=gapi,python2,python3,java
test_modules:Custom Mac=gapi,python2,python3,java

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

modules/gapi/include/opencv2/gapi/infer.hpp

…rloads-from-generic-infer

TolyaTalamanov · 2021-01-13T09:23:09Z

modules/gapi/include/opencv2/gapi/infer.hpp

- * @brief G-API object used to collect network outputs
- */
-struct GAPI_EXPORTS_W_SIMPLE GInferOutputs
+using GInferOutputs     = GInferOutputsTyped<cv::GMat>;


How to document these properly ?

@dkurt Could you have a look, please ?

https://pullrequest.opencv.org/buildbot/export/pr/19310/docs/d2/d75/namespacecv.html#a7f91c8222af32b19c81a31fffe4bcf8d Looks good

modules/gapi/include/opencv2/gapi/infer.hpp

modules/gapi/src/api/ginfer.cpp

modules/gapi/test/infer/gapi_infer_ie_test.cpp

TolyaTalamanov · 2021-01-18T12:23:06Z

@dmatveev Could you take a look ?

modules/gapi/include/opencv2/gapi/infer.hpp

smirnov-alexey

Looks good, didn't dive too deep though

…eric-infer-overloads

TolyaTalamanov · 2021-03-03T12:30:46Z

@rgarnov Have a look, please

TolyaTalamanov · 2021-03-04T11:01:23Z

@AsyaPronina Have a look, please

TolyaTalamanov · 2021-03-10T08:54:39Z

@rgarnov @AsyaPronina Have a look, please

…eric-infer-overloads

modules/gapi/include/opencv2/gapi/infer.hpp

rgarnov

Looks good

TolyaTalamanov · 2021-03-16T14:23:34Z

@dmatveev Could you have a look ?

dmatveev

Looks good

dmatveev · 2021-03-18T15:47:38Z

modules/gapi/include/opencv2/gapi/infer.hpp

+    {
+    }
+
+    OutT at(const std::string& name)


is this method const? should it look like const?

No, because it perform insert in map ?

dmatveev · 2021-03-18T15:48:54Z

modules/gapi/include/opencv2/gapi/infer.hpp

+    std::vector<std::string> out_names;
+};
+
+template <typename OutT>


BTW what's the reason to have it generic?

Inference only produces Blobs which are GMat.

Oh, looking at the code below, it seems I've got it.

Please make sure this type is under detail:: so end-users wouldn't think of using it directly.

Ok I see it is under detail:: already

dmatveev · 2021-03-18T15:50:30Z

modules/gapi/include/opencv2/gapi/infer.hpp

+    }
+private:
+    template<typename T>
+    struct Priv


Just wondering, do you really need a distinct T here in the nested type or it could refer to OutT directly (I believe it could)

Good point, done

dmatveev · 2021-03-18T16:00:18Z

modules/gapi/test/infer/gapi_infer_ie_test.cpp

+    cv::GInferInputs inputs;
+    inputs["data"] = in;


BTW can it be constructed like this?

auto inputs = cv::GInferInputs { {"data", in}, ... };

? This can be done separately, of course.

I believe there is no difficulty to do this

TolyaTalamanov · 2021-03-19T09:41:45Z

@alalek Can it be merged ?

…overloads [G-API] Support generic infer overloads * Overloads for generic infer * Fix build * Refactoring * Fix docs * Put extra stuff to detail namespace * Add doc for usings * Remove uneccessary template in Priv

Overloads for generic infer

f952088

TolyaTalamanov added the category: g-api / gapi label Jan 12, 2021

TolyaTalamanov commented Jan 12, 2021

View reviewed changes

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

Merge branch 'master' of https://github.com/opencv/opencv into at/ove…

c431b14

…rloads-from-generic-infer

TolyaTalamanov force-pushed the at/generic-infer-overloads branch from e4f78c9 to c431b14 Compare January 12, 2021 07:32

Fix build

43ec41b

TolyaTalamanov commented Jan 13, 2021

View reviewed changes

Refactoring

3bc1793

TolyaTalamanov force-pushed the at/generic-infer-overloads branch from 7e57e54 to 3bc1793 Compare January 13, 2021 09:38

TolyaTalamanov requested a review from dmatveev January 18, 2021 12:22

TolyaTalamanov requested a review from smirnov-alexey January 18, 2021 12:38

Fix docs

9d160db

TolyaTalamanov force-pushed the at/generic-infer-overloads branch from bd2af91 to 9d160db Compare January 18, 2021 13:30

smirnov-alexey reviewed Jan 19, 2021

View reviewed changes

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

smirnov-alexey approved these changes Jan 19, 2021

View reviewed changes

TolyaTalamanov force-pushed the at/generic-infer-overloads branch from 3044e8a to caf0284 Compare March 2, 2021 11:42

Merge branch 'master' of https://github.com/opencv/opencv into at/gen…

d51d653

…eric-infer-overloads

TolyaTalamanov force-pushed the at/generic-infer-overloads branch from caf0284 to d51d653 Compare March 2, 2021 14:14

TolyaTalamanov requested a review from rgarnov March 2, 2021 14:16

TolyaTalamanov requested a review from AsyaPronina March 4, 2021 11:01

Merge branch 'master' of https://github.com/opencv/opencv into at/gen…

df38ac6

…eric-infer-overloads

rgarnov requested changes Mar 15, 2021

View reviewed changes

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

TolyaTalamanov added 2 commits March 16, 2021 13:12

Put extra stuff to detail namespace

5c28dd6

Add doc for usings

9a4885f

rgarnov approved these changes Mar 16, 2021

View reviewed changes

dmatveev approved these changes Mar 18, 2021

View reviewed changes

dmatveev self-assigned this Mar 18, 2021

Remove uneccessary template in Priv

a5bcd84

TolyaTalamanov force-pushed the at/generic-infer-overloads branch from f70bfd8 to a5bcd84 Compare March 19, 2021 10:15

alalek merged commit 50a264d into opencv:master Mar 19, 2021

alalek mentioned this pull request Apr 9, 2021

(5.x) Merge 4.x #19885

Merged

Uh oh!

Conversation

TolyaTalamanov commented Jan 12, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Readiness Checklist

Build configuration

Uh oh!

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!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

TolyaTalamanov commented Jan 18, 2021

Uh oh!

Uh oh!

smirnov-alexey left a comment

Choose a reason for hiding this comment

Uh oh!

TolyaTalamanov commented Mar 3, 2021

Uh oh!

TolyaTalamanov commented Mar 4, 2021

Uh oh!

TolyaTalamanov commented Mar 10, 2021

Uh oh!

Uh oh!

rgarnov left a comment

Choose a reason for hiding this comment

Uh oh!

TolyaTalamanov commented Mar 16, 2021

Uh oh!

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

TolyaTalamanov commented Mar 19, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

TolyaTalamanov commented Jan 12, 2021 •

edited

Loading