mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

dnn(ocl4dnn): drop unused batch_size_ in pooling

Browse Source
This commit is contained in:
Alexander Alekhin 2017-11-23 20:45:44 +00:00
parent e34b64c979
commit 13f374660f
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/dnn/src/ocl4dnn/include/ocl4dnn.hpp
View File

@ -360,7 +360,6 @@ class OCL4DNNPool
ocl4dnnPoolingMethod_t pool_method_; ocl4dnnPoolingMethod_t pool_method_;
int32_t count_; int32_t count_;
int32_t batch_size_;
int32_t channels_; int32_t channels_;
int32_t kernel_h_; int32_t kernel_h_;
int32_t kernel_w_; int32_t kernel_w_;

4
modules/dnn/src/ocl4dnn/src/ocl4dnn_pool.cpp
View File

@ -54,7 +54,6 @@ OCL4DNNPool<Dtype>::OCL4DNNPool(OCL4DNNPoolConfig config)
int dims = config.in_shape.size(); int dims = config.in_shape.size();
int spatial_dims = 2; int spatial_dims = 2;
batch_size_ = config.in_shape[0];
channels_ = config.channels; channels_ = config.channels;
pool_method_ = config.pool_method; pool_method_ = config.pool_method;
@ -124,7 +123,6 @@ bool OCL4DNNPool<Dtype>::Forward(const UMat& bottom,
oclk_max_pool_forward.args( oclk_max_pool_forward.args(
count_, count_,
ocl::KernelArg::PtrReadOnly(bottom), ocl::KernelArg::PtrReadOnly(bottom),
batch_size_,
channels_, channels_,
height_, height_,
width_, width_,
@ -157,7 +155,6 @@ bool OCL4DNNPool<Dtype>::Forward(const UMat& bottom,
oclk_ave_pool_forward.args( oclk_ave_pool_forward.args(
count_, count_,
ocl::KernelArg::PtrReadOnly(bottom), ocl::KernelArg::PtrReadOnly(bottom),
batch_size_,
channels_, channels_,
height_, height_,
width_, width_,
@ -188,7 +185,6 @@ bool OCL4DNNPool<Dtype>::Forward(const UMat& bottom,
oclk_sto_pool_forward.args( oclk_sto_pool_forward.args(
count_, count_,
ocl::KernelArg::PtrReadOnly(bottom), ocl::KernelArg::PtrReadOnly(bottom),
batch_size_,
channels_, channels_,
height_, height_,
width_, width_,

6
modules/dnn/src/opencl/ocl4dnn_pooling.cl
View File

@ -53,7 +53,7 @@ __kernel void
TEMPLATE(max_pool_forward, Dtype) TEMPLATE(max_pool_forward, Dtype)
#endif #endif
( (
const int nthreads, __global const Dtype* bottom_data, const int num, const int nthreads, __global const Dtype* bottom_data,
const int channels, const int height, const int width, const int channels, const int height, const int width,
const int pooled_height, const int pooled_width, const int pooled_height, const int pooled_width,
__global Dtype* top_data __global Dtype* top_data
@ -97,7 +97,7 @@ __kernel void
#elif defined KERNEL_AVE_POOL #elif defined KERNEL_AVE_POOL
__kernel void TEMPLATE(ave_pool_forward, Dtype)( __kernel void TEMPLATE(ave_pool_forward, Dtype)(
const int nthreads, __global const Dtype* const bottom_data, const int num, const int nthreads, __global const Dtype* const bottom_data,
const int channels, const int height, const int width, const int channels, const int height, const int width,
const int pooled_height, const int pooled_width, const int pooled_height, const int pooled_width,
__global Dtype* top_data) __global Dtype* top_data)
@ -135,7 +135,7 @@ __kernel void TEMPLATE(ave_pool_forward, Dtype)(
#elif defined KERNEL_STO_POOL #elif defined KERNEL_STO_POOL
__kernel void TEMPLATE(sto_pool_forward_test,Dtype)( __kernel void TEMPLATE(sto_pool_forward_test,Dtype)(
const int nthreads, __global const Dtype* const bottom_data, const int num, const int nthreads, __global const Dtype* const bottom_data,
const int channels, const int height, const int width, const int channels, const int height, const int width,
const int pooled_height, const int pooled_width, const int pooled_height, const int pooled_width,
__global Dtype* top_data) __global Dtype* top_data)