Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
13f37466
Commit
13f37466
authored
Nov 23, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dnn(ocl4dnn): drop unused batch_size_ in pooling
parent
e34b64c9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
ocl4dnn.hpp
modules/dnn/src/ocl4dnn/include/ocl4dnn.hpp
+0
-1
ocl4dnn_pool.cpp
modules/dnn/src/ocl4dnn/src/ocl4dnn_pool.cpp
+0
-4
ocl4dnn_pooling.cl
modules/dnn/src/opencl/ocl4dnn_pooling.cl
+3
-3
No files found.
modules/dnn/src/ocl4dnn/include/ocl4dnn.hpp
View file @
13f37466
...
@@ -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_
;
...
...
modules/dnn/src/ocl4dnn/src/ocl4dnn_pool.cpp
View file @
13f37466
...
@@ -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_
,
...
...
modules/dnn/src/opencl/ocl4dnn_pooling.cl
View file @
13f37466
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment