1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00

Merge pull request #14985 from andrey-golubev:gapi_fix_ocl_umat

* G-API: fix GOCLExecutable issue with UMat lifetime

Add tests on initialized/uninitialized outputs for all
backends

* Use proper clean-up procedure for magazine

* Rename InitOut test and reduce tested sizes

* Enable output allocation test
This commit is contained in:
Andrey Golubev
2019-07-24 23:36:18 +03:00
committed by Alexander Alekhin
parent 8313209704
commit b10ec8ef8b
7 changed files with 80 additions and 3 deletions
@@ -448,4 +448,12 @@ INSTANTIATE_TEST_CASE_P(BackendOutputAllocationLargeSizeWithCorrectSubmatrixTest
Values(cv::Size(50, 50)),
Values(-1),
Values(CORE_CPU)));
INSTANTIATE_TEST_CASE_P(ReInitOutTestCPU, ReInitOutTest,
Combine(Values(CV_8UC3, CV_16SC4, CV_32FC1),
Values(cv::Size(640, 480)),
Values(-1),
Values(CORE_CPU),
Values(cv::Size(640, 400),
cv::Size(10, 480))));
}
@@ -267,6 +267,14 @@ INSTANTIATE_TEST_CASE_P(BackendOutputAllocationLargeSizeWithCorrectSubmatrixTest
Values(-1),
Values(CORE_FLUID)));
INSTANTIATE_TEST_CASE_P(ReInitOutTestFluid, ReInitOutTest,
Combine(Values(CV_8UC3, CV_16SC4, CV_32FC1),
Values(cv::Size(640, 480)),
Values(-1),
Values(CORE_FLUID),
Values(cv::Size(640, 400),
cv::Size(10, 480))));
//----------------------------------------------------------------------
// FIXME: Clean-up test configurations which are enabled already
#if 0