Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
ada8f92c
O
Opencv
项目概览
Greenplum
/
Opencv
10 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ada8f92c
编写于
5月 09, 2013
作者:
Y
yao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix warnings, unify test names
上级
b6313951
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
34 addition
and
110 deletion
+34
-110
modules/ocl/test/test_arithm.cpp
modules/ocl/test/test_arithm.cpp
+7
-26
modules/ocl/test/test_blend.cpp
modules/ocl/test/test_blend.cpp
+1
-1
modules/ocl/test/test_columnsum.cpp
modules/ocl/test/test_columnsum.cpp
+1
-1
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_filters.cpp
+1
-3
modules/ocl/test/test_hog.cpp
modules/ocl/test/test_hog.cpp
+1
-1
modules/ocl/test/test_match_template.cpp
modules/ocl/test/test_match_template.cpp
+2
-6
modules/ocl/test/test_matrix_operation.cpp
modules/ocl/test/test_matrix_operation.cpp
+7
-35
modules/ocl/test/test_moments.cpp
modules/ocl/test/test_moments.cpp
+5
-5
modules/ocl/test/test_pyrdown.cpp
modules/ocl/test/test_pyrdown.cpp
+2
-6
modules/ocl/test/test_pyrup.cpp
modules/ocl/test/test_pyrup.cpp
+2
-5
modules/ocl/test/test_split_merge.cpp
modules/ocl/test/test_split_merge.cpp
+5
-21
未找到文件。
modules/ocl/test/test_arithm.cpp
浏览文件 @
ada8f92c
...
...
@@ -174,16 +174,12 @@ PARAM_TEST_CASE(ArithmTestBase, MatType, bool)
void
Near
(
double
threshold
=
0.
)
{
cv
::
Mat
cpu_dst
;
gdst_whole
.
download
(
cpu_dst
);
EXPECT_MAT_NEAR
(
dst
,
cpu_dst
,
threshold
);
EXPECT_MAT_NEAR
(
dst
,
Mat
(
gdst_whole
),
threshold
);
}
void
Near1
(
double
threshold
=
0.
)
{
cv
::
Mat
cpu_dst1
;
gdst1_whole
.
download
(
cpu_dst1
);
EXPECT_MAT_NEAR
(
dst1
,
cpu_dst1
,
threshold
);
{
EXPECT_MAT_NEAR
(
dst1
,
Mat
(
gdst1_whole
),
threshold
);
}
};
...
...
@@ -1169,33 +1165,18 @@ TEST_P(MagnitudeSqr, Mat)
{
for
(
int
j
=
0
;
j
<
LOOP_TIMES
;
j
++
)
{
// random_roi();
// int64 start, end;
// start = cv::getTickCount();
random_roi
();
for
(
int
i
=
0
;
i
<
mat1
.
rows
;
++
i
)
for
(
int
j
=
0
;
j
<
mat1
.
cols
;
++
j
)
{
float
val1
=
mat1
.
at
<
float
>
(
i
,
j
);
float
val2
=
mat2
.
at
<
float
>
(
i
,
j
);
((
float
*
)(
dst
.
data
))[
i
*
dst
.
step
/
4
+
j
]
=
val1
*
val1
+
val2
*
val2
;
// float val1 =((float *)( mat1.data))[(i*mat1.step/8 +j)*2];
//
// float val2 =((float *)( mat1.data))[(i*mat1.step/8 +j)*2+ 1 ];
// ((float *)(dst.data))[i*dst.step/4 +j]= val1 * val1 +val2 * val2;
}
// end = cv::getTickCount();
cv
::
ocl
::
oclMat
clmat1
(
mat1
),
clmat2
(
mat2
),
cldst
;
cv
::
ocl
::
magnitudeSqr
(
clmat1
,
clmat2
,
cldst
);
cv
::
Mat
cpu_dst
;
cldst
.
download
(
cpu_dst
);
EXPECT_MAT_NEAR
(
dst
,
cpu_dst
,
1
);
cv
::
ocl
::
oclMat
clmat1
(
mat1
),
clmat2
(
mat2
);
cv
::
ocl
::
magnitudeSqr
(
clmat1
,
clmat2
,
gdst
);
Near
(
1
);
}
}
...
...
modules/ocl/test/test_blend.cpp
浏览文件 @
ada8f92c
...
...
@@ -112,7 +112,7 @@ TEST_P(Blend, Accuracy)
EXPECT_MAT_NEAR
(
result_gold
,
result
,
CV_MAT_DEPTH
(
type
)
==
CV_8U
?
1.
f
:
1e-5
f
);
}
INSTANTIATE_TEST_CASE_P
(
GPU
_ImgProc
,
Blend
,
Combine
(
INSTANTIATE_TEST_CASE_P
(
OCL
_ImgProc
,
Blend
,
Combine
(
DIFFERENT_SIZES
,
testing
::
Values
(
MatType
(
CV_8UC1
),
MatType
(
CV_8UC3
),
MatType
(
CV_8UC4
),
MatType
(
CV_32FC1
),
MatType
(
CV_32FC4
))
));
...
...
modules/ocl/test/test_columnsum.cpp
浏览文件 @
ada8f92c
...
...
@@ -88,7 +88,7 @@ TEST_P(ColumnSum, Accuracy)
}
}
INSTANTIATE_TEST_CASE_P
(
GPU
_ImgProc
,
ColumnSum
,
DIFFERENT_SIZES
);
INSTANTIATE_TEST_CASE_P
(
OCL
_ImgProc
,
ColumnSum
,
DIFFERENT_SIZES
);
#endif
modules/ocl/test/test_filters.cpp
浏览文件 @
ada8f92c
...
...
@@ -125,9 +125,7 @@ PARAM_TEST_CASE(FilterTestBase,
void
Near
(
double
threshold
)
{
cv
::
Mat
cpu_dst
;
gdst_whole
.
download
(
cpu_dst
);
EXPECT_MAT_NEAR
(
dst
,
cpu_dst
,
threshold
);
EXPECT_MAT_NEAR
(
dst
,
Mat
(
gdst_whole
),
threshold
);
}
};
...
...
modules/ocl/test/test_hog.cpp
浏览文件 @
ada8f92c
...
...
@@ -244,7 +244,7 @@ TEST_P(HOG, Detect)
}
INSTANTIATE_TEST_CASE_P
(
GPU_ImgProc
,
HOG
,
testing
::
Combine
(
INSTANTIATE_TEST_CASE_P
(
OCL_ObjDetect
,
HOG
,
testing
::
Combine
(
testing
::
Values
(
cv
::
Size
(
64
,
128
),
cv
::
Size
(
48
,
96
)),
testing
::
Values
(
MatType
(
CV_8UC1
),
MatType
(
CV_8UC4
))));
...
...
modules/ocl/test/test_match_template.cpp
浏览文件 @
ada8f92c
...
...
@@ -89,12 +89,10 @@ TEST_P(MatchTemplate8U, Accuracy)
cv
::
Mat
dst_gold
;
cv
::
matchTemplate
(
image
,
templ
,
dst_gold
,
method
);
char
sss
[
100
]
=
""
;
cv
::
Mat
mat_dst
;
dst
.
download
(
mat_dst
);
EXPECT_MAT_NEAR
(
dst_gold
,
mat_dst
,
templ_size
.
area
()
*
1e-1
,
sss
);
EXPECT_MAT_NEAR
(
dst_gold
,
mat_dst
,
templ_size
.
area
()
*
1e-1
);
}
PARAM_TEST_CASE
(
MatchTemplate32F
,
cv
::
Size
,
TemplateSize
,
Channels
,
TemplateMethod
)
...
...
@@ -125,12 +123,10 @@ TEST_P(MatchTemplate32F, Accuracy)
cv
::
Mat
dst_gold
;
cv
::
matchTemplate
(
image
,
templ
,
dst_gold
,
method
);
char
sss
[
100
]
=
""
;
cv
::
Mat
mat_dst
;
dst
.
download
(
mat_dst
);
EXPECT_MAT_NEAR
(
dst_gold
,
mat_dst
,
templ_size
.
area
()
*
1e-1
,
sss
);
EXPECT_MAT_NEAR
(
dst_gold
,
mat_dst
,
templ_size
.
area
()
*
1e-1
);
}
INSTANTIATE_TEST_CASE_P
(
OCL_ImgProc
,
MatchTemplate8U
,
...
...
modules/ocl/test/test_matrix_operation.cpp
浏览文件 @
ada8f92c
...
...
@@ -135,12 +135,7 @@ TEST_P(ConvertTo, Accuracy)
mat_roi
.
convertTo
(
dst_roi
,
dst_type
);
gmat
.
convertTo
(
gdst
,
dst_type
);
cv
::
Mat
cpu_dst
;
gdst_whole
.
download
(
cpu_dst
);
char
sss
[
1024
];
sprintf
(
sss
,
"roicols=%d,roirows=%d,srcx =%d,srcy=%d,dstx=%d,dsty=%d"
,
roicols
,
roirows
,
srcx
,
srcy
,
dstx
,
dsty
);
EXPECT_MAT_NEAR
(
dst
,
cpu_dst
,
0.0
,
sss
);
EXPECT_MAT_NEAR
(
dst
,
Mat
(
gdst_whole
),
0.0
);
}
}
...
...
@@ -242,12 +237,7 @@ TEST_P(CopyTo, Without_mask)
mat_roi
.
copyTo
(
dst_roi
);
gmat
.
copyTo
(
gdst
);
cv
::
Mat
cpu_dst
;
gdst_whole
.
download
(
cpu_dst
);
char
sss
[
1024
];
sprintf
(
sss
,
"roicols=%d,roirows=%d,srcx =%d,srcy=%d,dstx=%d,dsty=%d,maskx=%d,masky=%d"
,
roicols
,
roirows
,
srcx
,
srcy
,
dstx
,
dsty
,
maskx
,
masky
);
EXPECT_MAT_NEAR
(
dst
,
cpu_dst
,
0.0
,
sss
);
EXPECT_MAT_NEAR
(
dst
,
Mat
(
gdst_whole
),
0.0
);
}
}
...
...
@@ -260,12 +250,7 @@ TEST_P(CopyTo, With_mask)
mat_roi
.
copyTo
(
dst_roi
,
mask_roi
);
gmat
.
copyTo
(
gdst
,
gmask
);
cv
::
Mat
cpu_dst
;
gdst_whole
.
download
(
cpu_dst
);
char
sss
[
1024
];
sprintf
(
sss
,
"roicols=%d,roirows=%d,srcx =%d,srcy=%d,dstx=%d,dsty=%d,maskx=%d,masky=%d"
,
roicols
,
roirows
,
srcx
,
srcy
,
dstx
,
dsty
,
maskx
,
masky
);
EXPECT_MAT_NEAR
(
dst
,
cpu_dst
,
0.0
,
sss
);
EXPECT_MAT_NEAR
(
dst
,
Mat
(
gdst_whole
),
0.0
);
}
}
...
...
@@ -357,12 +342,7 @@ TEST_P(SetTo, Without_mask)
mat_roi
.
setTo
(
val
);
gmat
.
setTo
(
val
);
cv
::
Mat
cpu_dst
;
gmat_whole
.
download
(
cpu_dst
);
char
sss
[
1024
];
sprintf
(
sss
,
"roicols=%d,roirows=%d,srcx =%d,srcy=%d,maskx=%d,masky=%d"
,
roicols
,
roirows
,
srcx
,
srcy
,
maskx
,
masky
);
EXPECT_MAT_NEAR
(
mat
,
cpu_dst
,
1.
,
sss
);
EXPECT_MAT_NEAR
(
mat
,
Mat
(
gmat_whole
),
1.
);
}
}
...
...
@@ -375,12 +355,7 @@ TEST_P(SetTo, With_mask)
mat_roi
.
setTo
(
val
,
mask_roi
);
gmat
.
setTo
(
val
,
gmask
);
cv
::
Mat
cpu_dst
;
gmat_whole
.
download
(
cpu_dst
);
char
sss
[
1024
];
sprintf
(
sss
,
"roicols=%d,roirows=%d,srcx =%d,srcy=%d,maskx=%d,masky=%d"
,
roicols
,
roirows
,
srcx
,
srcy
,
maskx
,
masky
);
EXPECT_MAT_NEAR
(
mat
,
cpu_dst
,
1.
,
sss
);
EXPECT_MAT_NEAR
(
mat
,
Mat
(
gmat_whole
),
1.
);
}
}
...
...
@@ -464,11 +439,8 @@ TEST_P(convertC3C4, Accuracy)
mat1
=
randomMat
(
rng
,
size
,
type
,
0
,
40
,
false
);
gmat1
=
mat1
;
cv
::
Mat
cpu_dst
;
gmat1
.
download
(
cpu_dst
);
char
sss
[
1024
];
sprintf
(
sss
,
"cols=%d,rows=%d"
,
mat1
.
cols
,
mat1
.
rows
);
EXPECT_MAT_NEAR
(
mat1
,
cpu_dst
,
0.0
,
sss
);
EXPECT_MAT_NEAR
(
mat1
,
Mat
(
gmat1
),
0.0
);
}
}
...
...
modules/ocl/test/test_moments.cpp
浏览文件 @
ada8f92c
...
...
@@ -10,7 +10,7 @@ using namespace cvtest;
using
namespace
testing
;
using
namespace
std
;
extern
string
workdir
;
PARAM_TEST_CASE
(
MomentsTest
Base
,
MatType
,
bool
)
PARAM_TEST_CASE
(
MomentsTest
,
MatType
,
bool
)
{
int
type
;
cv
::
Mat
mat1
;
...
...
@@ -30,13 +30,13 @@ PARAM_TEST_CASE(MomentsTestBase, MatType, bool)
Mat
gpu_dst
,
cpu_dst
;
HuMoments
(
cpu
,
cpu_dst
);
HuMoments
(
gpu
,
gpu_dst
);
EXPECT_MAT_NEAR
(
gpu_dst
,
cpu_dst
,
.5
,
""
);
EXPECT_MAT_NEAR
(
gpu_dst
,
cpu_dst
,
.5
);
}
};
struct
ocl_Moments
:
MomentsTestBase
{};
TEST_P
(
ocl_Moments
,
Mat
)
TEST_P
(
MomentsTest
,
Mat
)
{
bool
binaryImage
=
0
;
SetUp
();
...
...
@@ -67,6 +67,6 @@ TEST_P(ocl_Moments, Mat)
}
}
INSTANTIATE_TEST_CASE_P
(
Moments
,
ocl_Moments
,
Combine
(
INSTANTIATE_TEST_CASE_P
(
OCL_ImgProc
,
MomentsTest
,
Combine
(
Values
(
CV_8UC1
,
CV_16UC1
,
CV_16SC1
,
CV_64FC1
),
Values
(
true
,
false
)));
#endif // HAVE_OPENCL
modules/ocl/test/test_pyrdown.cpp
浏览文件 @
ada8f92c
...
...
@@ -83,15 +83,11 @@ TEST_P(PyrDown, Mat)
cv
::
pyrDown
(
src
,
dst_cpu
);
cv
::
ocl
::
pyrDown
(
gsrc
,
gdst
);
cv
::
Mat
dst
;
gdst
.
download
(
dst
);
char
s
[
1024
]
=
{
0
};
EXPECT_MAT_NEAR
(
dst
,
dst_cpu
,
dst
.
depth
()
==
CV_32F
?
1e-4
f
:
1.0
f
,
s
);
EXPECT_MAT_NEAR
(
dst_cpu
,
Mat
(
gdst
),
type
==
CV_32F
?
1e-4
f
:
1.0
f
);
}
}
INSTANTIATE_TEST_CASE_P
(
GPU
_ImgProc
,
PyrDown
,
Combine
(
INSTANTIATE_TEST_CASE_P
(
OCL
_ImgProc
,
PyrDown
,
Combine
(
Values
(
CV_8U
,
CV_32F
),
Values
(
1
,
3
,
4
)));
...
...
modules/ocl/test/test_pyrup.cpp
浏览文件 @
ada8f92c
...
...
@@ -77,17 +77,14 @@ TEST_P(PyrUp, Accuracy)
ocl
::
oclMat
dst
;
ocl
::
oclMat
srcMat
(
src
);
ocl
::
pyrUp
(
srcMat
,
dst
);
Mat
cpu_dst
;
dst
.
download
(
cpu_dst
);
char
s
[
100
]
=
{
0
};
EXPECT_MAT_NEAR
(
dst_gold
,
cpu_dst
,
(
src
.
depth
()
==
CV_32F
?
1e-4
f
:
1.0
),
s
);
EXPECT_MAT_NEAR
(
dst_gold
,
Mat
(
dst
),
(
type
==
CV_32F
?
1e-4
f
:
1.0
)
);
}
}
INSTANTIATE_TEST_CASE_P
(
GPU
_ImgProc
,
PyrUp
,
testing
::
Combine
(
INSTANTIATE_TEST_CASE_P
(
OCL
_ImgProc
,
PyrUp
,
testing
::
Combine
(
Values
(
CV_8U
,
CV_32F
),
Values
(
1
,
3
,
4
)));
...
...
modules/ocl/test/test_split_merge.cpp
浏览文件 @
ada8f92c
...
...
@@ -202,12 +202,7 @@ TEST_P(Merge, Accuracy)
cv
::
merge
(
dev_src
,
dst_roi
);
cv
::
ocl
::
merge
(
dev_gsrc
,
gdst
);
cv
::
Mat
cpu_dst
;
gdst_whole
.
download
(
cpu_dst
);
char
sss
[
1024
];
sprintf
(
sss
,
"roicols=%d,roirows=%d,src1x =%d,src1y=%d,src2x =%d,src2y=%d,src3x =%d,src3y=%d,src4x =%d,src4y=%d,dstx=%d,dsty=%d"
,
roicols
,
roirows
,
src1x
,
src1y
,
src2x
,
src2y
,
src3x
,
src3y
,
src4x
,
src4y
,
dstx
,
dsty
);
EXPECT_MAT_NEAR
(
dst
,
cpu_dst
,
0.0
,
sss
);
EXPECT_MAT_NEAR
(
dst
,
Mat
(
gdst_whole
),
0.0
);
}
}
...
...
@@ -349,28 +344,17 @@ TEST_P(Split, Accuracy)
cv
::
split
(
mat_roi
,
dev_dst
);
cv
::
ocl
::
split
(
gmat
,
dev_gdst
);
cv
::
Mat
cpu_dst1
;
cv
::
Mat
cpu_dst2
;
cv
::
Mat
cpu_dst3
;
cv
::
Mat
cpu_dst4
;
gdst1_whole
.
download
(
cpu_dst1
);
gdst2_whole
.
download
(
cpu_dst2
);
gdst3_whole
.
download
(
cpu_dst3
);
gdst4_whole
.
download
(
cpu_dst4
);
char
sss
[
1024
];
sprintf
(
sss
,
"roicols=%d,roirows=%d,dst1x =%d,dsty=%d,dst2x =%d,dst2y=%d,dst3x =%d,dst3y=%d,dst4x =%d,dst4y=%d,srcx=%d,srcy=%d"
,
roicols
,
roirows
,
dst1x
,
dst1y
,
dst2x
,
dst2y
,
dst3x
,
dst3y
,
dst4x
,
dst4y
,
srcx
,
srcy
);
if
(
channels
>=
1
)
EXPECT_MAT_NEAR
(
dst1
,
cpu_dst1
,
0.0
,
sss
);
EXPECT_MAT_NEAR
(
dst1
,
Mat
(
gdst1_whole
),
0.0
);
if
(
channels
>=
2
)
EXPECT_MAT_NEAR
(
dst2
,
cpu_dst2
,
0.0
,
sss
);
EXPECT_MAT_NEAR
(
dst2
,
Mat
(
gdst2_whole
),
0.0
);
if
(
channels
>=
3
)
EXPECT_MAT_NEAR
(
dst3
,
cpu_dst3
,
0.0
,
sss
);
EXPECT_MAT_NEAR
(
dst3
,
Mat
(
gdst3_whole
),
0.0
);
if
(
channels
>=
4
)
EXPECT_MAT_NEAR
(
dst4
,
cpu_dst4
,
0.0
,
sss
);
EXPECT_MAT_NEAR
(
dst4
,
Mat
(
gdst4_whole
),
0.0
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录