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
087db294
Commit
087db294
authored
Jun 05, 2013
by
Roman Donchenko
Committed by
OpenCV Buildbot
Jun 05, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #948 from jet47:cuda-5.5-support
parents
127a152f
89f3c40d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
11 deletions
+12
-11
vec_math.hpp
modules/gpu/include/opencv2/gpu/device/vec_math.hpp
+0
-0
perf_filters.cpp
modules/gpu/perf/perf_filters.cpp
+1
-1
perf_video.cpp
modules/gpu/perf/perf_video.cpp
+4
-4
ccomponetns.cu
modules/gpu/src/cuda/ccomponetns.cu
+2
-2
hough.cu
modules/gpu/src/cuda/hough.cu
+3
-2
test_optflow.cpp
modules/gpu/test/test_optflow.cpp
+2
-2
No files found.
modules/gpu/include/opencv2/gpu/device/vec_math.hpp
View file @
087db294
This diff is collapsed.
Click to expand it.
modules/gpu/perf/perf_filters.cpp
View file @
087db294
...
...
@@ -72,7 +72,7 @@ PERF_TEST_P(Sz_Type_KernelSz, Filters_Blur,
TEST_CYCLE
()
cv
::
gpu
::
blur
(
d_src
,
dst
,
cv
::
Size
(
ksize
,
ksize
));
GPU_SANITY_CHECK
(
dst
);
GPU_SANITY_CHECK
(
dst
,
1
);
}
else
{
...
...
modules/gpu/perf/perf_video.cpp
View file @
087db294
...
...
@@ -103,7 +103,7 @@ PERF_TEST_P(ImagePair, Video_InterpolateFrames,
TEST_CYCLE
()
cv
::
gpu
::
interpolateFrames
(
d_frame0
,
d_frame1
,
d_fu
,
d_fv
,
d_bu
,
d_bv
,
0.5
f
,
newFrame
,
d_buf
);
GPU_SANITY_CHECK
(
newFrame
);
GPU_SANITY_CHECK
(
newFrame
,
1e-4
);
}
else
{
...
...
@@ -142,7 +142,7 @@ PERF_TEST_P(ImagePair, Video_CreateOpticalFlowNeedleMap,
TEST_CYCLE
()
cv
::
gpu
::
createOpticalFlowNeedleMap
(
u
,
v
,
vertex
,
colors
);
GPU_SANITY_CHECK
(
vertex
);
GPU_SANITY_CHECK
(
vertex
,
1e-6
);
GPU_SANITY_CHECK
(
colors
);
}
else
...
...
@@ -219,8 +219,8 @@ PERF_TEST_P(ImagePair, Video_BroxOpticalFlow,
TEST_CYCLE
()
d_flow
(
d_frame0
,
d_frame1
,
u
,
v
);
GPU_SANITY_CHECK
(
u
);
GPU_SANITY_CHECK
(
v
);
GPU_SANITY_CHECK
(
u
,
1e-1
);
GPU_SANITY_CHECK
(
v
,
1e-1
);
}
else
{
...
...
modules/gpu/src/cuda/ccomponetns.cu
View file @
087db294
...
...
@@ -153,7 +153,7 @@ namespace cv { namespace gpu { namespace device
template<typename I> __device__ __forceinline__ bool operator() (const I& a, const I& b) const
{
I d =
a - b
;
I d =
saturate_cast<I>(a - b)
;
return lo.x <= d.x && d.x <= hi.x &&
lo.y <= d.y && d.y <= hi.y &&
lo.z <= d.z && d.z <= hi.z;
...
...
@@ -169,7 +169,7 @@ namespace cv { namespace gpu { namespace device
template<typename I> __device__ __forceinline__ bool operator() (const I& a, const I& b) const
{
I d =
a - b
;
I d =
saturate_cast<I>(a - b)
;
return lo.x <= d.x && d.x <= hi.x &&
lo.y <= d.y && d.y <= hi.y &&
lo.z <= d.z && d.z <= hi.z &&
...
...
modules/gpu/src/cuda/hough.cu
View file @
087db294
...
...
@@ -48,6 +48,7 @@
#include "opencv2/gpu/device/common.hpp"
#include "opencv2/gpu/device/emulation.hpp"
#include "opencv2/gpu/device/vec_math.hpp"
#include "opencv2/gpu/device/functional.hpp"
#include "opencv2/gpu/device/limits.hpp"
#include "opencv2/gpu/device/dynamic_smem.hpp"
...
...
@@ -811,7 +812,7 @@ namespace cv { namespace gpu { namespace device
const int ind = ::atomicAdd(r_sizes + n, 1);
if (ind < maxSize)
r_table(n, ind) =
p - templCenter
;
r_table(n, ind) =
saturate_cast<short2>(p - templCenter)
;
}
void buildRTable_gpu(const unsigned int* coordList, const float* thetaList, int pointsCount,
...
...
@@ -855,7 +856,7 @@ namespace cv { namespace gpu { namespace device
for (int j = 0; j < r_row_size; ++j)
{
shor
t2 c = p - r_row[j];
in
t2 c = p - r_row[j];
c.x = __float2int_rn(c.x * idp);
c.y = __float2int_rn(c.y * idp);
...
...
modules/gpu/test/test_optflow.cpp
View file @
087db294
...
...
@@ -102,8 +102,8 @@ GPU_TEST_P(BroxOpticalFlow, Regression)
for
(
int
i
=
0
;
i
<
v_gold
.
rows
;
++
i
)
f
.
read
(
v_gold
.
ptr
<
char
>
(
i
),
v_gold
.
cols
*
sizeof
(
float
));
EXPECT_MAT_
NEAR
(
u_gold
,
u
,
0
);
EXPECT_MAT_
NEAR
(
v_gold
,
v
,
0
);
EXPECT_MAT_
SIMILAR
(
u_gold
,
u
,
1e-3
);
EXPECT_MAT_
SIMILAR
(
v_gold
,
v
,
1e-3
);
#else
std
::
ofstream
f
(
fname
.
c_str
(),
std
::
ios_base
::
binary
);
...
...
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