G-API Initial code upload by dmatveev · Pull Request #12608 · opencv/opencv

dmatveev · 2018-09-21T17:10:03Z

This is the initial source code upload for new OpenCV 4 module "Graph API":

OpenCV Graph API (or G-API) is a new OpenCV module targeted to make
regular image processing fast and portable. These two goals are
achieved by introducing a new graph-based model of execution.

Traditionally OpenCV provided a lot of stand-alone image processing
functions (see modules core and imgproc). Many of that functions
are well-optimized (e.g. vectorized for specific CPUs, parallel, etc)
but still the out-of-box optimization scope has been limited to a
single function only -- optimizing the whole algorithm built atop of that
functions was a responsibility of a programmer.

OpenCV 3.0 introduced Transparent API (or T-API) which allowed to
offload OpenCV function calls transparently to OpenCL devices and save
on Host/Device data transfers with cv::UMat -- and it was a great step
forward. However, T-API is a dynamic API -- user code still remains
unconstrained and OpenCL kernels are enqueued in arbitrary order, thus
eliminating further pipeline-level optimization potential.

G-API brings implicit graph model to OpenCV 4.0. Graph model captures
all operations and its data dependencies in a pipeline and so provides
G-API framework with extra information to do pipeline-level
optimizations.

This is an integration branch -- it will be updated with new changes.
Please don't push to this branch directly.

Documentation and samples are WIP and will be pushed in a week or two.

mshabunin · 2018-09-21T19:20:22Z

Please remove trailing whitespaces and multiple blank lines at EOF: http://pullrequest.opencv.org/buildbot/builders/precommit_docs/builds/17454/steps/whitespace%20opencv/logs/stdio
Looks like we need to patch https://github.com/opencv/ade - alloc.cpp (add code like this) to fix build on OSX

modules/gapi/CMakeLists.txt

mshabunin · 2018-09-21T19:25:05Z

modules/gapi/CMakeLists.txt

@@ -0,0 +1,92 @@
+# FIXME: Remove CXX11 check after complete switch to OpenCV 4 branch
+# (CI, bundle, workloads, etc)
+if (NOT HAVE_CXX11 OR NOT TARGET ade)


Maybe we should disable building this module with older GCC versions due to missing std::aligned_union. Something like this:

if ((CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9) OR ...)

I think we better rewrite that code and drop aligned_union

Should be fixed now (at least build passes locally with gcc4.8)

ANDROID is excluded from the build so far, but the code builds fine with other gcc4.8 builders (e.g. ARMv7)

modules/gapi/cmake/DownloadADE.cmake

* The majority of OpenCV buildbot problems was addressed

dmatveev · 2018-09-24T13:37:48Z

Seems the latest problem with build on macOS is similar to gsl-lite/gsl-lite#63

mshabunin · 2018-09-24T19:42:44Z

modules/gapi/include/opencv2/gapi/gkernel.hpp


        int unused[] = { 0, (pkg.include<KK>(), 0)... };
-        (void) unused;
+        cv::util::suppress_unused_warning(unused);


There is CV_UNUSED macro in the core module.

As G-API is being decoupled from OpenCV in parallel, we'll need to have our own

* Linux warnings should be resolved * Documentation build should become green * Number of Windows warnings should be reduced

* ARMv7 build issue should be resolved * ADE is bumped to latest version and should fix Clang builds for macOS/iOS * Remaining Windows warnings should be resolved * New Linux32 / ARMv7 warnings should be resolved

dmatveev · 2018-09-25T17:53:48Z

The latest status: only 1 warning remaining on Windows, will fix in a couple of hours.

ARMv7 test fails (and I don't have a clue why): http://pullrequest.opencv.org/buildbot/builders/precommit_armv7/builds/11175

* Final Windows warnings should be resolved now

dmatveev · 2018-09-25T19:46:08Z

@alalek @mshabunin @vpisarev feel lucky today :)

alalek

Well done!

alalek · 2018-09-25T19:54:03Z

modules/gapi/include/opencv2/gapi/core.hpp

+                GAPI_Assert(fx != 0. && fy != 0.);
+                return in.withSize
+                    (Size(static_cast<int>(std::round(in.size.width  * fx)),
+                          static_cast<int>(std::round(in.size.height * fy))));


std::round?

Perhaps this should not have huge impact if fx/fy is not passed into "implementation" functions after that (only dstSize is used).

Not sure what you mean

OpenCV uses own cvRound() (nearest-to-even) in cv::resize().

ah ok. We do pass tests against cv::resize() already, so let's put this stuff into the backlog so address later (within the release timeframe).

alalek · 2018-09-26T10:17:44Z

modules/gapi/test/internal/gapi_transactions_test.cpp

+
+
+#include <ade/graph.hpp>
+#include "test_precomp.hpp"


"precomp.hpp" should be the first unconditional include.

This and all below issues are now resolved

alalek · 2018-09-26T10:18:09Z

modules/gapi/test/internal/gapi_int_island_fusion_tests.cpp

+
+
+#include "compiler/transactions.hpp"
+#include "test_precomp.hpp"


"precomp.hpp" should be the first unconditional include.

alalek · 2018-09-26T10:18:27Z

modules/gapi/test/internal/gapi_int_gmodel_builder_test.cpp

+
+#include <ade/util/zip_range.hpp>   // util::indexed
+
+#include "test_precomp.hpp"


"precomp.hpp" should be the first unconditional include.

alalek · 2018-09-26T10:18:46Z

modules/gapi/test/gapi_util_tests.cpp

+
+#include <type_traits>
+
+#include "test_precomp.hpp"


"precomp.hpp" should be the first unconditional include.

alalek · 2018-09-26T10:24:12Z

modules/gapi/test/gapi_mock_kernels.hpp

+// Copyright (C) 2018 Intel Corporation
+
+
+#include "test_precomp.hpp"


Please avoid using of "precomp.hpp" in header files (it should/must be used in .cpp files only).
Introduce some "test_common.hpp" if you really need to include set of common headers.

Similar files:

modules/gapi/test/common/gapi_core_tests.hpp

modules/gapi/test/common/gapi_imgproc_tests.hpp

modules/gapi/test/common/gapi_operators_tests.hpp

modules/gapi/test/gapi_fluid_test_kernels.hpp

modules/gapi/src/backends/common/gbackend.hpp

modules/gapi/perf/common/gapi_imgproc_perf_tests.hpp

vpisarev · 2018-09-26T12:33:58Z

let's merge it!

* Fixed issues with precompiled headers in module and its tests

* master: (286 commits) Merge pull request opencv#12608 from dmatveev:gapi M_PI changed to CV_PI (opencv#12645) dnn: fix printf format warning Merge pull request opencv#12615 from D-Alex:master Fixed several incorrect printf format specifiers core: fix printf warnings by using c++11 format core: enable printf format warnings for cv::format JS: Support enum properties fix a bug in OpenGL samples: update winpack python samples launcher Merge pull request opencv#12310 from cv3d:chunks/enum_interface Merge pull request opencv#12601 from cv3d:fix/js release: OpenCV 4.0.0-alpha (version++) cuda: move CUDA modules to opencv_contrib cmake: update install paths (Linux) Merge pull request opencv#12570 from alalek:drop_usrtype1 Fix failure to request stddev of non-intrinsics ts: update valgrind test filter build: fix Xcode 10 build problems Enable Myriad device for OpenVINO models test ...

alalek · 2018-10-10T12:06:36Z

@dmatveev Could you please take a look on valgrind issues? (issue #12911)

* G-API Initial code upload * Update G-API code base to Sep-24-2018 * The majority of OpenCV buildbot problems was addressed * Update G-API code base to 24-Sep-18 EOD * G-API code base update 25-Sep-2018 * Linux warnings should be resolved * Documentation build should become green * Number of Windows warnings should be reduced * Update G-API code base to 25-Sep-18 EOD * ARMv7 build issue should be resolved * ADE is bumped to latest version and should fix Clang builds for macOS/iOS * Remaining Windows warnings should be resolved * New Linux32 / ARMv7 warnings should be resolved * G-API code base update 25-Sep-2018-EOD2 * Final Windows warnings should be resolved now * G-API code base update 26-Sep-2018 * Fixed issues with precompiled headers in module and its tests

G-API Initial code upload

a341b7f

mshabunin reviewed Sep 21, 2018

View reviewed changes

Update G-API code base to Sep-24-2018

779893f

* The majority of OpenCV buildbot problems was addressed

Update G-API code base to 24-Sep-18 EOD

7ec57a1

mshabunin reviewed Sep 24, 2018

View reviewed changes

dmatveev added 2 commits September 25, 2018 13:29

G-API code base update 25-Sep-2018

273e3b7

* Linux warnings should be resolved * Documentation build should become green * Number of Windows warnings should be reduced

Update G-API code base to 25-Sep-18 EOD

5cc117b

* ARMv7 build issue should be resolved * ADE is bumped to latest version and should fix Clang builds for macOS/iOS * Remaining Windows warnings should be resolved * New Linux32 / ARMv7 warnings should be resolved

G-API code base update 25-Sep-2018-EOD2

505f334

* Final Windows warnings should be resolved now

alalek reviewed Sep 26, 2018

View reviewed changes

vpisarev approved these changes Sep 26, 2018

View reviewed changes

G-API code base update 26-Sep-2018

690913d

* Fixed issues with precompiled headers in module and its tests

dmatveev force-pushed the gapi branch from 91dda6b to 690913d Compare September 26, 2018 15:40

alalek approved these changes Sep 26, 2018

View reviewed changes

alalek merged commit 29e88e5 into opencv:master Sep 26, 2018



		#include "compiler/transactions.hpp"
		#include "test_precomp.hpp"


		#include <ade/util/zip_range.hpp> // util::indexed

		#include "test_precomp.hpp"

		// Copyright (C) 2018 Intel Corporation


		#include "test_precomp.hpp"

Uh oh!

Conversation

dmatveev commented Sep 21, 2018

Uh oh!

mshabunin commented Sep 21, 2018

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!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dmatveev commented Sep 24, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dmatveev commented Sep 25, 2018

Uh oh!

dmatveev commented Sep 25, 2018

Uh oh!

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

Choose a reason for hiding this comment

Uh oh!

vpisarev commented Sep 26, 2018

Uh oh!

alalek commented Oct 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

alalek commented Oct 10, 2018 •

edited

Loading