From 2dd539f911dc9e53f188ed404ba95a795ee56fb6 Mon Sep 17 00:00:00 2001 From: Cedric Nugteren Date: Sun, 29 Jul 2018 10:37:14 +0200 Subject: Removed complex numbers support for CONVGEMM --- src/clblast.cpp | 12 +----------- src/clblast_c.cpp | 30 ------------------------------ src/clblast_cuda.cpp | 12 +----------- 3 files changed, 2 insertions(+), 52 deletions(-) (limited to 'src') diff --git a/src/clblast.cpp b/src/clblast.cpp index 3a96136a..0cd2f843 100644 --- a/src/clblast.cpp +++ b/src/clblast.cpp @@ -2252,7 +2252,7 @@ template StatusCode PUBLIC_API Im2col(const size_t, const size_t, const si cl_mem, const size_t, cl_command_queue*, cl_event*); -// Batched convolution as GEMM (non-BLAS function): SCONVGEMM/DCONVGEMM/CCONVGEMM/ZCONVGEMM/HCONVGEMM +// Batched convolution as GEMM (non-BLAS function): SCONVGEMM/DCONVGEMM/HCONVGEMM template StatusCode Convgemm(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 size_t num_kernels, const size_t batch_count, const cl_mem im_buffer, const size_t im_offset, @@ -2279,16 +2279,6 @@ template StatusCode PUBLIC_API Convgemm(const size_t, const size_t, cons const cl_mem, const size_t, cl_mem, const size_t, cl_command_queue*, cl_event*); -template StatusCode PUBLIC_API Convgemm(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 size_t, const size_t, - const cl_mem, const size_t, - const cl_mem, const size_t, - cl_mem, const size_t, - cl_command_queue*, cl_event*); -template StatusCode PUBLIC_API Convgemm(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 size_t, const size_t, - const cl_mem, const size_t, - const cl_mem, const size_t, - cl_mem, const size_t, - cl_command_queue*, cl_event*); template StatusCode PUBLIC_API Convgemm(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 size_t, const size_t, const cl_mem, const size_t, const cl_mem, const size_t, diff --git a/src/clblast_c.cpp b/src/clblast_c.cpp index 27f0c936..72adb888 100644 --- a/src/clblast_c.cpp +++ b/src/clblast_c.cpp @@ -3710,36 +3710,6 @@ CLBlastStatusCode CLBlastDconvgemm(const size_t channels, const size_t height, c ); } catch (...) { return static_cast(clblast::DispatchExceptionForC()); } } -CLBlastStatusCode CLBlastCconvgemm(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 size_t num_kernels, const size_t batch_count, - const cl_mem im_buffer, const size_t im_offset, - const cl_mem kernel_buffer, const size_t kernel_offset, - cl_mem result_buffer, const size_t result_offset, - cl_command_queue* queue, cl_event* event) { - try { - return static_cast( - clblast::Convgemm(channels, height, width, kernel_h, kernel_w, pad_h, pad_w, stride_h, stride_w, dilation_h, dilation_w, num_kernels, batch_count, - im_buffer, im_offset, - kernel_buffer, kernel_offset, - result_buffer, result_offset, - queue, event) - ); - } catch (...) { return static_cast(clblast::DispatchExceptionForC()); } -} -CLBlastStatusCode CLBlastZconvgemm(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 size_t num_kernels, const size_t batch_count, - const cl_mem im_buffer, const size_t im_offset, - const cl_mem kernel_buffer, const size_t kernel_offset, - cl_mem result_buffer, const size_t result_offset, - cl_command_queue* queue, cl_event* event) { - try { - return static_cast( - clblast::Convgemm(channels, height, width, kernel_h, kernel_w, pad_h, pad_w, stride_h, stride_w, dilation_h, dilation_w, num_kernels, batch_count, - im_buffer, im_offset, - kernel_buffer, kernel_offset, - result_buffer, result_offset, - queue, event) - ); - } catch (...) { return static_cast(clblast::DispatchExceptionForC()); } -} CLBlastStatusCode CLBlastHconvgemm(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 size_t num_kernels, const size_t batch_count, const cl_mem im_buffer, const size_t im_offset, const cl_mem kernel_buffer, const size_t kernel_offset, diff --git a/src/clblast_cuda.cpp b/src/clblast_cuda.cpp index 5aab1626..f14806cb 100644 --- a/src/clblast_cuda.cpp +++ b/src/clblast_cuda.cpp @@ -2350,7 +2350,7 @@ template StatusCode PUBLIC_API Im2col(const size_t, const size_t, const si CUdeviceptr, const size_t, const CUcontext, const CUdevice); -// Batched convolution as GEMM (non-BLAS function): SCONVGEMM/DCONVGEMM/CCONVGEMM/ZCONVGEMM/HCONVGEMM +// Batched convolution as GEMM (non-BLAS function): SCONVGEMM/DCONVGEMM/HCONVGEMM template StatusCode Convgemm(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 size_t num_kernels, const size_t batch_count, const CUdeviceptr im_buffer, const size_t im_offset, @@ -2379,16 +2379,6 @@ template StatusCode PUBLIC_API Convgemm(const size_t, const size_t, cons const CUdeviceptr, const size_t, CUdeviceptr, const size_t, const CUcontext, const CUdevice); -template StatusCode PUBLIC_API Convgemm(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 size_t, const size_t, - const CUdeviceptr, const size_t, - const CUdeviceptr, const size_t, - CUdeviceptr, const size_t, - const CUcontext, const CUdevice); -template StatusCode PUBLIC_API Convgemm(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 size_t, const size_t, - const CUdeviceptr, const size_t, - const CUdeviceptr, const size_t, - CUdeviceptr, const size_t, - const CUcontext, const CUdevice); template StatusCode PUBLIC_API Convgemm(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 size_t, const size_t, const CUdeviceptr, const size_t, const CUdeviceptr, const size_t, -- cgit v1.2.3