potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #21041 from sivanov-work:gin_gout_concept

Browse Source 
G-API: GAPI introduce compile guard for some types for gin/gout params passing

* Initial for taged solution

* Move out tags to gtags.hpp & add protection for own::Mat

* Add compile guard to proper place

* Fix MACRO concat

* Add unit tests

* Remove class MACRO injection due to Python3

* Revert back unproper changes

* Apply comments: reuse shape from traits

* Throw away unused gtags

* Apply comments

* Handle own::*

* Fix test

* Fix test(1)

* Fix unix build

* Try on type list

* Apply comments

* Apply comments

* Fix warning
This commit is contained in:
Sergey Ivanov
2021-12-03 15:30:05 +03:00
committed by GitHub
parent f61883b227
commit c5b8b5687f
7 changed files with 76 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gapi/test/internal/gapi_int_gmetaarg_test.cpp
+4 -12
View File
@@ -138,22 +138,18 @@ TEST(GMetaArg, Can_Describe_RunArg)
cv::Mat m(3, 3, CV_8UC3);
cv::UMat um(3, 3, CV_8UC3);
cv::Scalar s;
constexpr int w = 3, h = 3, c = 3;
uchar data[w*h*c];
cv::gapi::own::Mat om(h, w, CV_8UC3, data);
cv::Scalar os;
std::vector<int> v;
GMetaArgs metas = {GMetaArg(descr_of(m)),
GMetaArg(descr_of(um)),
GMetaArg(descr_of(s)),
GMetaArg(descr_of(om)),
GMetaArg(descr_of(os)),
GMetaArg(descr_of(v))};
auto in_run_args = cv::gin(m, um, s, om, os, v);
auto in_run_args = cv::gin(m, um, s, os, v);
for (int i = 0; i < 3; i++) {
for (size_t i = 0; i < metas.size(); i++) {
EXPECT_TRUE(can_describe(metas[i], in_run_args[i]));
}
}
@@ -178,22 +174,18 @@ TEST(GMetaArg, Can_Describe_RunArgP)
cv::Mat m(3, 3, CV_8UC3);
cv::UMat um(3, 3, CV_8UC3);
cv::Scalar s;
constexpr int w = 3, h = 3, c = 3;
uchar data[w*h*c];
cv::gapi::own::Mat om(h, w, CV_8UC3, data);
cv::Scalar os;
std::vector<int> v;
GMetaArgs metas = {GMetaArg(descr_of(m)),
GMetaArg(descr_of(um)),
GMetaArg(descr_of(s)),
GMetaArg(descr_of(om)),
GMetaArg(descr_of(os)),
GMetaArg(descr_of(v))};
auto out_run_args = cv::gout(m, um, s, om, os, v);
auto out_run_args = cv::gout(m, um, s, os, v);
for (int i = 0; i < 3; i++) {
for (size_t i = 0; i < metas.size(); i++) {
EXPECT_TRUE(can_describe(metas[i], out_run_args[i]));
}
}
modules/gapi/test/internal/gapi_int_proto_tests.cpp
-1
View File
@@ -15,7 +15,6 @@ struct ProtoPtrTest : public ::testing::Test { using Type = T; };
using ProtoPtrTestTypes = ::testing::Types< cv::Mat
, cv::UMat
, cv::gapi::own::Mat
, cv::RMat
, cv::Scalar
, std::vector<int>