Commit 13f37466 authored by Alexander Alekhin's avatar Alexander Alekhin

dnn(ocl4dnn): drop unused batch_size_ in pooling

parent e34b64c9
...@@ -360,7 +360,6 @@ class OCL4DNNPool ...@@ -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_;
......
...@@ -54,7 +54,6 @@ OCL4DNNPool<Dtype>::OCL4DNNPool(OCL4DNNPoolConfig config) ...@@ -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, ...@@ -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, ...@@ -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, ...@@ -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_,
......
...@@ -53,7 +53,7 @@ __kernel void ...@@ -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 ...@@ -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)( ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment