add ocl::min and ocl::max (includes accuracy tests update)
This commit is contained in:

committed by
Sebastian Krmer

parent
ae851af648
commit
33df7131ae
@@ -453,6 +453,36 @@ TEST_P(Div, Mat_Scalar)
|
||||
|
||||
//////////////////////////////// Absdiff /////////////////////////////////////////////////
|
||||
|
||||
typedef ArithmTestBase Min;
|
||||
|
||||
TEST_P(Min, Mat)
|
||||
{
|
||||
for (int j = 0; j < LOOP_TIMES; j++)
|
||||
{
|
||||
random_roi();
|
||||
|
||||
dst1_roi = cv::min(src1_roi, src2_roi);
|
||||
cv::ocl::min(gsrc1, gsrc2, gdst1);
|
||||
Near(0);
|
||||
}
|
||||
}
|
||||
|
||||
typedef ArithmTestBase Max;
|
||||
|
||||
TEST_P(Max, Mat)
|
||||
{
|
||||
for (int j = 0; j < LOOP_TIMES; j++)
|
||||
{
|
||||
random_roi();
|
||||
|
||||
dst1_roi = cv::min(src1_roi, src2_roi);
|
||||
cv::ocl::min(gsrc1, gsrc2, gdst1);
|
||||
Near(0);
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////////////// Absdiff /////////////////////////////////////////////////
|
||||
|
||||
typedef ArithmTestBase Absdiff;
|
||||
|
||||
TEST_P(Absdiff, Mat)
|
||||
@@ -1451,6 +1481,8 @@ INSTANTIATE_TEST_CASE_P(Arithm, Add, Combine(testing::Range(CV_8U, CV_USRTYPE1),
|
||||
INSTANTIATE_TEST_CASE_P(Arithm, Sub, Combine(testing::Range(CV_8U, CV_USRTYPE1), testing::Range(1, 5), Bool()));
|
||||
INSTANTIATE_TEST_CASE_P(Arithm, Mul, Combine(testing::Range(CV_8U, CV_USRTYPE1), testing::Range(1, 5), Bool()));
|
||||
INSTANTIATE_TEST_CASE_P(Arithm, Div, Combine(testing::Range(CV_8U, CV_USRTYPE1), testing::Range(1, 5), Bool()));
|
||||
INSTANTIATE_TEST_CASE_P(Arithm, Min, Combine(testing::Range(CV_8U, CV_USRTYPE1), testing::Range(1, 5), Bool()));
|
||||
INSTANTIATE_TEST_CASE_P(Arithm, Max, Combine(testing::Range(CV_8U, CV_USRTYPE1), testing::Range(1, 5), Bool()));
|
||||
INSTANTIATE_TEST_CASE_P(Arithm, Absdiff, Combine(testing::Range(CV_8U, CV_USRTYPE1), testing::Range(1, 5), Bool()));
|
||||
INSTANTIATE_TEST_CASE_P(Arithm, CartToPolar, Combine(Values(CV_32F, CV_64F), testing::Range(1, 5), Bool()));
|
||||
INSTANTIATE_TEST_CASE_P(Arithm, PolarToCart, Combine(Values(CV_32F, CV_64F), testing::Range(1, 5), Bool()));
|
||||
|
Reference in New Issue
Block a user