Skip to content

O
opencv
Commit a8ac3ec7 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

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

parent 66e4aead
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
modules/ocl/perf/perf_bgfg.cpp
View file @ a8ac3ec7
...@@ -167,7 +167,7 @@ PERF_TEST_P(VideoMOGFixture, MOG, ...@@ -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)))
{ {
......
modules/ocl/perf/perf_matrix_operation.cpp
View file @ a8ac3ec7
...@@ -161,7 +161,7 @@ PERF_TEST_P(setToFixture, setTo, ...@@ -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, ...@@ -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, ...@@ -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);
} }
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