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
71ec6144
Commit
71ec6144
authored
Aug 29, 2014
by
Ilya Lavrenov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
attempt to fix compilation of OpenCL cv::transpose for AMD
parent
6ccb7e16
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
matrix.cpp
modules/core/src/matrix.cpp
+2
-2
transpose.cl
modules/core/src/opencl/transpose.cl
+6
-0
No files found.
modules/core/src/matrix.cpp
View file @
71ec6144
...
...
@@ -3011,9 +3011,9 @@ static bool ocl_transpose( InputArray _src, OutputArray _dst )
}
ocl
::
Kernel
k
(
kernelName
.
c_str
(),
ocl
::
core
::
transpose_oclsrc
,
format
(
"-D T=%s -D T1=%s -D cn=%d -D TILE_DIM=%d -D BLOCK_ROWS=%d -D rowsPerWI=%d"
,
format
(
"-D T=%s -D T1=%s -D cn=%d -D TILE_DIM=%d -D BLOCK_ROWS=%d -D rowsPerWI=%d
%s
"
,
ocl
::
memopTypeToStr
(
type
),
ocl
::
memopTypeToStr
(
depth
),
cn
,
TILE_DIM
,
BLOCK_ROWS
,
rowsPerWI
));
cn
,
TILE_DIM
,
BLOCK_ROWS
,
rowsPerWI
,
inplace
?
" -D INPLACE"
:
""
));
if
(
k
.
empty
())
return
false
;
...
...
modules/core/src/opencl/transpose.cl
View file @
71ec6144
...
...
@@ -53,6 +53,8 @@
#
define
TSIZE
((
int
)
sizeof
(
T1
)
*3
)
#
endif
#
ifndef
INPLACE
#
define
LDS_STEP
(
TILE_DIM
+
1
)
__kernel
void
transpose
(
__global
const
uchar
*
srcptr,
int
src_step,
int
src_offset,
int
src_rows,
int
src_cols,
...
...
@@ -114,6 +116,8 @@ __kernel void transpose(__global const uchar * srcptr, int src_step, int src_off
}
}
#
else
__kernel
void
transpose_inplace
(
__global
uchar
*
srcptr,
int
src_step,
int
src_offset,
int
src_rows
)
{
int
x
=
get_global_id
(
0
)
;
...
...
@@ -138,3 +142,5 @@ __kernel void transpose_inplace(__global uchar * srcptr, int src_step, int src_o
}
}
}
#
endif
//
INPLACE
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