mirror of
https://github.com/opencv/opencv.git
synced 2026-07-29 23:33:05 +04:00
Merge pull request #13030 from dmatveev:tutorial
* G-API: First steps with tutorial * G-API Tutorial: First iteration * G-API port of anisotropic image segmentation tutorial; * Currently works via OpenCV only; * Some new kernels have been required. * G-API Tutorial: added chapters on execution code, inspection, and profiling * G-API Tutorial: make Fluid kernel headers public For some reason, these headers were not moved to the public headers subtree during the initial development. Somehow it even worked for the existing workloads. * G-API Tutorial: Fix a couple of issues found during the work * Introduced Phase & Sqrt kernels, OCV & Fluid versions * Extended GKernelPackage to allow kernel removal & policies on include() All the above stuff needs to be tested, tests will be added later * G-API Tutorial: added chapter on running Fluid backend * G-API Tutorial: fix a number of issues in the text * G-API Tutorial - some final updates - Fixed post-merge issues after Sobel kernel renaming; - Simplified G-API code a little bit; - Put a conclusion note in text. * G-API Tutorial - fix build issues in test/perf targets Public headers were refactored but tests suites were not updated in time * G-API Tutorial: Added tests & reference docs on new kernels * Phase * Sqrt * G-API Tutorial: added link to the tutorial from the main module doc * G-API Tutorial: Added tests on new GKernelPackage functionality * G-API Tutorial: Extended InRange tests to cover 32F * G-API Tutorial: Misc fixes * Avoid building examples when gapi module is not there * Added a volatile API disclaimer to G-API root documentation page * G-API Tutorial: Fix perf tests build issue This change came from master where Fluid kernels are still used incorrectly. * G-API Tutorial: Fixed channels support in Sqrt/Phase fluid kernels Extended tests to cover this case * G-API Tutorial: Fix text problems found on team review
This commit is contained in:
committed by
Alexander Alekhin
parent
1d10d56651
commit
85fad1504a
@@ -146,6 +146,8 @@ struct ConcatVertVecTest : public TestWithParam<std::tuple<int, cv::Size, cv::GC
|
||||
struct ConcatHorVecTest : public TestWithParam<std::tuple<int, cv::Size, cv::GCompileArgs>> {};
|
||||
struct LUTTest : public TestParams<std::tuple<int, int, cv::Size,bool, cv::GCompileArgs>> {};
|
||||
struct ConvertToTest : public TestParams<std::tuple<int, int, cv::Size, cv::GCompileArgs>> {};
|
||||
struct PhaseTest : public TestParams<std::tuple<int, cv::Size, bool, cv::GCompileArgs>> {};
|
||||
struct SqrtTest : public TestParams<std::tuple<int, cv::Size, cv::GCompileArgs>> {};
|
||||
} // opencv_test
|
||||
|
||||
#endif //OPENCV_GAPI_CORE_TESTS_HPP
|
||||
|
||||
@@ -1422,6 +1422,58 @@ TEST_P(ConvertToTest, AccuracyTest)
|
||||
}
|
||||
}
|
||||
|
||||
TEST_P(PhaseTest, AccuracyTest)
|
||||
{
|
||||
int img_type = -1;
|
||||
cv::Size img_size;
|
||||
bool angle_in_degrees = false;
|
||||
cv::GCompileArgs compile_args;
|
||||
std::tie(img_type, img_size, angle_in_degrees, compile_args) = GetParam();
|
||||
initMatsRandU(img_type, img_size, img_type);
|
||||
|
||||
// G-API code //////////////////////////////////////////////////////////////
|
||||
cv::GMat in_x, in_y;
|
||||
auto out = cv::gapi::phase(in_x, in_y, angle_in_degrees);
|
||||
|
||||
cv::GComputation c(in_x, in_y, out);
|
||||
c.apply(in_mat1, in_mat2, out_mat_gapi, std::move(compile_args));
|
||||
|
||||
// OpenCV code /////////////////////////////////////////////////////////////
|
||||
cv::phase(in_mat1, in_mat2, out_mat_ocv, angle_in_degrees);
|
||||
|
||||
// Comparison //////////////////////////////////////////////////////////////
|
||||
// FIXME: use a comparison functor instead (after enabling OpenCL)
|
||||
{
|
||||
EXPECT_EQ(0, cv::countNonZero(out_mat_ocv != out_mat_gapi));
|
||||
}
|
||||
}
|
||||
|
||||
TEST_P(SqrtTest, AccuracyTest)
|
||||
{
|
||||
int img_type = -1;
|
||||
cv::Size img_size;
|
||||
cv::GCompileArgs compile_args;
|
||||
std::tie(img_type, img_size, compile_args) = GetParam();
|
||||
initMatrixRandU(img_type, img_size, img_type);
|
||||
|
||||
// G-API code //////////////////////////////////////////////////////////////
|
||||
cv::GMat in;
|
||||
auto out = cv::gapi::sqrt(in);
|
||||
|
||||
cv::GComputation c(in, out);
|
||||
c.apply(in_mat1, out_mat_gapi, std::move(compile_args));
|
||||
|
||||
// OpenCV code /////////////////////////////////////////////////////////////
|
||||
cv::sqrt(in_mat1, out_mat_ocv);
|
||||
|
||||
// Comparison //////////////////////////////////////////////////////////////
|
||||
// FIXME: use a comparison functor instead (after enabling OpenCL)
|
||||
{
|
||||
EXPECT_EQ(0, cv::countNonZero(out_mat_ocv != out_mat_gapi));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} // opencv_test
|
||||
|
||||
#endif //OPENCV_GAPI_CORE_TESTS_INL_HPP
|
||||
|
||||
Reference in New Issue
Block a user