Merge pull request #21041 from sivanov-work:gin_gout_concept

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
+36 -4
View File
@@ -4,13 +4,32 @@
//
// Copyright (C) 2018 Intel Corporation
#include "test_precomp.hpp"
#include <type_traits>
#include "test_precomp.hpp"
#include <opencv2/gapi/gtype_traits.hpp>
#include <opencv2/gapi/util/util.hpp>
namespace cv
{
struct Own {};
namespace gapi
{
namespace own
{
struct ConvertibleToOwn{};
struct NotConvertibleToOwn{};
} // own
} // gapi
} // cv
struct NoGhape {};
struct HasGShape {
static constexpr cv::GShape shape = cv::GShape::GFRAME;
};
struct MimicGShape {
static constexpr int shape = 0;
};
#define DISALLOWED_LIST cv::gapi::own::NotConvertibleToOwn
namespace opencv_test
{
@@ -40,4 +59,17 @@ TEST(GAPIUtil, AllButLast)
"[int, float] are NOT all integral types");
}
TEST(GAPIUtil, GShaped)
{
static_assert(!cv::detail::has_gshape<NoGhape>::value, "NoGhape hasn't got any shape");
static_assert(cv::detail::has_gshape<HasGShape>::value, "HasGShape has got GShape shape");
static_assert(!cv::detail::has_gshape<MimicGShape>::value, "MimicGShape hasn't got right shape");
}
TEST(GAPIUtil, GTypeList)
{
static_assert(cv::detail::contains<cv::gapi::own::NotConvertibleToOwn, GAPI_OWN_TYPES_LIST, DISALLOWED_LIST>::value, "NotConvertibleToOwn is in denial list");
static_assert(!cv::detail::contains<cv::gapi::own::ConvertibleToOwn>::value, "ConvertibleToOwn is not in empty denial list");
static_assert(!cv::detail::contains<cv::gapi::own::ConvertibleToOwn, GAPI_OWN_TYPES_LIST, DISALLOWED_LIST>::value, "ConvertibleToOwn is not in denial list");
}
} // namespace opencv_test