From ca9fd66744b5e12a246ac47c8a446b3533834d57 Mon Sep 17 00:00:00 2001 From: Maxim Pashchenkov Date: Mon, 6 Apr 2020 18:21:08 +0300 Subject: [PATCH] Merge pull request #16886 from mpashchenkov:mp/ocv-gapi-add-disable G-API: DISABLED_ in tests instead #if 0 * Removed if 0, replaced with DISABLED_ * boner * Added tests for fluid * -1 instead 0.0 * Added GMatDesc's tests for own::Mat * IMGPROC_FLUID CORE_FLUID * Added use_only, disabled tests without kernels --- .../perf/gpu/gapi_core_perf_tests_gpu.cpp | 10 +- modules/gapi/test/cpu/gapi_core_tests_cpu.cpp | 2 +- .../gapi/test/cpu/gapi_core_tests_fluid.cpp | 357 +++++------------- .../gapi/test/cpu/gapi_imgproc_tests_cpu.cpp | 2 +- .../test/cpu/gapi_imgproc_tests_fluid.cpp | 2 +- .../test/cpu/gapi_operators_tests_cpu.cpp | 2 +- .../test/cpu/gapi_operators_tests_fluid.cpp | 2 +- modules/gapi/test/gapi_desc_tests.cpp | 132 +++++-- modules/gapi/test/gpu/gapi_core_tests_gpu.cpp | 19 +- .../gapi/test/gpu/gapi_imgproc_tests_gpu.cpp | 2 +- .../test/gpu/gapi_operators_tests_gpu.cpp | 2 +- 11 files changed, 218 insertions(+), 314 deletions(-) diff --git a/modules/gapi/perf/gpu/gapi_core_perf_tests_gpu.cpp b/modules/gapi/perf/gpu/gapi_core_perf_tests_gpu.cpp index 9c6b25c207..d77bfb8da5 100644 --- a/modules/gapi/perf/gpu/gapi_core_perf_tests_gpu.cpp +++ b/modules/gapi/perf/gpu/gapi_core_perf_tests_gpu.cpp @@ -81,12 +81,10 @@ INSTANTIATE_TEST_CASE_P(DivRCPerfTestGPU, DivRCPerfTest, Values( -1, CV_8U, CV_16U, CV_32F ), Values(cv::compile_args(CORE_GPU)))); //TODO: mask test doesn't work -#if 0 -INSTANTIATE_TEST_CASE_P(MaskPerfTestGPU, MaskPerfTest, +INSTANTIATE_TEST_CASE_P(DISABLED_MaskPerfTestGPU, MaskPerfTest, Combine(Values( szSmall128, szVGA, sz720p, sz1080p ), Values( CV_8UC1, CV_16UC1, CV_16SC1), Values(cv::compile_args(CORE_GPU)))); -#endif INSTANTIATE_TEST_CASE_P(MeanPerfTestGPU, MeanPerfTest, Combine(Values( szSmall128, szVGA, sz720p, sz1080p ), @@ -242,18 +240,16 @@ INSTANTIATE_TEST_CASE_P(ConcatVertPerfTestGPU, ConcatVertPerfTest, Values(cv::compile_args(CORE_GPU)))); //TODO: fix this backend to allow ConcatVertVec ConcatHorVec -#if 0 -INSTANTIATE_TEST_CASE_P(ConcatHorVecPerfTestGPU, ConcatHorVecPerfTest, +INSTANTIATE_TEST_CASE_P(DISABLED_ConcatHorVecPerfTestGPU, ConcatHorVecPerfTest, Combine(Values(szSmall128, szVGA, sz720p, sz1080p), Values(CV_8UC1, CV_8UC3, CV_16UC1, CV_16SC1, CV_32FC1), Values(cv::compile_args(CORE_GPU)))); -INSTANTIATE_TEST_CASE_P(ConcatVertVecPerfTestGPU, ConcatVertVecPerfTest, +INSTANTIATE_TEST_CASE_P(DISABLED_ConcatVertVecPerfTestGPU, ConcatVertVecPerfTest, Combine(Values( szSmall128, szVGA, sz720p, sz1080p ), Values( CV_8UC1, CV_8UC3, CV_16UC1, CV_16SC1, CV_32FC1 ), Values(cv::compile_args(CORE_GPU)))); -#endif INSTANTIATE_TEST_CASE_P(LUTPerfTestGPU, LUTPerfTest, Combine(Values(CV_8UC1, CV_8UC3), diff --git a/modules/gapi/test/cpu/gapi_core_tests_cpu.cpp b/modules/gapi/test/cpu/gapi_core_tests_cpu.cpp index f7e9816c2c..50384ca9f2 100644 --- a/modules/gapi/test/cpu/gapi_core_tests_cpu.cpp +++ b/modules/gapi/test/cpu/gapi_core_tests_cpu.cpp @@ -11,7 +11,7 @@ namespace { -#define CORE_CPU [] () { return cv::compile_args(cv::gapi::core::cpu::kernels()); } +#define CORE_CPU [] () { return cv::compile_args(cv::gapi::use_only{cv::gapi::core::cpu::kernels()}); } } // anonymous namespace namespace opencv_test diff --git a/modules/gapi/test/cpu/gapi_core_tests_fluid.cpp b/modules/gapi/test/cpu/gapi_core_tests_fluid.cpp index e20fb11db9..8456ec62cd 100644 --- a/modules/gapi/test/cpu/gapi_core_tests_fluid.cpp +++ b/modules/gapi/test/cpu/gapi_core_tests_fluid.cpp @@ -10,12 +10,11 @@ namespace { -#define CORE_FLUID [] () { return cv::compile_args(cv::gapi::core::fluid::kernels()); } +#define CORE_FLUID [] () { return cv::compile_args(cv::gapi::use_only{cv::gapi::core::fluid::kernels()}); } } // anonymous namespace namespace opencv_test { - // FIXME: Windows accuracy problems after recent update! INSTANTIATE_TEST_CASE_P(MathOpTestFluid, MathOpTest, Combine(Values(CV_8UC3, CV_8UC1, CV_16SC1, CV_32FC1), @@ -30,6 +29,18 @@ INSTANTIATE_TEST_CASE_P(MathOpTestFluid, MathOpTest, Values(1.0), testing::Bool())); +INSTANTIATE_TEST_CASE_P(SubTestFluid, MathOpTest, + Combine(Values(CV_8UC1, CV_16SC1 , CV_32FC1), + Values(cv::Size(1280, 720), + cv::Size(640, 480), + cv::Size(128, 128)), + Values(-1, CV_8U, CV_32F), + Values(CORE_FLUID), + Values(SUB), + testing::Bool(), + Values (1.0), + testing::Bool())); + INSTANTIATE_TEST_CASE_P(MulSTestFluid, MulDoubleTest, Combine(Values(CV_8UC1, CV_16SC1, CV_32FC1), Values(cv::Size(1280, 720), @@ -46,6 +57,14 @@ INSTANTIATE_TEST_CASE_P(DivCTestFluid, DivCTest, Values(CV_8U, CV_32F), Values(CORE_FLUID))); +INSTANTIATE_TEST_CASE_P(DISABLED_MeanTestFluid, MeanTest, + Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), + Values(cv::Size(1280, 720), + cv::Size(640, 480), + cv::Size(128, 128)), + Values(-1), + Values(CORE_FLUID))); + INSTANTIATE_TEST_CASE_P(AbsDiffTestFluid, AbsDiffTest, Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), Values(cv::Size(1280, 720), @@ -99,6 +118,15 @@ INSTANTIATE_TEST_CASE_P(MaxTestFluid, MaxTest, Values(-1), Values(CORE_FLUID))); +INSTANTIATE_TEST_CASE_P(DISABLED_SumTestFluid, SumTest, + Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), + Values(cv::Size(1280, 720), + cv::Size(640, 480), + cv::Size(128, 128)), + Values(-1), + Values(CORE_FLUID), + Values(AbsToleranceScalar(1e-5).to_compare_obj()))); + INSTANTIATE_TEST_CASE_P(CompareTestFluid, CmpTest, Combine(Values(CV_8UC3, CV_8UC1, CV_16SC1, CV_32FC1), Values(cv::Size(1920, 1080), @@ -119,6 +147,24 @@ INSTANTIATE_TEST_CASE_P(AddWeightedTestFluid, AddWeightedTest, Values(CORE_FLUID), Values(Tolerance_FloatRel_IntAbs(1e-5, 2).to_compare_obj()))); +INSTANTIATE_TEST_CASE_P(DISABLED_NormTestFluid, NormTest, + Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), + Values(cv::Size(1280, 720), + cv::Size(640, 480), + cv::Size(128, 128)), + Values(-1), + Values(CORE_FLUID), + Values(AbsToleranceScalar(1e-5).to_compare_obj()), + Values(NORM_INF, NORM_L1, NORM_L2))); + +INSTANTIATE_TEST_CASE_P(DISABLED_IntegralTestFluid, IntegralTest, + Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), + Values(cv::Size(1280, 720), + cv::Size(640, 480), + cv::Size(128, 128)), + Values(-1), + Values(CORE_FLUID))); + INSTANTIATE_TEST_CASE_P(LUTTestFluid, LUTTest, Combine(Values(CV_8UC1, CV_8UC3), Values(cv::Size(1920, 1080), @@ -140,6 +186,22 @@ INSTANTIATE_TEST_CASE_P(ConvertToFluid, ConvertToTest, Values(2.5, 1.0, -1.0), Values(250.0, 0.0, -128.0))); +INSTANTIATE_TEST_CASE_P(DISABLED_ConcatHorTestFluid, ConcatHorTest, + Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), + Values(cv::Size(1280, 720), + cv::Size(640, 480), + cv::Size(128, 128)), + Values(-1), + Values(CORE_FLUID))); + +INSTANTIATE_TEST_CASE_P(DISABLED_ConcatVertTestFluid, ConcatVertTest, + Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), + Values(cv::Size(1280, 720), + cv::Size(640, 480), + cv::Size(128, 128)), + Values(-1), + Values(CORE_FLUID))); + INSTANTIATE_TEST_CASE_P(Split3TestFluid, Split3Test, Combine(Values(CV_8UC3), Values(cv::Size(1280, 720), @@ -174,6 +236,32 @@ INSTANTIATE_TEST_CASE_P(Merge4TestFluid, Merge4Test, Values(CV_8UC4), Values(CORE_FLUID))); +INSTANTIATE_TEST_CASE_P(DISABLED_RemapTestFluid, RemapTest, + Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), + Values(cv::Size(1280, 720), + cv::Size(640, 480), + cv::Size(128, 128)), + Values(-1), + Values(CORE_FLUID))); + +INSTANTIATE_TEST_CASE_P(DISABLED_FlipTestFluid, FlipTest, + Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), + Values(cv::Size(1280, 720), + cv::Size(640, 480), + cv::Size(128, 128)), + Values(-1), + Values(CORE_FLUID), + Values(0,1,-1))); + +INSTANTIATE_TEST_CASE_P(DISABLED_CropTestFluid, CropTest, + Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), + Values(cv::Size(1280, 720), + cv::Size(640, 480), + cv::Size(128, 128)), + Values(-1), + Values(CORE_FLUID), + Values(cv::Rect(10, 8, 20, 35), cv::Rect(4, 10, 37, 50)))); + INSTANTIATE_TEST_CASE_P(SelectTestFluid, SelectTest, Combine(Values(CV_8UC3, CV_8UC1, CV_16UC1, CV_16SC1), Values(cv::Size(1920, 1080), @@ -231,6 +319,15 @@ INSTANTIATE_TEST_CASE_P(ThresholdTestFluid, ThresholdTest, cv::Scalar(100, 100, 100, 100), cv::Scalar(255, 255, 255, 255)))); +INSTANTIATE_TEST_CASE_P(DISABLED_ThresholdTestFluid, ThresholdOTTest, + Combine(Values(CV_8UC1), + Values(cv::Size(1280, 720), + cv::Size(640, 480), + cv::Size(128, 128)), + Values(-1), + Values(CORE_FLUID), + Values(cv::THRESH_OTSU, cv::THRESH_TRIANGLE))); + INSTANTIATE_TEST_CASE_P(InRangeTestFluid, InRangeTest, Combine(Values(CV_8UC3, CV_8UC1, CV_16UC1, CV_16SC1, CV_32FC1), Values(cv::Size(1920, 1080), @@ -285,260 +382,4 @@ INSTANTIATE_TEST_CASE_P(CopyTestFluid, CopyTest, cv::Size(128, 128)), Values(-1), Values(CORE_FLUID))); - -//---------------------------------------------------------------------- -// FIXME: Clean-up test configurations which are enabled already -#if 0 -INSTANTIATE_TEST_CASE_P(MathOpTestCPU, MathOpTest, - Combine(Values(ADD, DIV, MUL), - testing::Bool(), - Values(CV_8UC1, CV_16SC1, CV_32FC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), - Values(-1, CV_8U, CV_32F), -/*init output matrices or not*/ testing::Bool(), - Values(false))); - -INSTANTIATE_TEST_CASE_P(SubTestCPU, MathOpTest, - Combine(Values(SUB), - testing::Bool(), - Values(CV_8UC1, CV_16SC1 , CV_32FC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), - Values(-1, CV_8U, CV_32F), -/*init output matrices or not*/ testing::Bool(), - testing::Bool())); - -INSTANTIATE_TEST_CASE_P(MulSTestCPU, MulSTest, - Combine(Values(CV_8UC1, CV_16SC1, CV_32FC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(DivCTestCPU, DivCTest, - Combine(Values(CV_8UC1, CV_16SC1, CV_32FC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), - Values(CV_8U, CV_32F), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(MeanTestCPU, MeanTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(SelectTestCPU, SelectTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(Polar2CartCPU, Polar2CartTest, - Combine(Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(Cart2PolarCPU, Cart2PolarTest, - Combine(Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(CompareTestCPU, CmpTest, - Combine(Values(CMP_EQ, CMP_GE, CMP_NE, CMP_GT, CMP_LT, CMP_LE), - testing::Bool(), - Values(CV_8UC1, CV_16SC1, CV_32FC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(BitwiseTestCPU, BitwiseTest, - Combine(Values(AND, OR, XOR), - Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(BitwiseNotTestCPU, NotTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), - /*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(MinTestCPU, MinTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(MaxTestCPU, MaxTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(SumTestCPU, SumTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ testing::Bool()) - Values(0.0), - ); - -INSTANTIATE_TEST_CASE_P(AbsDiffTestCPU, AbsDiffTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(AbsDiffCTestCPU, AbsDiffCTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(AddWeightedTestCPU, AddWeightedTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), - Values(-1, CV_8U, CV_32F), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(NormTestCPU, NormTest, - Combine(Values(NORM_INF, NORM_L1, NORM_L2), - Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128))), - Values(0.0)); - -INSTANTIATE_TEST_CASE_P(IntegralTestCPU, IntegralTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)))); - -INSTANTIATE_TEST_CASE_P(ThresholdTestCPU, ThresholdTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), - Values(cv::THRESH_BINARY, cv::THRESH_BINARY_INV, cv::THRESH_TRUNC, cv::THRESH_TOZERO, cv::THRESH_TOZERO_INV), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(ThresholdTestCPU, ThresholdOTTest, - Combine(Values(CV_8UC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), - Values(cv::THRESH_OTSU, cv::THRESH_TRIANGLE), -/*init output matrices or not*/ testing::Bool())); - - -INSTANTIATE_TEST_CASE_P(InRangeTestCPU, InRangeTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(Split3TestCPU, Split3Test, - (Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)))); - -INSTANTIATE_TEST_CASE_P(Split4TestCPU, Split4Test, - (Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)))); - -INSTANTIATE_TEST_CASE_P(Merge3TestCPU, Merge3Test, - (Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)))); - -INSTANTIATE_TEST_CASE_P(Merge4TestCPU, Merge4Test, - (Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)))); - -INSTANTIATE_TEST_CASE_P(RemapTestCPU, RemapTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(FlipTestCPU, FlipTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(0,1,-1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(CropTestCPU, CropTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Rect(10, 8, 20, 35), cv::Rect(4, 10, 37, 50)), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ testing::Bool())); - -INSTANTIATE_TEST_CASE_P(LUTTestCPU, LUTTest, - Combine(Values(CV_8UC1, CV_8UC3), - Values(CV_8UC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ Values(true))); - -INSTANTIATE_TEST_CASE_P(LUTTestCustomCPU, LUTTest, - Combine(Values(CV_8UC3), - Values(CV_8UC3), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)), -/*init output matrices or not*/ Values(true))); - -// PLEASE DO NOT PUT NEW ACCURACY TESTS BELOW THIS POINT! ////////////////////// - -INSTANTIATE_TEST_CASE_P(ConvertToCPU, ConvertToTest, - Combine(Values(CV_8UC3, CV_8UC1, CV_16UC1, CV_32FC1), - Values(CV_8U, CV_16U, CV_32F), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)))); - -INSTANTIATE_TEST_CASE_P(ConcatHorTestCPU, ConcatHorTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)))); -INSTANTIATE_TEST_CASE_P(ConcatVertTestCPU, ConcatVertTest, - Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), - Values(cv::Size(1280, 720), - cv::Size(640, 480), - cv::Size(128, 128)))); - -//---------------------------------------------------------------------- -#endif // 0 - } diff --git a/modules/gapi/test/cpu/gapi_imgproc_tests_cpu.cpp b/modules/gapi/test/cpu/gapi_imgproc_tests_cpu.cpp index e3e90ceba5..5658c6dd4f 100644 --- a/modules/gapi/test/cpu/gapi_imgproc_tests_cpu.cpp +++ b/modules/gapi/test/cpu/gapi_imgproc_tests_cpu.cpp @@ -12,7 +12,7 @@ namespace { -#define IMGPROC_CPU [] () { return cv::compile_args(cv::gapi::imgproc::cpu::kernels()); } +#define IMGPROC_CPU [] () { return cv::compile_args(cv::gapi::use_only{cv::gapi::imgproc::cpu::kernels()}); } } // anonymous namespace namespace opencv_test diff --git a/modules/gapi/test/cpu/gapi_imgproc_tests_fluid.cpp b/modules/gapi/test/cpu/gapi_imgproc_tests_fluid.cpp index 282241fe1e..4e847825f1 100644 --- a/modules/gapi/test/cpu/gapi_imgproc_tests_fluid.cpp +++ b/modules/gapi/test/cpu/gapi_imgproc_tests_fluid.cpp @@ -10,7 +10,7 @@ namespace { -#define IMGPROC_FLUID [] () { return cv::compile_args(cv::gapi::imgproc::fluid::kernels()); } +#define IMGPROC_FLUID [] () { return cv::compile_args(cv::gapi::use_only{cv::gapi::imgproc::fluid::kernels()}); } } // anonymous namespace namespace opencv_test diff --git a/modules/gapi/test/cpu/gapi_operators_tests_cpu.cpp b/modules/gapi/test/cpu/gapi_operators_tests_cpu.cpp index 14817557b4..0f7ab9728e 100644 --- a/modules/gapi/test/cpu/gapi_operators_tests_cpu.cpp +++ b/modules/gapi/test/cpu/gapi_operators_tests_cpu.cpp @@ -11,7 +11,7 @@ namespace { -#define CORE_CPU [] () { return cv::compile_args(cv::gapi::core::cpu::kernels()); } +#define CORE_CPU [] () { return cv::compile_args(cv::gapi::use_only{cv::gapi::core::cpu::kernels()}); } } // anonymous namespace namespace opencv_test diff --git a/modules/gapi/test/cpu/gapi_operators_tests_fluid.cpp b/modules/gapi/test/cpu/gapi_operators_tests_fluid.cpp index 45c8e18890..0a40ef37b1 100644 --- a/modules/gapi/test/cpu/gapi_operators_tests_fluid.cpp +++ b/modules/gapi/test/cpu/gapi_operators_tests_fluid.cpp @@ -10,7 +10,7 @@ namespace { -#define CORE_FLUID [] () { return cv::compile_args(cv::gapi::core::fluid::kernels()); } +#define CORE_FLUID [] () { return cv::compile_args(cv::gapi::use_only{cv::gapi::core::fluid::kernels()}); } } // anonymous namespace namespace opencv_test diff --git a/modules/gapi/test/gapi_desc_tests.cpp b/modules/gapi/test/gapi_desc_tests.cpp index 65d66d6f17..86000d9ea6 100644 --- a/modules/gapi/test/gapi_desc_tests.cpp +++ b/modules/gapi/test/gapi_desc_tests.cpp @@ -23,23 +23,30 @@ namespace }; } -TEST(GAPI_MetaDesc, MatDesc) +TEST(GAPI_MetaDesc, MatDescOneCh) { - cv::Mat m1(240, 320, CV_8U); - const auto desc1 = cv::descr_of(m1); - EXPECT_EQ(CV_8U, desc1.depth); - EXPECT_EQ(1, desc1.chan); - EXPECT_EQ(320, desc1.size.width); - EXPECT_EQ(240, desc1.size.height); - EXPECT_FALSE(desc1.isND()); + cv::Mat mat(240, 320, CV_8U); - cv::Mat m2(480, 640, CV_8UC3); - const auto desc2 = cv::descr_of(m2); - EXPECT_EQ(CV_8U, desc2.depth); - EXPECT_EQ(3, desc2.chan); - EXPECT_EQ(640, desc2.size.width); - EXPECT_EQ(480, desc2.size.height); - EXPECT_FALSE(desc2.isND()); + const auto desc = cv::descr_of(mat); + + EXPECT_EQ(CV_8U, desc.depth); + EXPECT_EQ(1, desc.chan); + EXPECT_EQ(320, desc.size.width); + EXPECT_EQ(240, desc.size.height); + EXPECT_FALSE(desc.isND()); +} + +TEST(GAPI_MetaDesc, MatDescThreeCh) +{ + cv::Mat mat(480, 640, CV_8UC3); + + const auto desc = cv::descr_of(mat); + + EXPECT_EQ(CV_8U, desc.depth); + EXPECT_EQ(3, desc.chan); + EXPECT_EQ(640, desc.size.width); + EXPECT_EQ(480, desc.size.height); + EXPECT_FALSE(desc.isND()); } TEST(GAPI_MetaDesc, MatDescND) @@ -71,6 +78,82 @@ TEST(GAPI_MetaDesc, VecMatDesc) EXPECT_EQ((GMatDesc{CV_8U, 3, {640, 480}}), get(desc2[0])); } +TEST(GAPI_MetaDesc, CanDescribe) +{ + constexpr int w = 15; + constexpr int h = 7; + cv::Mat m0(h, w, CV_8UC3); + cv::GMatDesc md0{CV_8U,3,{w,h},false}; + + cv::Mat m1(h*3, w, CV_8UC1); + cv::GMatDesc md10{CV_8U,3,{w,h},true}; + cv::GMatDesc md11{CV_8U,1,{w,h*3},false}; + + EXPECT_TRUE (md0 .canDescribe(m0)); + EXPECT_FALSE(md0 .canDescribe(m1)); + EXPECT_TRUE (md10.canDescribe(m1)); + EXPECT_TRUE (md11.canDescribe(m1)); +} + +TEST(GAPI_MetaDesc, OwnMatDescOneCh) +{ + cv::gapi::own::Mat mat(240, 320, CV_8U, nullptr); + + const auto desc = cv::gapi::own::descr_of(mat); + + EXPECT_EQ(CV_8U, desc.depth); + EXPECT_EQ(1, desc.chan); + EXPECT_EQ(320, desc.size.width); + EXPECT_EQ(240, desc.size.height); + EXPECT_FALSE(desc.isND()); +} + +TEST(GAPI_MetaDesc, OwnMatDescThreeCh) +{ + cv::gapi::own::Mat mat(480, 640, CV_8UC3, nullptr); + + const auto desc = cv::gapi::own::descr_of(mat); + + EXPECT_EQ(CV_8U, desc.depth); + EXPECT_EQ(3, desc.chan); + EXPECT_EQ(640, desc.size.width); + EXPECT_EQ(480, desc.size.height); + EXPECT_FALSE(desc.isND()); +} + +TEST(GAPI_MetaDesc, OwnMatDescND) +{ + std::vector dims = {1,3,224,224}; + cv::gapi::own::Mat m(dims, CV_32F, nullptr); + + const auto desc = cv::gapi::own::descr_of(m); + + EXPECT_EQ(CV_32F, desc.depth); + EXPECT_EQ(-1, desc.chan); + EXPECT_EQ(1, desc.dims[0]); + EXPECT_EQ(3, desc.dims[1]); + EXPECT_EQ(224, desc.dims[2]); + EXPECT_EQ(224, desc.dims[3]); + EXPECT_TRUE(desc.isND()); +} + +TEST(GAPI_MetaDesc, CanDescribeOwnMat) +{ + constexpr int w = 15; + constexpr int h = 7; + cv::gapi::own::Mat m0(h, w, CV_8UC3, nullptr); + cv::GMatDesc md0{CV_8U,3,{w,h},false}; + + cv::gapi::own::Mat m1(h*3, w, CV_8UC1, nullptr); + cv::GMatDesc md10{CV_8U,3,{w,h},true}; + cv::GMatDesc md11{CV_8U,1,{w,h*3},false}; + + EXPECT_TRUE (md0 .canDescribe(m0)); + EXPECT_FALSE(md0 .canDescribe(m1)); + EXPECT_TRUE (md10.canDescribe(m1)); + EXPECT_TRUE (md11.canDescribe(m1)); +} + TEST(GAPI_MetaDesc, VecOwnMatDesc) { std::vector vec = { @@ -78,6 +161,7 @@ TEST(GAPI_MetaDesc, VecOwnMatDesc) cv::gapi::own::Mat(480, 640, CV_8UC3, nullptr)}; const auto desc = cv::gapi::own::descrs_of(vec); + EXPECT_EQ((GMatDesc{CV_8U, 1, {320, 240}}), get(desc[0])); EXPECT_EQ((GMatDesc{CV_8U, 3, {640, 480}}), get(desc[1])); } @@ -89,6 +173,7 @@ TEST(GAPI_MetaDesc, AdlVecOwnMatDesc) cv::gapi::own::Mat(480, 640, CV_8UC3, nullptr)}; const auto desc = descrs_of(vec); + EXPECT_EQ((GMatDesc{CV_8U, 1, {320, 240}}), get(desc[0])); EXPECT_EQ((GMatDesc{CV_8U, 3, {640, 480}}), get(desc[1])); } @@ -333,21 +418,4 @@ TEST(GAPI_MetaDesc, Compare_asPlanarTransform) EXPECT_TRUE(desc1.asPlanar(3) == desc0); } -TEST(GAPI_MetaDesc, CanDescribe) -{ - constexpr int w = 15; - constexpr int h = 7; - cv::Mat m0(h, w, CV_8UC3); - cv::GMatDesc md0{CV_8U,3,{w,h},false}; - - cv::Mat m1(h*3, w, CV_8UC1); - cv::GMatDesc md10{CV_8U,3,{w,h},true}; - cv::GMatDesc md11{CV_8U,1,{w,h*3},false}; - - EXPECT_TRUE (md0 .canDescribe(m0)); - EXPECT_FALSE(md0 .canDescribe(m1)); - EXPECT_TRUE (md10.canDescribe(m1)); - EXPECT_TRUE (md11.canDescribe(m1)); -} - } // namespace opencv_test diff --git a/modules/gapi/test/gpu/gapi_core_tests_gpu.cpp b/modules/gapi/test/gpu/gapi_core_tests_gpu.cpp index eec93ea95a..f4c92404bb 100644 --- a/modules/gapi/test/gpu/gapi_core_tests_gpu.cpp +++ b/modules/gapi/test/gpu/gapi_core_tests_gpu.cpp @@ -10,7 +10,7 @@ namespace { -#define CORE_GPU [] () { return cv::compile_args(cv::gapi::core::gpu::kernels()); } +#define CORE_GPU [] () { return cv::compile_args(cv::gapi::use_only{cv::gapi::core::gpu::kernels()}); } } // anonymous namespace namespace opencv_test @@ -98,14 +98,13 @@ INSTANTIATE_TEST_CASE_P(MeanTestGPU, MeanTest, Values(CORE_GPU))); //TODO: mask test doesn't work -#if 0 -INSTANTIATE_TEST_CASE_P(MaskTestGPU, MaskTest, +INSTANTIATE_TEST_CASE_P(DISABLED_MaskTestGPU, MaskTest, Combine(Values(CV_8UC1, CV_16UC1, CV_16SC1), Values(cv::Size(1280, 720), cv::Size(640, 480), cv::Size(128, 128)), + Values(-1), Values(CORE_GPU))); -#endif INSTANTIATE_TEST_CASE_P(SelectTestGPU, SelectTest, Combine(Values( CV_8UC1, CV_8UC3, CV_16UC1, CV_16SC1, CV_32FC1 ), @@ -158,7 +157,7 @@ INSTANTIATE_TEST_CASE_P(BitwiseNotTestGPU, NotTest, Values(-1), Values(CORE_GPU))); -INSTANTIATE_TEST_CASE_P(MinTestGPU, MinTest, +INSTANTIATE_TEST_CASE_P(DISABLED_MinTestGPU, MinTest, Combine(Values( CV_8UC1, CV_8UC3, CV_16UC1, CV_16SC1, CV_32FC1 ), Values(cv::Size(1280, 720), cv::Size(640, 480), @@ -166,7 +165,7 @@ INSTANTIATE_TEST_CASE_P(MinTestGPU, MinTest, Values(-1), Values(CORE_GPU))); -INSTANTIATE_TEST_CASE_P(MaxTestGPU, MaxTest, +INSTANTIATE_TEST_CASE_P(DISABLED_MaxTestGPU, MaxTest, Combine(Values( CV_8UC1, CV_8UC3, CV_16UC1, CV_16SC1, CV_32FC1 ), Values(cv::Size(1280, 720), cv::Size(640, 480), @@ -415,19 +414,19 @@ INSTANTIATE_TEST_CASE_P(ReInitOutTestGPU, ReInitOutTest, cv::Size(10, 480)))); //TODO: fix this backend to allow ConcatVertVec ConcatHorVec -#if 0 -INSTANTIATE_TEST_CASE_P(ConcatVertVecTestGPU, ConcatVertVecTest, +INSTANTIATE_TEST_CASE_P(DISABLED_ConcatVertVecTestGPU, ConcatVertVecTest, Combine(Values( CV_8UC1, CV_8UC3, CV_16UC1, CV_16SC1, CV_32FC1 ), Values(cv::Size(1280, 720), cv::Size(640, 480), cv::Size(128, 128)), + Values(-1), Values(CORE_GPU))); -INSTANTIATE_TEST_CASE_P(ConcatHorVecTestGPU, ConcatHorVecTest, +INSTANTIATE_TEST_CASE_P(DISABLED_ConcatHorVecTestGPU, ConcatHorVecTest, Combine(Values( CV_8UC1, CV_8UC3, CV_16UC1, CV_16SC1, CV_32FC1 ), Values(cv::Size(1280, 720), cv::Size(640, 480), cv::Size(128, 128)), + Values(-1), Values(CORE_GPU))); -#endif } diff --git a/modules/gapi/test/gpu/gapi_imgproc_tests_gpu.cpp b/modules/gapi/test/gpu/gapi_imgproc_tests_gpu.cpp index 7f99e7404e..7db720ae08 100644 --- a/modules/gapi/test/gpu/gapi_imgproc_tests_gpu.cpp +++ b/modules/gapi/test/gpu/gapi_imgproc_tests_gpu.cpp @@ -11,7 +11,7 @@ namespace { -#define IMGPROC_GPU [] () { return cv::compile_args(cv::gapi::imgproc::gpu::kernels()); } +#define IMGPROC_GPU [] () { return cv::compile_args(cv::gapi::use_only{cv::gapi::imgproc::gpu::kernels()}); } } // anonymous namespace namespace opencv_test diff --git a/modules/gapi/test/gpu/gapi_operators_tests_gpu.cpp b/modules/gapi/test/gpu/gapi_operators_tests_gpu.cpp index a939d3208c..0fb83f4a1f 100644 --- a/modules/gapi/test/gpu/gapi_operators_tests_gpu.cpp +++ b/modules/gapi/test/gpu/gapi_operators_tests_gpu.cpp @@ -10,7 +10,7 @@ namespace { -#define CORE_GPU [] () { return cv::compile_args(cv::gapi::core::gpu::kernels()); } +#define CORE_GPU [] () { return cv::compile_args(cv::gapi::use_only{cv::gapi::core::gpu::kernels()}); } } // anonymous namespace namespace opencv_test