Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
1b8c0000
Commit
1b8c0000
authored
Sep 27, 2010
by
Anatoly Baksheev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added black list for gpu tests
parent
50df762c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
6 deletions
+19
-6
arithm.cpp
modules/gpu/src/arithm.cpp
+8
-2
error.cpp
modules/gpu/src/error.cpp
+1
-1
filtering_npp.cpp
modules/gpu/src/filtering_npp.cpp
+1
-1
arithm.cpp
tests/gpu/src/arithm.cpp
+2
-1
gputest_main.cpp
tests/gpu/src/gputest_main.cpp
+7
-1
No files found.
modules/gpu/src/arithm.cpp
View file @
1b8c0000
...
...
@@ -309,7 +309,7 @@ Scalar cv::gpu::sum(const GpuMat& src)
{
CV_Assert
(
src
.
type
()
==
CV_8UC1
||
src
.
type
()
==
CV_8UC4
);
Scalar
res
;
NppiSize
sz
;
...
...
@@ -322,16 +322,22 @@ Scalar cv::gpu::sum(const GpuMat& src)
{
nppiReductionGetBufferHostSize_8u_C1R
(
sz
,
&
bufsz
);
GpuMat
buf
(
1
,
bufsz
,
CV_32S
);
Scalar
res
;
nppSafeCall
(
nppiSum_8u_C1R
(
src
.
ptr
<
Npp8u
>
(),
src
.
step
,
sz
,
buf
.
ptr
<
Npp32s
>
(),
res
.
val
)
);
return
res
;
}
else
{
nppiReductionGetBufferHostSize_8u_C4R
(
sz
,
&
bufsz
);
GpuMat
buf
(
1
,
bufsz
,
CV_32S
);
Scalar
res
;
nppSafeCall
(
nppiSum_8u_C4R
(
src
.
ptr
<
Npp8u
>
(),
src
.
step
,
sz
,
buf
.
ptr
<
Npp32s
>
(),
res
.
val
)
);
return
res
;
}
return
res
;
}
////////////////////////////////////////////////////////////////////////
...
...
modules/gpu/src/error.cpp
View file @
1b8c0000
...
...
@@ -124,7 +124,7 @@ namespace cv
const
string
&
msg
=
(
idx
!=
error_num
)
?
npp_errors
[
idx
].
str
:
string
(
"Unknown error code"
);
std
::
stringstream
interpreter
;
interpreter
<<
"<"
<<
err
<<
"> "
<<
msg
;
interpreter
<<
msg
<<
" [Code = "
<<
err
<<
"]"
;
return
interpreter
.
str
();
}
...
...
modules/gpu/src/filtering_npp.cpp
View file @
1b8c0000
...
...
@@ -69,7 +69,7 @@ namespace
NppiSize
sz
;
sz
.
width
=
src
.
cols
;
sz
.
height
=
dst
.
rows
;
sz
.
height
=
src
.
rows
;
NppiSize
mask_sz
;
mask_sz
.
width
=
kernel
.
cols
;
...
...
tests/gpu/src/arithm.cpp
View file @
1b8c0000
...
...
@@ -590,6 +590,6 @@ CV_GpuNppImageCompareTest CV_GpuNppImageCompare_test;
CV_GpuNppImageMeanStdDevTest
CV_GpuNppImageMeanStdDev_test
;
CV_GpuNppImageNormTest
CV_GpuNppImageNorm_test
;
CV_GpuNppImageFlipTest
CV_GpuNppImageFlip_test
;
//
CV_GpuNppImageSumTest CV_GpuNppImageSum_test;
CV_GpuNppImageSumTest
CV_GpuNppImageSum_test
;
CV_GpuNppImageMinNaxTest
CV_GpuNppImageMinNax_test
;
CV_GpuNppImageLUTTest
CV_GpuNppImageLUT_test
;
\ No newline at end of file
tests/gpu/src/gputest_main.cpp
View file @
1b8c0000
...
...
@@ -43,9 +43,15 @@
CvTS
test_system
;
const
char
*
blacklist
[]
=
{
"GPU-NppImageSum"
,
0
};
int
main
(
int
argc
,
char
**
argv
)
{
return
test_system
.
run
(
argc
,
argv
);
return
test_system
.
run
(
argc
,
argv
,
blacklist
);
}
/* End of file. */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment