Merge pull request #3671 from jet47:disable-gpu-match-template-tests

This commit is contained in:
Vadim Pisarevsky 2015-02-04 13:17:25 +00:00
commit 5253265342
2 changed files with 8 additions and 8 deletions

View File

@ -908,7 +908,7 @@ CV_ENUM(TemplateMethod, TM_SQDIFF, TM_SQDIFF_NORMED, TM_CCORR, TM_CCORR_NORMED,
DEF_PARAM_TEST(Sz_TemplateSz_Cn_Method, cv::Size, cv::Size, MatCn, TemplateMethod); DEF_PARAM_TEST(Sz_TemplateSz_Cn_Method, cv::Size, cv::Size, MatCn, TemplateMethod);
PERF_TEST_P(Sz_TemplateSz_Cn_Method, ImgProc_MatchTemplate8U, PERF_TEST_P(Sz_TemplateSz_Cn_Method, DISABLED_ImgProc_MatchTemplate8U,
Combine(GPU_TYPICAL_MAT_SIZES, Combine(GPU_TYPICAL_MAT_SIZES,
Values(cv::Size(5, 5), cv::Size(16, 16), cv::Size(30, 30)), Values(cv::Size(5, 5), cv::Size(16, 16), cv::Size(30, 30)),
GPU_CHANNELS_1_3_4, GPU_CHANNELS_1_3_4,
@ -948,7 +948,7 @@ PERF_TEST_P(Sz_TemplateSz_Cn_Method, ImgProc_MatchTemplate8U,
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// MatchTemplate32F // MatchTemplate32F
PERF_TEST_P(Sz_TemplateSz_Cn_Method, ImgProc_MatchTemplate32F, PERF_TEST_P(Sz_TemplateSz_Cn_Method, DISABLED_ImgProc_MatchTemplate32F,
Combine(GPU_TYPICAL_MAT_SIZES, Combine(GPU_TYPICAL_MAT_SIZES,
Values(cv::Size(5, 5), cv::Size(16, 16), cv::Size(30, 30)), Values(cv::Size(5, 5), cv::Size(16, 16), cv::Size(30, 30)),
GPU_CHANNELS_1_3_4, GPU_CHANNELS_1_3_4,

View File

@ -681,7 +681,7 @@ PARAM_TEST_CASE(MatchTemplate8U, cv::gpu::DeviceInfo, cv::Size, TemplateSize, Ch
} }
}; };
GPU_TEST_P(MatchTemplate8U, Accuracy) GPU_TEST_P(MatchTemplate8U, DISABLED_Accuracy)
{ {
cv::Mat image = randomMat(size, CV_MAKETYPE(CV_8U, cn)); cv::Mat image = randomMat(size, CV_MAKETYPE(CV_8U, cn));
cv::Mat templ = randomMat(templ_size, CV_MAKETYPE(CV_8U, cn)); cv::Mat templ = randomMat(templ_size, CV_MAKETYPE(CV_8U, cn));
@ -738,7 +738,7 @@ PARAM_TEST_CASE(MatchTemplate32F, cv::gpu::DeviceInfo, cv::Size, TemplateSize, C
} }
}; };
GPU_TEST_P(MatchTemplate32F, Regression) GPU_TEST_P(MatchTemplate32F, DISABLED_Regression)
{ {
cv::Mat image = randomMat(size, CV_MAKETYPE(CV_32F, cn)); cv::Mat image = randomMat(size, CV_MAKETYPE(CV_32F, cn));
cv::Mat templ = randomMat(templ_size, CV_MAKETYPE(CV_32F, cn)); cv::Mat templ = randomMat(templ_size, CV_MAKETYPE(CV_32F, cn));
@ -787,7 +787,7 @@ PARAM_TEST_CASE(MatchTemplateBlackSource, cv::gpu::DeviceInfo, TemplateMethod)
} }
}; };
GPU_TEST_P(MatchTemplateBlackSource, Accuracy) GPU_TEST_P(MatchTemplateBlackSource, DISABLED_Accuracy)
{ {
cv::Mat image = readImage("matchtemplate/black.png"); cv::Mat image = readImage("matchtemplate/black.png");
ASSERT_FALSE(image.empty()); ASSERT_FALSE(image.empty());
@ -832,7 +832,7 @@ PARAM_TEST_CASE(MatchTemplate_CCOEF_NORMED, cv::gpu::DeviceInfo, std::pair<std::
} }
}; };
GPU_TEST_P(MatchTemplate_CCOEF_NORMED, Accuracy) GPU_TEST_P(MatchTemplate_CCOEF_NORMED, DISABLED_Accuracy)
{ {
cv::Mat image = readImage(imageName); cv::Mat image = readImage(imageName);
ASSERT_FALSE(image.empty()); ASSERT_FALSE(image.empty());
@ -881,7 +881,7 @@ struct MatchTemplate_CanFindBigTemplate : testing::TestWithParam<cv::gpu::Device
} }
}; };
GPU_TEST_P(MatchTemplate_CanFindBigTemplate, SQDIFF_NORMED) GPU_TEST_P(MatchTemplate_CanFindBigTemplate, DISABLED_SQDIFF_NORMED)
{ {
cv::Mat scene = readImage("matchtemplate/scene.png"); cv::Mat scene = readImage("matchtemplate/scene.png");
ASSERT_FALSE(scene.empty()); ASSERT_FALSE(scene.empty());
@ -904,7 +904,7 @@ GPU_TEST_P(MatchTemplate_CanFindBigTemplate, SQDIFF_NORMED)
ASSERT_EQ(0, minLoc.y); ASSERT_EQ(0, minLoc.y);
} }
GPU_TEST_P(MatchTemplate_CanFindBigTemplate, SQDIFF) GPU_TEST_P(MatchTemplate_CanFindBigTemplate, DISABLED_SQDIFF)
{ {
cv::Mat scene = readImage("matchtemplate/scene.png"); cv::Mat scene = readImage("matchtemplate/scene.png");
ASSERT_FALSE(scene.empty()); ASSERT_FALSE(scene.empty());