Added interface and stubs for the im2col routine
Cedric Nugteren
parent
75c0e861b8
commit
84ec50e29d
|
|
@ -164,7 +164,7 @@ set(LEVEL1_ROUTINES xswap xscal xcopy xaxpy xdot xdotu xdotc xnrm2 xasum xamax)
|
|||
set(LEVEL2_ROUTINES xgemv xgbmv xhemv xhbmv xhpmv xsymv xsbmv xspmv xtrmv xtbmv xtpmv xtrsv
|
||||
xger xgeru xgerc xher xhpr xher2 xhpr2 xsyr xspr xsyr2 xspr2)
|
||||
set(LEVEL3_ROUTINES xgemm xsymm xhemm xsyrk xherk xsyr2k xher2k xtrmm xtrsm)
|
||||
set(LEVELX_ROUTINES xomatcopy xaxpybatched xgemmbatched)
|
||||
set(LEVELX_ROUTINES xomatcopy xim2col xaxpybatched xgemmbatched)
|
||||
set(ROUTINES ${LEVEL1_ROUTINES} ${LEVEL2_ROUTINES} ${LEVEL3_ROUTINES} ${LEVELX_ROUTINES})
|
||||
set(PRECISIONS 32 64 3232 6464 16)
|
||||
|
||||
|
|
|
|||
|
|
@ -2956,6 +2956,66 @@ Requirements for OMATCOPY:
|
|||
|
||||
|
||||
|
||||
xIM2COL: Im2col function (non-BLAS function)
|
||||
-------------
|
||||
|
||||
Performs the im2col algorithm, in which _im_ is the input matrix and _col_ is the output matrix.
|
||||
|
||||
C++ API:
|
||||
```
|
||||
template <typename T>
|
||||
StatusCode Im2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event)
|
||||
```
|
||||
|
||||
C API:
|
||||
```
|
||||
CLBlastStatusCode CLBlastSim2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event)
|
||||
CLBlastStatusCode CLBlastDim2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event)
|
||||
CLBlastStatusCode CLBlastCim2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event)
|
||||
CLBlastStatusCode CLBlastZim2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event)
|
||||
CLBlastStatusCode CLBlastHim2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event)
|
||||
```
|
||||
|
||||
Arguments to IM2COL:
|
||||
|
||||
* `const size_t channels`: Integer size argument. This value must be positive.
|
||||
* `const size_t height`: Integer size argument. This value must be positive.
|
||||
* `const size_t width`: Integer size argument. This value must be positive.
|
||||
* `const size_t kernel_h`: Integer size argument. This value must be positive.
|
||||
* `const size_t kernel_w`: Integer size argument. This value must be positive.
|
||||
* `const size_t pad_h`: Integer size argument. This value must be positive.
|
||||
* `const size_t pad_w`: Integer size argument. This value must be positive.
|
||||
* `const size_t stride_h`: Integer size argument. This value must be positive.
|
||||
* `const size_t stride_w`: Integer size argument. This value must be positive.
|
||||
* `const size_t dilation_h`: Integer size argument. This value must be positive.
|
||||
* `const size_t dilation_w`: Integer size argument. This value must be positive.
|
||||
* `const cl_mem im_buffer`: OpenCL buffer to store the input im vector.
|
||||
* `const size_t im_offset`: The offset in elements from the start of the input im vector.
|
||||
* `cl_mem col_buffer`: OpenCL buffer to store the output col vector.
|
||||
* `const size_t col_offset`: The offset in elements from the start of the output col vector.
|
||||
* `cl_command_queue* queue`: Pointer to an OpenCL command queue associated with a context and device to execute the routine on.
|
||||
* `cl_event* event`: Pointer to an OpenCL event to be able to wait for completion of the routine's OpenCL kernel(s). This is an optional argument.
|
||||
|
||||
|
||||
|
||||
xAXPYBATCHED: Batched version of AXPY
|
||||
-------------
|
||||
|
||||
|
|
|
|||
|
|
@ -617,6 +617,13 @@ StatusCode Omatcopy(const Layout layout, const Transpose a_transpose,
|
|||
cl_mem b_buffer, const size_t b_offset, const size_t b_ld,
|
||||
cl_command_queue* queue, cl_event* event = nullptr);
|
||||
|
||||
// Im2col function (non-BLAS function): SIM2COL/DIM2COL/CIM2COL/ZIM2COL/HIM2COL
|
||||
template <typename T>
|
||||
StatusCode Im2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event = nullptr);
|
||||
|
||||
// Batched version of AXPY: SAXPYBATCHED/DAXPYBATCHED/CAXPYBATCHED/ZAXPYBATCHED/HAXPYBATCHED
|
||||
template <typename T>
|
||||
StatusCode AxpyBatched(const size_t n,
|
||||
|
|
|
|||
|
|
@ -1350,6 +1350,28 @@ CLBlastStatusCode PUBLIC_API CLBlastHomatcopy(const CLBlastLayout layout, const
|
|||
cl_mem b_buffer, const size_t b_offset, const size_t b_ld,
|
||||
cl_command_queue* queue, cl_event* event);
|
||||
|
||||
// Im2col function (non-BLAS function): SIM2COL/DIM2COL/CIM2COL/ZIM2COL/HIM2COL
|
||||
CLBlastStatusCode PUBLIC_API CLBlastSim2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event);
|
||||
CLBlastStatusCode PUBLIC_API CLBlastDim2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event);
|
||||
CLBlastStatusCode PUBLIC_API CLBlastCim2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event);
|
||||
CLBlastStatusCode PUBLIC_API CLBlastZim2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event);
|
||||
CLBlastStatusCode PUBLIC_API CLBlastHim2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event);
|
||||
|
||||
// Batched version of AXPY: SAXPYBATCHED/DAXPYBATCHED/CAXPYBATCHED/ZAXPYBATCHED/HAXPYBATCHED
|
||||
CLBlastStatusCode PUBLIC_API CLBlastSaxpyBatched(const size_t n,
|
||||
const float *alphas,
|
||||
|
|
|
|||
|
|
@ -920,6 +920,20 @@ void PUBLIC_API cblas_zomatcopy(const CLBlastLayout layout, const CLBlastTranspo
|
|||
const void* a, const int a_ld,
|
||||
void* b, const int b_ld);
|
||||
|
||||
// Im2col function (non-BLAS function): SIM2COL/DIM2COL/CIM2COL/ZIM2COL/HIM2COL
|
||||
void PUBLIC_API cblas_sim2col(const int channels, const int height, const int width, const int kernel_h, const int kernel_w, const int pad_h, const int pad_w, const int stride_h, const int stride_w, const int dilation_h, const int dilation_w,
|
||||
const float* im,
|
||||
float* col);
|
||||
void PUBLIC_API cblas_dim2col(const int channels, const int height, const int width, const int kernel_h, const int kernel_w, const int pad_h, const int pad_w, const int stride_h, const int stride_w, const int dilation_h, const int dilation_w,
|
||||
const double* im,
|
||||
double* col);
|
||||
void PUBLIC_API cblas_cim2col(const int channels, const int height, const int width, const int kernel_h, const int kernel_w, const int pad_h, const int pad_w, const int stride_h, const int stride_w, const int dilation_h, const int dilation_w,
|
||||
const void* im,
|
||||
void* col);
|
||||
void PUBLIC_API cblas_zim2col(const int channels, const int height, const int width, const int kernel_h, const int kernel_w, const int pad_h, const int pad_w, const int stride_h, const int stride_w, const int dilation_h, const int dilation_w,
|
||||
const void* im,
|
||||
void* col);
|
||||
|
||||
// =================================================================================================
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ FILES = [
|
|||
"/include/clblast_netlib_c.h",
|
||||
"/src/clblast_netlib_c.cpp",
|
||||
]
|
||||
HEADER_LINES = [122, 78, 126, 24, 29, 41, 29, 65, 32]
|
||||
HEADER_LINES = [122, 79, 126, 24, 29, 41, 29, 65, 32]
|
||||
FOOTER_LINES = [25, 147, 27, 38, 6, 6, 6, 9, 2]
|
||||
HEADER_LINES_DOC = 0
|
||||
FOOTER_LINES_DOC = 63
|
||||
|
|
@ -96,10 +96,13 @@ bnma = size_helper(layout_transpose_condition("a"), "n", "m", "b_ld")
|
|||
cmn = size_helper("layout == CLBlastLayoutRowMajor", "m", "n", "c_ld")
|
||||
ammn = size_helper("layout == CLBlastLayoutRowMajor", "m", "((side == CLBlastSideLeft) ? m : n)", "a_ld")
|
||||
bmnn = size_helper("layout == CLBlastLayoutRowMajor", "((side == CLBlastSideLeft) ? m : n)", "n", "b_ld")
|
||||
im = "height * width * channels"
|
||||
col = "height * width * channels"
|
||||
|
||||
# ==================================================================================================
|
||||
|
||||
# Populates a list of routines
|
||||
im2col_constants = ["channels", "height", "width", "kernel_h", "kernel_w", "pad_h", "pad_w", "stride_h", "stride_w", "dilation_h", "dilation_w"]
|
||||
ROUTINES = [
|
||||
[ # Level 1: vector-vector
|
||||
Routine(False, True, False, "1", "rotg", T, [S,D], [], [], [], ["sa","sb","sc","ss"], ["1","1","1","1"], [], "", "Generate givens plane rotation", "", []),
|
||||
|
|
@ -163,6 +166,7 @@ ROUTINES = [
|
|||
[ # Level X: extra routines (not part of BLAS)
|
||||
# Special routines:
|
||||
Routine(True, True, False, "x", "omatcopy", T, [S,D,C,Z,H], ["m","n"], ["layout","a_transpose"], ["a"], ["b"], [amn,bnma], ["alpha"], "", "Scaling and out-place transpose/copy (non-BLAS function)", "Performs scaling and out-of-place transposition/copying of matrices according to _B = alpha*op(A)_, in which _A_ is an input matrix (_m_ rows by _n_ columns), _B_ an output matrix, and _alpha_ a scalar value. The operation _op_ can be a normal matrix copy, a transposition or a conjugate transposition.", [ald_m, bld_n]),
|
||||
Routine(True, True, False, "x", "im2col", T, [S,D,C,Z,H], im2col_constants, [], ["im"], ["col"], [im,col], [""], "", "Im2col function (non-BLAS function)", "Performs the im2col algorithm, in which _im_ is the input matrix and _col_ is the output matrix.", []),
|
||||
# Batched routines:
|
||||
Routine(True, True, True, "x", "axpy", T, [S,D,C,Z,H], ["n"], [], ["x"], ["y"], [xn,yn], ["alpha"], "", "Batched version of AXPY", "As AXPY, but multiple operations are batched together for better performance.", []),
|
||||
Routine(True, True, True, "x", "gemm", T, [S,D,C,Z,H], ["m","n","k"], ["layout","a_transpose","b_transpose"], ["a","b"], ["c"], [amk,bkn,cmn], ["alpha","beta"], "", "Batched version of GEMM", "As GEMM, but multiple operations are batched together for better performance.", [ald_transa_m_k, bld_transb_k_n, cld_m]),
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@ class Routine:
|
|||
|
||||
def buffers_without_ld_inc(self):
|
||||
"""List of buffers without 'inc' or 'ld'"""
|
||||
return self.scalar_buffers_first() + self.scalar_buffers_second() + ["ap"]
|
||||
return self.scalar_buffers_first() + self.scalar_buffers_second() + ["ap", "im", "col"]
|
||||
|
||||
def get_buffer_type(self, name, flavour):
|
||||
if name in self.index_buffers():
|
||||
|
|
@ -195,7 +195,7 @@ class Routine:
|
|||
|
||||
def no_scalars(self):
|
||||
"""Determines whether or not this routine has scalar arguments (alpha/beta)"""
|
||||
return self.scalars == []
|
||||
return self.scalars == [] or self.name == "im2col"
|
||||
|
||||
def has_layout(self):
|
||||
"""Determines whether the layout is an argument"""
|
||||
|
|
@ -216,12 +216,12 @@ class Routine:
|
|||
"""Determines which buffers go first (between alpha and beta) and which ones go after"""
|
||||
if self.level == "2b":
|
||||
return ["x", "y"]
|
||||
return ["ap", "a", "b", "x"]
|
||||
return ["ap", "a", "b", "x", "im"]
|
||||
|
||||
def buffers_second(self):
|
||||
if self.level == "2b":
|
||||
return ["ap", "a", "b", "c"]
|
||||
return ["y", "c"]
|
||||
return ["y", "c", "col"]
|
||||
|
||||
def buffer(self, name):
|
||||
"""Retrieves a variable name for a specific input/output vector/matrix (e.g. 'x')"""
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@
|
|||
|
||||
// Level-x includes (non-BLAS)
|
||||
#include "routines/levelx/xomatcopy.hpp"
|
||||
#include "routines/levelx/xim2col.hpp"
|
||||
#include "routines/levelx/xaxpybatched.hpp"
|
||||
#include "routines/levelx/xgemmbatched.hpp"
|
||||
|
||||
|
|
@ -2212,6 +2213,42 @@ template StatusCode PUBLIC_API Omatcopy<half>(const Layout, const Transpose,
|
|||
cl_mem, const size_t, const size_t,
|
||||
cl_command_queue*, cl_event*);
|
||||
|
||||
// Im2col function (non-BLAS function): SIM2COL/DIM2COL/CIM2COL/ZIM2COL/HIM2COL
|
||||
template <typename T>
|
||||
StatusCode Im2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event) {
|
||||
try {
|
||||
auto queue_cpp = Queue(*queue);
|
||||
auto routine = Xim2col<T>(queue_cpp, event);
|
||||
routine.DoIm2col(channels, height, width, kernel_h, kernel_w, pad_h, pad_w, stride_h, stride_w, dilation_h, dilation_w,
|
||||
Buffer<T>(im_buffer), im_offset,
|
||||
Buffer<T>(col_buffer), col_offset);
|
||||
return StatusCode::kSuccess;
|
||||
} catch (...) { return DispatchException(); }
|
||||
}
|
||||
template StatusCode PUBLIC_API Im2col<float>(const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t,
|
||||
const cl_mem, const size_t,
|
||||
cl_mem, const size_t,
|
||||
cl_command_queue*, cl_event*);
|
||||
template StatusCode PUBLIC_API Im2col<double>(const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t,
|
||||
const cl_mem, const size_t,
|
||||
cl_mem, const size_t,
|
||||
cl_command_queue*, cl_event*);
|
||||
template StatusCode PUBLIC_API Im2col<float2>(const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t,
|
||||
const cl_mem, const size_t,
|
||||
cl_mem, const size_t,
|
||||
cl_command_queue*, cl_event*);
|
||||
template StatusCode PUBLIC_API Im2col<double2>(const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t,
|
||||
const cl_mem, const size_t,
|
||||
cl_mem, const size_t,
|
||||
cl_command_queue*, cl_event*);
|
||||
template StatusCode PUBLIC_API Im2col<half>(const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t, const size_t,
|
||||
const cl_mem, const size_t,
|
||||
cl_mem, const size_t,
|
||||
cl_command_queue*, cl_event*);
|
||||
|
||||
// Batched version of AXPY: SAXPYBATCHED/DAXPYBATCHED/CAXPYBATCHED/ZAXPYBATCHED/HAXPYBATCHED
|
||||
template <typename T>
|
||||
StatusCode AxpyBatched(const size_t n,
|
||||
|
|
|
|||
|
|
@ -3515,6 +3515,73 @@ CLBlastStatusCode CLBlastHomatcopy(const CLBlastLayout layout, const CLBlastTran
|
|||
} catch (...) { return static_cast<CLBlastStatusCode>(clblast::DispatchExceptionForC()); }
|
||||
}
|
||||
|
||||
// IM2COL
|
||||
CLBlastStatusCode CLBlastSim2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event) {
|
||||
try {
|
||||
return static_cast<CLBlastStatusCode>(
|
||||
clblast::Im2col<float>(channels, height, width, kernel_h, kernel_w, pad_h, pad_w, stride_h, stride_w, dilation_h, dilation_w,
|
||||
im_buffer, im_offset,
|
||||
col_buffer, col_offset,
|
||||
queue, event)
|
||||
);
|
||||
} catch (...) { return static_cast<CLBlastStatusCode>(clblast::DispatchExceptionForC()); }
|
||||
}
|
||||
CLBlastStatusCode CLBlastDim2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event) {
|
||||
try {
|
||||
return static_cast<CLBlastStatusCode>(
|
||||
clblast::Im2col<double>(channels, height, width, kernel_h, kernel_w, pad_h, pad_w, stride_h, stride_w, dilation_h, dilation_w,
|
||||
im_buffer, im_offset,
|
||||
col_buffer, col_offset,
|
||||
queue, event)
|
||||
);
|
||||
} catch (...) { return static_cast<CLBlastStatusCode>(clblast::DispatchExceptionForC()); }
|
||||
}
|
||||
CLBlastStatusCode CLBlastCim2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event) {
|
||||
try {
|
||||
return static_cast<CLBlastStatusCode>(
|
||||
clblast::Im2col<float2>(channels, height, width, kernel_h, kernel_w, pad_h, pad_w, stride_h, stride_w, dilation_h, dilation_w,
|
||||
im_buffer, im_offset,
|
||||
col_buffer, col_offset,
|
||||
queue, event)
|
||||
);
|
||||
} catch (...) { return static_cast<CLBlastStatusCode>(clblast::DispatchExceptionForC()); }
|
||||
}
|
||||
CLBlastStatusCode CLBlastZim2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event) {
|
||||
try {
|
||||
return static_cast<CLBlastStatusCode>(
|
||||
clblast::Im2col<double2>(channels, height, width, kernel_h, kernel_w, pad_h, pad_w, stride_h, stride_w, dilation_h, dilation_w,
|
||||
im_buffer, im_offset,
|
||||
col_buffer, col_offset,
|
||||
queue, event)
|
||||
);
|
||||
} catch (...) { return static_cast<CLBlastStatusCode>(clblast::DispatchExceptionForC()); }
|
||||
}
|
||||
CLBlastStatusCode CLBlastHim2col(const size_t channels, const size_t height, const size_t width, const size_t kernel_h, const size_t kernel_w, const size_t pad_h, const size_t pad_w, const size_t stride_h, const size_t stride_w, const size_t dilation_h, const size_t dilation_w,
|
||||
const cl_mem im_buffer, const size_t im_offset,
|
||||
cl_mem col_buffer, const size_t col_offset,
|
||||
cl_command_queue* queue, cl_event* event) {
|
||||
try {
|
||||
return static_cast<CLBlastStatusCode>(
|
||||
clblast::Im2col<half>(channels, height, width, kernel_h, kernel_w, pad_h, pad_w, stride_h, stride_w, dilation_h, dilation_w,
|
||||
im_buffer, im_offset,
|
||||
col_buffer, col_offset,
|
||||
queue, event)
|
||||
);
|
||||
} catch (...) { return static_cast<CLBlastStatusCode>(clblast::DispatchExceptionForC()); }
|
||||
}
|
||||
|
||||
// AXPY
|
||||
CLBlastStatusCode CLBlastSaxpyBatched(const size_t n,
|
||||
const float *alphas,
|
||||
|
|
|
|||
|
|
@ -4735,4 +4735,94 @@ void cblas_zomatcopy(const CLBlastLayout layout, const CLBlastTranspose a_transp
|
|||
b_buffer.Read(queue, b_size, reinterpret_cast<double2*>(b));
|
||||
}
|
||||
|
||||
// IM2COL
|
||||
void cblas_sim2col(const int channels, const int height, const int width, const int kernel_h, const int kernel_w, const int pad_h, const int pad_w, const int stride_h, const int stride_w, const int dilation_h, const int dilation_w,
|
||||
const float* im,
|
||||
float* col) {
|
||||
auto device = get_device();
|
||||
auto context = clblast::Context(device);
|
||||
auto queue = clblast::Queue(context, device);
|
||||
const auto im_size = height * width * channels;
|
||||
const auto col_size = height * width * channels;
|
||||
auto im_buffer = clblast::Buffer<float>(context, im_size);
|
||||
auto col_buffer = clblast::Buffer<float>(context, col_size);
|
||||
im_buffer.Write(queue, im_size, reinterpret_cast<const float*>(im));
|
||||
col_buffer.Write(queue, col_size, reinterpret_cast<float*>(col));
|
||||
auto queue_cl = queue();
|
||||
auto s = clblast::Im2col<float>(channels, height, width, kernel_h, kernel_w, pad_h, pad_w, stride_h, stride_w, dilation_h, dilation_w,
|
||||
im_buffer(), 0,
|
||||
col_buffer(), 0,
|
||||
&queue_cl);
|
||||
if (s != clblast::StatusCode::kSuccess) {
|
||||
throw std::runtime_error("CLBlast returned with error code " + clblast::ToString(s));
|
||||
}
|
||||
col_buffer.Read(queue, col_size, reinterpret_cast<float*>(col));
|
||||
}
|
||||
void cblas_dim2col(const int channels, const int height, const int width, const int kernel_h, const int kernel_w, const int pad_h, const int pad_w, const int stride_h, const int stride_w, const int dilation_h, const int dilation_w,
|
||||
const double* im,
|
||||
double* col) {
|
||||
auto device = get_device();
|
||||
auto context = clblast::Context(device);
|
||||
auto queue = clblast::Queue(context, device);
|
||||
const auto im_size = height * width * channels;
|
||||
const auto col_size = height * width * channels;
|
||||
auto im_buffer = clblast::Buffer<double>(context, im_size);
|
||||
auto col_buffer = clblast::Buffer<double>(context, col_size);
|
||||
im_buffer.Write(queue, im_size, reinterpret_cast<const double*>(im));
|
||||
col_buffer.Write(queue, col_size, reinterpret_cast<double*>(col));
|
||||
auto queue_cl = queue();
|
||||
auto s = clblast::Im2col<double>(channels, height, width, kernel_h, kernel_w, pad_h, pad_w, stride_h, stride_w, dilation_h, dilation_w,
|
||||
im_buffer(), 0,
|
||||
col_buffer(), 0,
|
||||
&queue_cl);
|
||||
if (s != clblast::StatusCode::kSuccess) {
|
||||
throw std::runtime_error("CLBlast returned with error code " + clblast::ToString(s));
|
||||
}
|
||||
col_buffer.Read(queue, col_size, reinterpret_cast<double*>(col));
|
||||
}
|
||||
void cblas_cim2col(const int channels, const int height, const int width, const int kernel_h, const int kernel_w, const int pad_h, const int pad_w, const int stride_h, const int stride_w, const int dilation_h, const int dilation_w,
|
||||
const void* im,
|
||||
void* col) {
|
||||
auto device = get_device();
|
||||
auto context = clblast::Context(device);
|
||||
auto queue = clblast::Queue(context, device);
|
||||
const auto im_size = height * width * channels;
|
||||
const auto col_size = height * width * channels;
|
||||
auto im_buffer = clblast::Buffer<float2>(context, im_size);
|
||||
auto col_buffer = clblast::Buffer<float2>(context, col_size);
|
||||
im_buffer.Write(queue, im_size, reinterpret_cast<const float2*>(im));
|
||||
col_buffer.Write(queue, col_size, reinterpret_cast<float2*>(col));
|
||||
auto queue_cl = queue();
|
||||
auto s = clblast::Im2col<float2>(channels, height, width, kernel_h, kernel_w, pad_h, pad_w, stride_h, stride_w, dilation_h, dilation_w,
|
||||
im_buffer(), 0,
|
||||
col_buffer(), 0,
|
||||
&queue_cl);
|
||||
if (s != clblast::StatusCode::kSuccess) {
|
||||
throw std::runtime_error("CLBlast returned with error code " + clblast::ToString(s));
|
||||
}
|
||||
col_buffer.Read(queue, col_size, reinterpret_cast<float2*>(col));
|
||||
}
|
||||
void cblas_zim2col(const int channels, const int height, const int width, const int kernel_h, const int kernel_w, const int pad_h, const int pad_w, const int stride_h, const int stride_w, const int dilation_h, const int dilation_w,
|
||||
const void* im,
|
||||
void* col) {
|
||||
auto device = get_device();
|
||||
auto context = clblast::Context(device);
|
||||
auto queue = clblast::Queue(context, device);
|
||||
const auto im_size = height * width * channels;
|
||||
const auto col_size = height * width * channels;
|
||||
auto im_buffer = clblast::Buffer<double2>(context, im_size);
|
||||
auto col_buffer = clblast::Buffer<double2>(context, col_size);
|
||||
im_buffer.Write(queue, im_size, reinterpret_cast<const double2*>(im));
|
||||
col_buffer.Write(queue, col_size, reinterpret_cast<double2*>(col));
|
||||
auto queue_cl = queue();
|
||||
auto s = clblast::Im2col<double2>(channels, height, width, kernel_h, kernel_w, pad_h, pad_w, stride_h, stride_w, dilation_h, dilation_w,
|
||||
im_buffer(), 0,
|
||||
col_buffer(), 0,
|
||||
&queue_cl);
|
||||
if (s != clblast::StatusCode::kSuccess) {
|
||||
throw std::runtime_error("CLBlast returned with error code " + clblast::ToString(s));
|
||||
}
|
||||
col_buffer.Read(queue, col_size, reinterpret_cast<double2*>(col));
|
||||
}
|
||||
|
||||
// =================================================================================================
|
||||
|
|
|
|||
|
|
@ -0,0 +1,55 @@
|
|||
|
||||
// =================================================================================================
|
||||
// This file is part of the CLBlast project. The project is licensed under Apache Version 2.0. This
|
||||
// project loosely follows the Google C++ styleguide and uses a tab-size of two spaces and a max-
|
||||
// width of 100 characters per line.
|
||||
//
|
||||
// Author(s):
|
||||
// Cedric Nugteren <www.cedricnugteren.nl>
|
||||
//
|
||||
// This file implements the Xim2col class (see the header for information about the class).
|
||||
//
|
||||
// =================================================================================================
|
||||
|
||||
#include "routines/levelx/xim2col.hpp"
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
namespace clblast {
|
||||
// =================================================================================================
|
||||
|
||||
// Constructor: forwards to base class constructor
|
||||
template <typename T>
|
||||
Xim2col<T>::Xim2col(Queue &queue, EventPointer event, const std::string &name):
|
||||
Routine(queue, event, name, {}, PrecisionValue<T>(), {}, {
|
||||
#include "../../kernels/level3/level3.opencl"
|
||||
}) {
|
||||
}
|
||||
|
||||
// =================================================================================================
|
||||
|
||||
// The main routine
|
||||
template <typename T>
|
||||
void Xim2col<T>::DoIm2col(const size_t channels, const size_t height, const size_t width,
|
||||
const size_t kernel_h, const size_t kernel_w, const size_t pad_h,
|
||||
const size_t pad_w, const size_t stride_h, const size_t stride_w,
|
||||
const size_t dilation_h, const size_t dilation_w,
|
||||
const Buffer<T> &im_buffer, const size_t im_offset,
|
||||
const Buffer<T> &col_buffer, const size_t col_offset) {
|
||||
|
||||
// Makes sure all dimensions are larger than zero
|
||||
if ((channels == 0) || (height == 0) || (width == 0)) { throw BLASError(StatusCode::kInvalidDimension); }
|
||||
}
|
||||
|
||||
// =================================================================================================
|
||||
|
||||
// Compiles the templated class
|
||||
template class Xim2col<half>;
|
||||
template class Xim2col<float>;
|
||||
template class Xim2col<double>;
|
||||
template class Xim2col<float2>;
|
||||
template class Xim2col<double2>;
|
||||
|
||||
// =================================================================================================
|
||||
} // namespace clblast
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
|
||||
// =================================================================================================
|
||||
// This file is part of the CLBlast project. The project is licensed under Apache Version 2.0. This
|
||||
// project loosely follows the Google C++ styleguide and uses a tab-size of two spaces and a max-
|
||||
// width of 100 characters per line.
|
||||
//
|
||||
// Author(s):
|
||||
// Cedric Nugteren <www.cedricnugteren.nl>
|
||||
//
|
||||
// This file implements the Xim2col routine. The precision is implemented using a template argument.
|
||||
//
|
||||
// =================================================================================================
|
||||
|
||||
#ifndef CLBLAST_ROUTINES_XIM2COL_H_
|
||||
#define CLBLAST_ROUTINES_XIM2COL_H_
|
||||
|
||||
#include "routine.hpp"
|
||||
|
||||
namespace clblast {
|
||||
// =================================================================================================
|
||||
|
||||
// See comment at top of file for a description of the class
|
||||
template <typename T>
|
||||
class Xim2col: public Routine {
|
||||
public:
|
||||
|
||||
// Constructor
|
||||
Xim2col(Queue &queue, EventPointer event, const std::string &name = "IM2COL");
|
||||
|
||||
// Templated-precision implementation of the routine
|
||||
void DoIm2col(const size_t channels, const size_t height, const size_t width,
|
||||
const size_t kernel_h, const size_t kernel_w,
|
||||
const size_t pad_h, const size_t pad_w,
|
||||
const size_t stride_h, const size_t stride_w,
|
||||
const size_t dilation_h, const size_t dilation_w,
|
||||
const Buffer<T> &im_buffer, const size_t im_offset,
|
||||
const Buffer<T> &col_buffer, const size_t col_offset);
|
||||
};
|
||||
|
||||
// =================================================================================================
|
||||
} // namespace clblast
|
||||
|
||||
// CLBLAST_ROUTINES_XIM2COL_H_
|
||||
#endif
|
||||
Loading…
Reference in New Issue