Skip to content

O
opencv
Unverified Commit f6ec0cd8 authored by Alexander Alekhin's avatar Alexander Alekhin Committed by GitHub
Browse files
Options

Merge pull request #15061 from AsyaPronina:dev/fix_merge_issue

parents 65d148d9 add1df4b
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
modules/gapi/test/cpu/gapi_core_tests_cpu.cpp
View file @ f6ec0cd8
...@@ -440,7 +440,6 @@ INSTANTIATE_TEST_CASE_P(BackendOutputAllocationTestCPU, BackendOutputAllocationT ...@@ -440,7 +440,6 @@ INSTANTIATE_TEST_CASE_P(BackendOutputAllocationTestCPU, BackendOutputAllocationT
Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1), Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1),
Values(cv::Size(50, 50)), Values(cv::Size(50, 50)),
Values(-1), Values(-1),
Values(false),
Values(CORE_CPU))); Values(CORE_CPU)));
INSTANTIATE_TEST_CASE_P(BackendOutputAllocationLargeSizeWithCorrectSubmatrixTestCPU, INSTANTIATE_TEST_CASE_P(BackendOutputAllocationLargeSizeWithCorrectSubmatrixTestCPU,
...@@ -448,6 +447,5 @@ INSTANTIATE_TEST_CASE_P(BackendOutputAllocationLargeSizeWithCorrectSubmatrixTest ...@@ -448,6 +447,5 @@ INSTANTIATE_TEST_CASE_P(BackendOutputAllocationLargeSizeWithCorrectSubmatrixTest
Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1), Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1),
Values(cv::Size(50, 50)), Values(cv::Size(50, 50)),
Values(-1), Values(-1),
Values(false),
Values(CORE_CPU))); Values(CORE_CPU)));
} }
modules/gapi/test/cpu/gapi_core_tests_fluid.cpp
View file @ f6ec0cd8
...@@ -258,7 +258,6 @@ INSTANTIATE_TEST_CASE_P(BackendOutputAllocationTestFluid, BackendOutputAllocatio ...@@ -258,7 +258,6 @@ INSTANTIATE_TEST_CASE_P(BackendOutputAllocationTestFluid, BackendOutputAllocatio
Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1), Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1),
Values(cv::Size(50, 50)), Values(cv::Size(50, 50)),
Values(-1), Values(-1),
Values(false),
Values(CORE_FLUID))); Values(CORE_FLUID)));
INSTANTIATE_TEST_CASE_P(BackendOutputAllocationLargeSizeWithCorrectSubmatrixTestFluid, INSTANTIATE_TEST_CASE_P(BackendOutputAllocationLargeSizeWithCorrectSubmatrixTestFluid,
...@@ -266,7 +265,6 @@ INSTANTIATE_TEST_CASE_P(BackendOutputAllocationLargeSizeWithCorrectSubmatrixTest ...@@ -266,7 +265,6 @@ INSTANTIATE_TEST_CASE_P(BackendOutputAllocationLargeSizeWithCorrectSubmatrixTest
Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1), Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1),
Values(cv::Size(50, 50)), Values(cv::Size(50, 50)),
Values(-1), Values(-1),
Values(false),
Values(CORE_FLUID))); Values(CORE_FLUID)));
//---------------------------------------------------------------------- //----------------------------------------------------------------------
......
modules/gapi/test/gpu/gapi_core_tests_gpu.cpp
View file @ f6ec0cd8
...@@ -383,7 +383,6 @@ INSTANTIATE_TEST_CASE_P(BackendOutputAllocationTestGPU, BackendOutputAllocationT ...@@ -383,7 +383,6 @@ INSTANTIATE_TEST_CASE_P(BackendOutputAllocationTestGPU, BackendOutputAllocationT
Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1), Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1),
Values(cv::Size(50, 50)), Values(cv::Size(50, 50)),
Values(-1), Values(-1),
Values(false),
Values(CORE_GPU))); Values(CORE_GPU)));
// FIXME: there's an issue in OCL backend with matrix reallocation that shouldn't happen // FIXME: there's an issue in OCL backend with matrix reallocation that shouldn't happen
...@@ -392,7 +391,6 @@ INSTANTIATE_TEST_CASE_P(DISABLED_BackendOutputAllocationLargeSizeWithCorrectSubm ...@@ -392,7 +391,6 @@ INSTANTIATE_TEST_CASE_P(DISABLED_BackendOutputAllocationLargeSizeWithCorrectSubm
Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1), Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1),
Values(cv::Size(50, 50)), Values(cv::Size(50, 50)),
Values(-1), Values(-1),
Values(false),
Values(CORE_GPU))); Values(CORE_GPU)));
//TODO: fix this backend to allow ConcatVertVec ConcatHorVec //TODO: fix this backend to allow ConcatVertVec ConcatHorVec
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment