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

fixed cv::multuply, cv::divide

Browse Source
This commit is contained in:
Ilya Lavrenov
2013-12-22 15:07:24 +04:00
parent b29835a8f8
commit febb200eee
3 changed files with 90 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
modules/core/test/ocl/test_arithm.cpp
View File

@@ -293,7 +293,7 @@ OCL_TEST_P(Mul, Mat)
}
}
OCL_TEST_P(Mul, DISABLED_Scalar)
OCL_TEST_P(Mul, Scalar)
{
for (int j = 0; j < test_loop_times; j++)
{
@@ -306,7 +306,7 @@ OCL_TEST_P(Mul, DISABLED_Scalar)
}
}
OCL_TEST_P(Mul, DISABLED_Mat_Scale)
OCL_TEST_P(Mul, Mat_Scale)
{
for (int j = 0; j < test_loop_times; j++)
{
@@ -319,6 +319,20 @@ OCL_TEST_P(Mul, DISABLED_Mat_Scale)
}
}
OCL_TEST_P(Mul, Mat_Scalar_Scale)
{
for (int j = 0; j < test_loop_times; j++)
{
generateTestData();
OCL_OFF(cv::multiply(src1_roi, val, dst1_roi, val[0]));
OCL_ON(cv::multiply(usrc1_roi, val, udst1_roi, val[0]));
Near(udst1_roi.depth() >= CV_32F ? 1e-2 : 1);
}
}
//////////////////////////////// Div /////////////////////////////////////////////////
typedef ArithmTestBase Div;
@@ -335,7 +349,7 @@ OCL_TEST_P(Div, Mat)
}
}
OCL_TEST_P(Div, DISABLED_Scalar)
OCL_TEST_P(Div, Scalar)
{
for (int j = 0; j < test_loop_times; j++)
{
@@ -348,6 +362,19 @@ OCL_TEST_P(Div, DISABLED_Scalar)
}
}
OCL_TEST_P(Div, Scalar2)
{
for (int j = 0; j < test_loop_times; j++)
{
generateTestData();
OCL_OFF(cv::divide(src1_roi, val, dst1_roi));
OCL_ON(cv::divide(usrc1_roi, val, udst1_roi));
Near(udst1_roi.depth() >= CV_32F ? 1e-3 : 1);
}
}
OCL_TEST_P(Div, Mat_Scale)
{
for (int j = 0; j < test_loop_times; j++)
@@ -361,8 +388,7 @@ OCL_TEST_P(Div, Mat_Scale)
}
}
OCL_TEST_P(Div, DISABLED_Mat_Scalar_Scale)
OCL_TEST_P(Div, Mat_Scalar_Scale)
{
for (int j = 0; j < test_loop_times; j++)
{
@@ -375,6 +401,19 @@ OCL_TEST_P(Div, DISABLED_Mat_Scalar_Scale)
}
}
OCL_TEST_P(Div, Recip)
{
for (int j = 0; j < test_loop_times; j++)
{
generateTestData();
OCL_OFF(cv::divide(val[0], src1_roi, dst1_roi));
OCL_ON(cv::divide(val[0], usrc1_roi, udst1_roi));
Near(udst1_roi.depth() >= CV_32F ? 1e-3 : 1);
}
}
//////////////////////////////// Min/Max /////////////////////////////////////////////////
typedef ArithmTestBase Min;