mirror of
https://github.com/opencv/opencv.git
synced 2024-11-30 22:40:17 +08:00
f174363f60
G-API: A quick value-initialization support GMat #25055 This PR enables `GMat` objects to be value-initialized in the same way as it was done for `GScalar`s (and, possibly, other types). - Added some helper methods in backends to distinguish if a certain G-type value initialization is supported or not; - Added tests, including negative. Where it is needed: - Further extension of the OVCV backend (#24379 - will be refreshed soon); - Further experiments with DNN module; - Further experiments with "G-API behind UMat" sort of aggregation. In the current form, PR can be reviewed & merged (@TolyaTalamanov please have a look) ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [ ] There is a reference to the original bug report and related work - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake
115 lines
3.3 KiB
C++
115 lines
3.3 KiB
C++
// This file is part of OpenCV project.
|
|
// It is subject to the license terms in the LICENSE file found in the top-level directory
|
|
// of this distribution and at http://opencv.org/license.html.
|
|
//
|
|
// Copyright (C) 2024 Intel Corporation
|
|
|
|
|
|
#include "test_precomp.hpp"
|
|
|
|
#include <opencv2/gapi/cpu/core.hpp>
|
|
#include <opencv2/gapi/ocl/core.hpp>
|
|
#include <opencv2/gapi/fluid/core.hpp>
|
|
|
|
namespace opencv_test
|
|
{
|
|
namespace
|
|
{
|
|
enum class KernelPackage: int
|
|
{
|
|
OCV,
|
|
OCL,
|
|
FLUID,
|
|
};
|
|
std::ostream& operator<< (std::ostream &os, const KernelPackage &e)
|
|
{
|
|
switch (e)
|
|
{
|
|
#define _C(X) case KernelPackage::X: os << #X; break
|
|
_C(OCV);
|
|
_C(OCL);
|
|
_C(FLUID);
|
|
#undef _C
|
|
default: GAPI_Error("Unknown package");
|
|
}
|
|
return os;
|
|
}
|
|
} // namespace
|
|
|
|
struct GMatWithValue : public TestWithParam <KernelPackage> {
|
|
cv::GKernelPackage getKernelPackage() {
|
|
switch (GetParam()) {
|
|
case KernelPackage::OCV: return cv::gapi::core::cpu::kernels();
|
|
case KernelPackage::OCL: return cv::gapi::core::ocl::kernels();
|
|
case KernelPackage::FLUID: return cv::gapi::core::fluid::kernels();
|
|
default: GAPI_Error("Unknown package");
|
|
}
|
|
}
|
|
};
|
|
|
|
TEST_P(GMatWithValue, SingleIsland)
|
|
{
|
|
cv::Size sz(2, 2);
|
|
cv::Mat in_mat = cv::Mat::eye(sz, CV_8U);
|
|
|
|
cv::GComputationT<cv::GMat(cv::GMat)> addEye([&](cv::GMat in) {
|
|
return in + cv::GMat(cv::Mat::eye(sz, CV_8U));
|
|
});
|
|
|
|
cv::Mat out_mat;
|
|
addEye.apply(in_mat, out_mat, cv::compile_args(cv::gapi::use_only{getKernelPackage()}));
|
|
|
|
cv::Mat out_mat_ref = in_mat*2;
|
|
EXPECT_EQ(0, cvtest::norm(out_mat, out_mat_ref, NORM_INF));
|
|
}
|
|
|
|
TEST_P(GMatWithValue, GraphWithNoInput)
|
|
{
|
|
cv::Mat cval = cv::Mat::eye(cv::Size(2, 2), CV_8U);
|
|
cv::GMat gval = cv::GMat(cval);
|
|
cv::GMat out = cv::gapi::bitwise_not(gval);
|
|
|
|
cv::Mat out_mat;
|
|
cv::GComputation f(cv::GIn(), cv::GOut(out));
|
|
|
|
// Compiling this isn't supported for now
|
|
EXPECT_ANY_THROW(f.compile(cv::descr_of(cval),
|
|
cv::compile_args(cv::gapi::use_only{getKernelPackage()})));
|
|
}
|
|
|
|
INSTANTIATE_TEST_CASE_P(GAPI_GMat, GMatWithValue,
|
|
Values(KernelPackage::OCV,
|
|
KernelPackage::OCL,
|
|
KernelPackage::FLUID));
|
|
|
|
TEST(GAPI_MatWithValue, MultipleIslands)
|
|
{
|
|
// This test employs a non-trivial island fusion process
|
|
// as there's multiple backends in the graph
|
|
|
|
cv::Size sz(2, 2);
|
|
cv::Mat cval2 = cv::Mat::eye(sz, CV_8U) * 2;
|
|
cv::Mat cval1 = cv::Mat::eye(sz, CV_8U);
|
|
|
|
cv::GMat in;
|
|
cv::GMat tmp = in + cv::GMat(cval2); // Will be a Fluid operation
|
|
cv::GMat out = tmp - cv::GMat(cval1); // Will be an OCV operation
|
|
|
|
cv::GKernelPackage fluid_kernels = cv::gapi::core::fluid::kernels();
|
|
cv::GKernelPackage opencv_kernels = cv::gapi::core::cpu::kernels();
|
|
fluid_kernels.remove<cv::gapi::core::GSub>();
|
|
opencv_kernels.remove<cv::gapi::core::GAdd>();
|
|
auto kernels = cv::gapi::combine(fluid_kernels, opencv_kernels);
|
|
|
|
cv::Mat in_mat = cv::Mat::zeros(sz, CV_8U);
|
|
cv::Mat out_mat;
|
|
auto cc = cv::GComputation(in, out)
|
|
.compile(cv::descr_of(in_mat),
|
|
cv::compile_args(cv::gapi::use_only{kernels}));
|
|
cc(cv::gin(in_mat), cv::gout(out_mat));
|
|
|
|
EXPECT_EQ(0, cvtest::norm(out_mat, cv::Mat::eye(sz, CV_8U), NORM_INF));
|
|
}
|
|
|
|
} // namespace opencv_test
|