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
aeaf1a6f
Commit
aeaf1a6f
authored
Aug 19, 2012
by
marina.kolpakova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactoring in Emulation
parent
9c13b84e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
ccomponetns.cu
modules/gpu/src/cuda/ccomponetns.cu
+2
-2
lbp.cu
modules/gpu/src/cuda/lbp.cu
+1
-1
emulation.hpp
modules/gpu/src/opencv2/gpu/device/emulation.hpp
+2
-2
No files found.
modules/gpu/src/cuda/ccomponetns.cu
View file @
aeaf1a6f
...
...
@@ -316,7 +316,7 @@ namespace cv { namespace gpu { namespace device
}
}
changed = Emulation::sy
cth
Or(changed);
changed = Emulation::sy
ncthreads
Or(changed);
if (!changed)
break;
...
...
@@ -474,7 +474,7 @@ namespace cv { namespace gpu { namespace device
}
}
}
} while (Emulation::sy
cth
Or(changed));
} while (Emulation::sy
ncthreads
Or(changed));
}
__global__ void flatten(const DevMem2D edges, DevMem2Di comps)
...
...
modules/gpu/src/cuda/lbp.cu
View file @
aeaf1a6f
...
...
@@ -279,7 +279,7 @@ namespace cv { namespace gpu { namespace device
rect.z = __float2int_rn(windowW * scale);
rect.w = __float2int_rn(windowH * scale);
int res =
Emulation::smem::
atomicInc(classified, (unsigned int)objects.cols);
int res = atomicInc(classified, (unsigned int)objects.cols);
objects(0, res) = rect;
}
}
...
...
modules/gpu/src/opencv2/gpu/device/emulation.hpp
View file @
aeaf1a6f
...
...
@@ -51,11 +51,11 @@ namespace cv { namespace gpu { namespace device
struct
Emulation
{
static
__device__
__forceinline__
int
sy
cth
Or
(
int
pred
)
static
__device__
__forceinline__
int
sy
ncthreads
Or
(
int
pred
)
{
#if defined (__CUDA_ARCH__) && (__CUDA_ARCH__ < 200)
// just campilation stab
return
false
;
return
0
;
#else
return
__syncthreads_or
(
pred
);
#endif
...
...
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