diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp
index 689b57d885838403ad282b2380556122bb25714f..94ce7aff96d591bc228ba5a9212baa1fbec32806 100644
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@@ -2574,18 +2574,63 @@ static TransposeInplaceFunc transposeInplaceTab[] =
0, 0, 0, 0, 0, 0, 0, transposeI_32sC6, 0, 0, 0, 0, 0, 0, 0, transposeI_32sC8
};
+static inline int divUp(int a, int b)
+{
+ return (a + b - 1) / b;
+}
+
+static bool ocl_transpose( InputArray _src, OutputArray _dst )
+{
+ const int TILE_DIM = 32, BLOCK_ROWS = 8;
+ int type = _src.type(), cn = CV_MAT_CN(type);
+
+ if (cn == 3)
+ return false;
+
+ UMat src = _src.getUMat();
+ _dst.create(src.cols, src.rows, type);
+ UMat dst = _dst.getUMat();
+
+ String kernelName("transpose");
+ bool inplace = dst.u == src.u;
+
+ if (inplace)
+ {
+ CV_Assert(dst.cols == dst.rows);
+ kernelName += "_inplace";
+ }
+
+ ocl::Kernel k(kernelName.c_str(), ocl::core::transpose_oclsrc,
+ format("-D T=%s -D TILE_DIM=%d -D BLOCK_ROWS=%d",
+ ocl::memopTypeToStr(type), TILE_DIM, BLOCK_ROWS));
+ if (inplace)
+ k.args(ocl::KernelArg::ReadWriteNoSize(dst), dst.rows);
+ else
+ k.args(ocl::KernelArg::ReadOnly(src),
+ ocl::KernelArg::WriteOnlyNoSize(dst));
+
+ size_t localsize[3] = { TILE_DIM, BLOCK_ROWS, 1 };
+ size_t globalsize[3] = { src.cols, inplace ? src.rows : divUp(src.rows, TILE_DIM) * BLOCK_ROWS, 1 };
+
+ return k.run(2, globalsize, localsize, false);
+}
+
}
void cv::transpose( InputArray _src, OutputArray _dst )
{
+ int type = _src.type(), esz = CV_ELEM_SIZE(type);
+ CV_Assert( _src.dims() <= 2 && esz <= 32 );
+
+ if (ocl::useOpenCL() && _dst.isUMat() && ocl_transpose(_src, _dst))
+ return;
+
Mat src = _src.getMat();
if( src.empty() )
{
_dst.release();
return;
}
- size_t esz = src.elemSize();
- CV_Assert( src.dims <= 2 && esz <= (size_t)32 );
_dst.create(src.cols, src.rows, src.type());
Mat dst = _dst.getMat();
@@ -2602,6 +2647,7 @@ void cv::transpose( InputArray _src, OutputArray _dst )
{
TransposeInplaceFunc func = transposeInplaceTab[esz];
CV_Assert( func != 0 );
+// CV_Assert( dst.cols == dst.rows );
func( dst.data, dst.step, dst.rows );
}
else
diff --git a/modules/core/src/opencl/transpose.cl b/modules/core/src/opencl/transpose.cl
new file mode 100644
index 0000000000000000000000000000000000000000..da9608c0d2850e71fb91ced07bd442788d0325d3
--- /dev/null
+++ b/modules/core/src/opencl/transpose.cl
@@ -0,0 +1,124 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+// By downloading, copying, installing or using the software you agree to this license.
+// If you do not agree to this license, do not download, install,
+// copy or use the software.
+//
+//
+// License Agreement
+// For Open Source Computer Vision Library
+//
+// Copyright (C) 2010-2012, Institute Of Software Chinese Academy Of Science, all rights reserved.
+// Copyright (C) 2010-2012, Advanced Micro Devices, Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// @Authors
+// Jia Haipeng, jiahaipeng95@gmail.com
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// * Redistribution's of source code must retain the above copyright notice,
+// this list of conditions and the following disclaimer.
+//
+// * Redistribution's in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// * The name of the copyright holders may not be used to endorse or promote products
+// derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors as is and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#define LDS_STEP TILE_DIM
+
+__kernel void transpose(__global const uchar * srcptr, int src_step, int src_offset, int src_rows, int src_cols,
+ __global uchar * dstptr, int dst_step, int dst_offset)
+{
+ int gp_x = get_group_id(0), gp_y = get_group_id(1);
+ int gs_x = get_num_groups(0), gs_y = get_num_groups(1);
+
+ int groupId_x, groupId_y;
+
+ if (src_rows == src_cols)
+ {
+ groupId_y = gp_x;
+ groupId_x = (gp_x + gp_y) % gs_x;
+ }
+ else
+ {
+ int bid = gp_x + gs_x * gp_y;
+ groupId_y = bid % gs_y;
+ groupId_x = ((bid / gs_y) + groupId_y) % gs_x;
+ }
+
+ int lx = get_local_id(0);
+ int ly = get_local_id(1);
+
+ int x = groupId_x * TILE_DIM + lx;
+ int y = groupId_y * TILE_DIM + ly;
+
+ int x_index = groupId_y * TILE_DIM + lx;
+ int y_index = groupId_x * TILE_DIM + ly;
+
+ __local T title[TILE_DIM * LDS_STEP];
+
+ if (x < src_cols && y < src_rows)
+ {
+ int index_src = mad24(y, src_step, x * (int)sizeof(T) + src_offset);
+
+ for (int i = 0; i < TILE_DIM; i += BLOCK_ROWS)
+ if (y + i < src_rows)
+ {
+ __global const T * src = (__global const T *)(srcptr + index_src);
+ title[(ly + i) * LDS_STEP + lx] = src[0];
+ index_src = mad24(BLOCK_ROWS, src_step, index_src);
+ }
+ }
+ barrier(CLK_LOCAL_MEM_FENCE);
+
+ if (x_index < src_rows && y_index < src_cols)
+ {
+ int index_dst = mad24(y_index, dst_step, x_index * (int)sizeof(T) + dst_offset);
+
+ for (int i = 0; i < TILE_DIM; i += BLOCK_ROWS)
+ if ((y_index + i) < src_cols)
+ {
+ __global T * dst = (__global T *)(dstptr + index_dst);
+ dst[0] = title[lx * LDS_STEP + ly + i];
+ index_dst = mad24(BLOCK_ROWS, dst_step, index_dst);
+ }
+ }
+}
+
+__kernel void transpose_inplace(__global uchar * srcptr, int src_step, int src_offset, int src_rows)
+{
+ int x = get_global_id(0);
+ int y = get_global_id(1);
+
+ if (y < src_rows && x < y)
+ {
+ int src_index = mad24(y, src_step, src_offset + x * (int)sizeof(T));
+ int dst_index = mad24(x, src_step, src_offset + y * (int)sizeof(T));
+
+ __global T * src = (__global T *)(srcptr + src_index);
+ __global T * dst = (__global T *)(srcptr + dst_index);
+
+ T tmp = dst[0];
+ dst[0] = src[0];
+ src[0] = tmp;
+ }
+}