generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ocl: perf test: disable MOG2 (random hungs), enable upload/download

Browse Source
This commit is contained in:
Alexander Alekhin 2013-09-30 16:08:08 +04:00
parent 66e4aead97
commit a8ac3ec72a
2 changed files with 5 additions and 7 deletions

2
modules/ocl/perf/perf_bgfg.cpp

@ -167,7 +167,7 @@ PERF_TEST_P(VideoMOGFixture, MOG,
typedef tuple<string, int> VideoMOG2ParamType; typedef tuple<string, int> VideoMOG2ParamType;
typedef TestBaseWithParam<VideoMOG2ParamType> VideoMOG2Fixture; typedef TestBaseWithParam<VideoMOG2ParamType> VideoMOG2Fixture;
PERF_TEST_P(VideoMOG2Fixture, MOG2, PERF_TEST_P(VideoMOG2Fixture, DISABLED_MOG2, // TODO Disabled: random hungs on buildslave
::testing::Combine(::testing::Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"), ::testing::Combine(::testing::Values("gpu/video/768x576.avi", "gpu/video/1920x1080.avi"),
::testing::Values(1, 3))) ::testing::Values(1, 3)))
{ {

10
modules/ocl/perf/perf_matrix_operation.cpp

@ -161,7 +161,7 @@ PERF_TEST_P(setToFixture, setTo,
typedef tuple<Size, int, int> uploadParams; typedef tuple<Size, int, int> uploadParams;
typedef TestBaseWithParam<uploadParams> uploadFixture; typedef TestBaseWithParam<uploadParams> uploadFixture;
PERF_TEST_P(uploadFixture, DISABLED_upload, PERF_TEST_P(uploadFixture, upload,
testing::Combine( testing::Combine(
OCL_TYPICAL_MAT_SIZES, OCL_TYPICAL_MAT_SIZES,
testing::Range(CV_8U, CV_64F), testing::Range(CV_8U, CV_64F),
@ -190,15 +190,14 @@ PERF_TEST_P(uploadFixture, DISABLED_upload,
else else
OCL_PERF_ELSE OCL_PERF_ELSE
int value = 0; SANITY_CHECK_NOTHING();
SANITY_CHECK(value);
} }
/////////////////// download /////////////////////////// /////////////////// download ///////////////////////////
typedef TestBaseWithParam<uploadParams> downloadFixture; typedef TestBaseWithParam<uploadParams> downloadFixture;
PERF_TEST_P(downloadFixture, DISABLED_download, PERF_TEST_P(downloadFixture, download,
testing::Combine( testing::Combine(
OCL_TYPICAL_MAT_SIZES, OCL_TYPICAL_MAT_SIZES,
testing::Range(CV_8U, CV_64F), testing::Range(CV_8U, CV_64F),
@ -227,6 +226,5 @@ PERF_TEST_P(downloadFixture, DISABLED_download,
else else
OCL_PERF_ELSE OCL_PERF_ELSE
int value = 0; SANITY_CHECK_NOTHING();
SANITY_CHECK(value);
} }